diff --git a/test/java/foundation/pEp/jniadapter/test/Makefile.conf b/test/java/foundation/pEp/jniadapter/test/Makefile.conf
index ef6c079..6100b2c 100644
--- a/test/java/foundation/pEp/jniadapter/test/Makefile.conf
+++ b/test/java/foundation/pEp/jniadapter/test/Makefile.conf
@@ -16,18 +16,18 @@ PEP_HOME_DIR=$(PEP_HOME_DIR_ALICE)
 
 CLASSPATH=.:$(REPOROOT)/src
 
-JAVA=java -Xcheck:jni -cp $(CLASSPATH) -Djava.library.path=$(CLASSPATH)
-
-JAVA_CLASSES_FRAMEWORK= \
- 	../framework/TestSuite.class \
-	../framework/TestUnit.class \
-	../framework/TestContextInterface.class \
-	../framework/AbstractTestContext.class \
-	../framework/TestLogger.class \
-	../framework/utils/TestUtils.class \
-	../framework/utils/Pair.class \
-	../framework/TestState.class \
-	../framework/TestResult.class
+JAVA=java -enableassertions -Xcheck:jni -cp $(CLASSPATH) -Djava.library.path=$(CLASSPATH)
+
+JAVA_CLASSES_PITYTEST= \
+ 	../pitytest/TestSuite.class \
+	../pitytest/TestUnit.class \
+	../pitytest/TestContextInterface.class \
+	../pitytest/AbstractTestContext.class \
+	../pitytest/TestLogger.class \
+	../pitytest/utils/TestUtils.class \
+	../pitytest/utils/Pair.class \
+	../pitytest/TestState.class \
+	../pitytest/TestResult.class
 
 
 
diff --git a/test/java/foundation/pEp/jniadapter/test/basic/Makefile b/test/java/foundation/pEp/jniadapter/test/basic/Makefile
index 448f90b..d42697f 100644
--- a/test/java/foundation/pEp/jniadapter/test/basic/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/basic/Makefile
@@ -9,7 +9,7 @@ JAVA_CLASSES = \
 	../utils/AdapterTestUtils.class \
 	../utils/TestCallbacks.class
 
-JAVA_CLASSES += $(JAVA_CLASSES_FRAMEWORK)
+JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
 
 .PHONY: compile run test clean
 
diff --git a/test/java/foundation/pEp/jniadapter/test/basic/TestMain.java b/test/java/foundation/pEp/jniadapter/test/basic/TestMain.java
index b757413..82d25b1 100644
--- a/test/java/foundation/pEp/jniadapter/test/basic/TestMain.java
+++ b/test/java/foundation/pEp/jniadapter/test/basic/TestMain.java
@@ -4,14 +4,14 @@ import foundation.pEp.jniadapter.Blob;
 import foundation.pEp.jniadapter.Engine;
 import foundation.pEp.jniadapter.Identity;
 import foundation.pEp.jniadapter.Message;
-import foundation.pEp.jniadapter.test.framework.TestSuite;
-import foundation.pEp.jniadapter.test.framework.TestUnit;
+import foundation.pEp.jniadapter.test.pitytest.TestSuite;
+import foundation.pEp.jniadapter.test.pitytest.TestUnit;
 import foundation.pEp.jniadapter.test.utils.AdapterBaseTestContext;
 import foundation.pEp.jniadapter.test.utils.AdapterTestUtils;
 
 import java.util.Vector;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.log;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.log;
 
 class BasicTestContext extends AdapterBaseTestContext {
     Message enc;
diff --git a/test/java/foundation/pEp/jniadapter/test/jni100/Makefile b/test/java/foundation/pEp/jniadapter/test/jni100/Makefile
index 9edcfcf..96a4b47 100644
--- a/test/java/foundation/pEp/jniadapter/test/jni100/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/jni100/Makefile
@@ -8,7 +8,7 @@ JAVA_CLASSES = \
  	../utils/AdapterTestUtils.class \
  	../utils/TestCallbacks.class
 
-JAVA_CLASSES += $(JAVA_CLASSES_FRAMEWORK)
+JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
 
 .PHONY: compile run test clean
 
diff --git a/test/java/foundation/pEp/jniadapter/test/jni100/TestMain.java b/test/java/foundation/pEp/jniadapter/test/jni100/TestMain.java
index 347f18b..0897498 100644
--- a/test/java/foundation/pEp/jniadapter/test/jni100/TestMain.java
+++ b/test/java/foundation/pEp/jniadapter/test/jni100/TestMain.java
@@ -1,5 +1,5 @@
 package foundation.pEp.jniadapter.test.jni100;
-import  foundation.pEp.jniadapter.test.framework.*;
+import  foundation.pEp.jniadapter.test.pitytest.*;
 import foundation.pEp.jniadapter.*;
 import foundation.pEp.jniadapter.test.utils.*;
 
diff --git a/test/java/foundation/pEp/jniadapter/test/jni88/Makefile b/test/java/foundation/pEp/jniadapter/test/jni88/Makefile
index e8aa7aa..38367ba 100644
--- a/test/java/foundation/pEp/jniadapter/test/jni88/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/jni88/Makefile
@@ -6,6 +6,8 @@ TEST_UNIT_NAME=jni88
 JAVA_CLASSES = \
  	TestMain.class
 
+JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
+
 .PHONY: compile run test clean
 
 all: compile
diff --git a/test/java/foundation/pEp/jniadapter/test/jni91/Makefile b/test/java/foundation/pEp/jniadapter/test/jni91/Makefile
index 15b3ef6..d5a474f 100644
--- a/test/java/foundation/pEp/jniadapter/test/jni91/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/jni91/Makefile
@@ -6,6 +6,8 @@ TEST_UNIT_NAME=jni91
 JAVA_CLASSES = \
  	TestMain.class
 
+JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
+
 .PHONY: compile run test clean
 
 all: compile
diff --git a/test/java/foundation/pEp/jniadapter/test/jni92/Makefile b/test/java/foundation/pEp/jniadapter/test/jni92/Makefile
index 3526b25..56db63a 100644
--- a/test/java/foundation/pEp/jniadapter/test/jni92/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/jni92/Makefile
@@ -7,6 +7,8 @@ JAVA_CLASSES = \
  	TestMain.class \
  	../utils/AdapterTestUtils.class
 
+JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
+
 .PHONY: compile run test clean
 
 all: compile
diff --git a/test/java/foundation/pEp/jniadapter/test/jni92/TestMain.java b/test/java/foundation/pEp/jniadapter/test/jni92/TestMain.java
index 04eab30..439b95e 100644
--- a/test/java/foundation/pEp/jniadapter/test/jni92/TestMain.java
+++ b/test/java/foundation/pEp/jniadapter/test/jni92/TestMain.java
@@ -1,6 +1,6 @@
 package foundation.pEp.jniadapter.test.jni92;
 import foundation.pEp.jniadapter.test.utils.*;
-import foundation.pEp.jniadapter.test.framework.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
 import foundation.pEp.jniadapter.*;
 
 import java.lang.Thread;
diff --git a/test/java/foundation/pEp/jniadapter/test/jni94/Makefile b/test/java/foundation/pEp/jniadapter/test/jni94/Makefile
index e892f11..69812e8 100644
--- a/test/java/foundation/pEp/jniadapter/test/jni94/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/jni94/Makefile
@@ -6,7 +6,7 @@ TEST_UNIT_NAME=jni94
 JAVA_CLASSES = \
  	TestMain.class \
 
-JAVA_CLASSES += $(JAVA_CLASSES_FRAMEWORK)
+JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
 
 .PHONY: compile run test clean
 
diff --git a/test/java/foundation/pEp/jniadapter/test/jni94/TestMain.java b/test/java/foundation/pEp/jniadapter/test/jni94/TestMain.java
index bae1469..f20e04e 100644
--- a/test/java/foundation/pEp/jniadapter/test/jni94/TestMain.java
+++ b/test/java/foundation/pEp/jniadapter/test/jni94/TestMain.java
@@ -1,5 +1,5 @@
 package foundation.pEp.jniadapter.test.jni94;
-import foundation.pEp.jniadapter.test.framework.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
 import foundation.pEp.jniadapter.*;
 import foundation.pEp.jniadapter.test.utils.AdapterBaseTestContext;
 
diff --git a/test/java/foundation/pEp/jniadapter/test/jni98/Makefile b/test/java/foundation/pEp/jniadapter/test/jni98/Makefile
index 7423d67..46b41b7 100644
--- a/test/java/foundation/pEp/jniadapter/test/jni98/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/jni98/Makefile
@@ -7,7 +7,7 @@ JAVA_CLASSES = \
  	TestMain.class \
 	../utils/AdapterTestUtils.class
 
-JAVA_CLASSES += $(JAVA_CLASSES_FRAMEWORK)
+JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
 
 .PHONY: compile run test clean
 
diff --git a/test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java b/test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java
index 448fbed..ff85ed3 100644
--- a/test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java
+++ b/test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java
@@ -2,11 +2,11 @@ package foundation.pEp.jniadapter.test.jni98;
 
 import foundation.pEp.jniadapter.Engine;
 import foundation.pEp.jniadapter.Message;
-import foundation.pEp.jniadapter.test.framework.TestUnit;
+import foundation.pEp.jniadapter.test.pitytest.TestUnit;
 import foundation.pEp.jniadapter.test.utils.AdapterBaseTestContext;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.log;
-import static foundation.pEp.jniadapter.test.framework.TestLogger.logH2;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.log;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.logH2;
 import static foundation.pEp.jniadapter.test.utils.AdapterTestUtils.msgToString;
 
 /*
diff --git a/test/java/foundation/pEp/jniadapter/test/framework/AbstractTestContext.java b/test/java/foundation/pEp/jniadapter/test/pitytest/AbstractTestContext.java
similarity index 94%
rename from test/java/foundation/pEp/jniadapter/test/framework/AbstractTestContext.java
rename to test/java/foundation/pEp/jniadapter/test/pitytest/AbstractTestContext.java
index 0de51ea..04b51b6 100644
--- a/test/java/foundation/pEp/jniadapter/test/framework/AbstractTestContext.java
+++ b/test/java/foundation/pEp/jniadapter/test/pitytest/AbstractTestContext.java
@@ -1,4 +1,4 @@
-package foundation.pEp.jniadapter.test.framework;
+package foundation.pEp.jniadapter.test.pitytest;
 
 public abstract class AbstractTestContext implements TestContextInterface{
     private boolean isInitialized = false;
diff --git a/test/java/foundation/pEp/jniadapter/test/framework/TestContextInterface.java b/test/java/foundation/pEp/jniadapter/test/pitytest/TestContextInterface.java
similarity index 86%
rename from test/java/foundation/pEp/jniadapter/test/framework/TestContextInterface.java
rename to test/java/foundation/pEp/jniadapter/test/pitytest/TestContextInterface.java
index 5913874..fe925cd 100644
--- a/test/java/foundation/pEp/jniadapter/test/framework/TestContextInterface.java
+++ b/test/java/foundation/pEp/jniadapter/test/pitytest/TestContextInterface.java
@@ -1,4 +1,4 @@
-package foundation.pEp.jniadapter.test.framework;
+package foundation.pEp.jniadapter.test.pitytest;
 
 public interface TestContextInterface {
     void init() throws Throwable;
diff --git a/test/java/foundation/pEp/jniadapter/test/framework/TestLogger.java b/test/java/foundation/pEp/jniadapter/test/pitytest/TestLogger.java
similarity index 94%
rename from test/java/foundation/pEp/jniadapter/test/framework/TestLogger.java
rename to test/java/foundation/pEp/jniadapter/test/pitytest/TestLogger.java
index febe312..b4b4f48 100644
--- a/test/java/foundation/pEp/jniadapter/test/framework/TestLogger.java
+++ b/test/java/foundation/pEp/jniadapter/test/pitytest/TestLogger.java
@@ -1,11 +1,11 @@
-package foundation.pEp.jniadapter.test.framework;
+package foundation.pEp.jniadapter.test.pitytest;
 
-import foundation.pEp.jniadapter.test.framework.utils.TestUtils;
+import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 
-import static foundation.pEp.jniadapter.test.framework.utils.TestUtils.*;
+import static foundation.pEp.jniadapter.test.pitytest.utils.TestUtils.*;
 
 public class TestLogger {
     static {
diff --git a/test/java/foundation/pEp/jniadapter/test/framework/TestResult.java b/test/java/foundation/pEp/jniadapter/test/pitytest/TestResult.java
similarity index 61%
rename from test/java/foundation/pEp/jniadapter/test/framework/TestResult.java
rename to test/java/foundation/pEp/jniadapter/test/pitytest/TestResult.java
index 57d6073..335c9b2 100644
--- a/test/java/foundation/pEp/jniadapter/test/framework/TestResult.java
+++ b/test/java/foundation/pEp/jniadapter/test/pitytest/TestResult.java
@@ -1,4 +1,4 @@
-package foundation.pEp.jniadapter.test.framework;
+package foundation.pEp.jniadapter.test.pitytest;
 
 public enum TestResult {
     UNEVALUATED,
diff --git a/test/java/foundation/pEp/jniadapter/test/framework/TestState.java b/test/java/foundation/pEp/jniadapter/test/pitytest/TestState.java
similarity index 73%
rename from test/java/foundation/pEp/jniadapter/test/framework/TestState.java
rename to test/java/foundation/pEp/jniadapter/test/pitytest/TestState.java
index 5fde124..d6c5e1e 100644
--- a/test/java/foundation/pEp/jniadapter/test/framework/TestState.java
+++ b/test/java/foundation/pEp/jniadapter/test/pitytest/TestState.java
@@ -1,4 +1,4 @@
-package foundation.pEp.jniadapter.test.framework;
+package foundation.pEp.jniadapter.test.pitytest;
 
 public enum TestState {
     UNEVALUATED,
diff --git a/test/java/foundation/pEp/jniadapter/test/framework/TestSuite.java b/test/java/foundation/pEp/jniadapter/test/pitytest/TestSuite.java
similarity index 89%
rename from test/java/foundation/pEp/jniadapter/test/framework/TestSuite.java
rename to test/java/foundation/pEp/jniadapter/test/pitytest/TestSuite.java
index 8bdb92d..b11d8cf 100644
--- a/test/java/foundation/pEp/jniadapter/test/framework/TestSuite.java
+++ b/test/java/foundation/pEp/jniadapter/test/pitytest/TestSuite.java
@@ -1,14 +1,14 @@
-package foundation.pEp.jniadapter.test.framework;
+package foundation.pEp.jniadapter.test.pitytest;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
-import static foundation.pEp.jniadapter.test.framework.utils.TestUtils.TermColor;
-import static foundation.pEp.jniadapter.test.framework.utils.TestUtils.*;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+import static foundation.pEp.jniadapter.test.pitytest.utils.TestUtils.TermColor;
+import static foundation.pEp.jniadapter.test.pitytest.utils.TestUtils.*;
 
 import java.util.ArrayList;
 
 // There is a static defaultTestSuite
 // The last created instance is the defaultTestSuite by default
-// Env var: TFVERBOSE
+// Env var: PITYVERBOSE
 
 public class TestSuite {
     private static TestSuite defaultTestSuite = null;
@@ -16,7 +16,7 @@ public class TestSuite {
     private boolean verboseMode = false;
     private boolean verboseModeSetByEnv = false;
     private TermColor testColor = TermColor.CYAN;
-    private String EVNVARNAME_VERBOSE = "TFVERBOSE";
+    private String EVNVARNAME_VERBOSE = "PITYVERBOSE";
 
     public TestSuite() {
         setDefault();
diff --git a/test/java/foundation/pEp/jniadapter/test/framework/TestUnit.java b/test/java/foundation/pEp/jniadapter/test/pitytest/TestUnit.java
similarity index 94%
rename from test/java/foundation/pEp/jniadapter/test/framework/TestUnit.java
rename to test/java/foundation/pEp/jniadapter/test/pitytest/TestUnit.java
index 1472136..4ddc6b9 100644
--- a/test/java/foundation/pEp/jniadapter/test/framework/TestUnit.java
+++ b/test/java/foundation/pEp/jniadapter/test/pitytest/TestUnit.java
@@ -1,10 +1,10 @@
-package foundation.pEp.jniadapter.test.framework;
+package foundation.pEp.jniadapter.test.pitytest;
 
-import foundation.pEp.jniadapter.test.framework.utils.TestUtils;
+import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
-import static foundation.pEp.jniadapter.test.framework.utils.TestUtils.TermColor;
-import static foundation.pEp.jniadapter.test.framework.utils.TestUtils.colorString;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+import static foundation.pEp.jniadapter.test.pitytest.utils.TestUtils.TermColor;
+import static foundation.pEp.jniadapter.test.pitytest.utils.TestUtils.colorString;
 
 import java.util.function.Consumer;
 
diff --git a/test/java/foundation/pEp/jniadapter/test/framework/examples/Makefile.conf b/test/java/foundation/pEp/jniadapter/test/pitytest/examples/Makefile.conf
similarity index 61%
rename from test/java/foundation/pEp/jniadapter/test/framework/examples/Makefile.conf
rename to test/java/foundation/pEp/jniadapter/test/pitytest/examples/Makefile.conf
index a4b1e63..b84047f 100644
--- a/test/java/foundation/pEp/jniadapter/test/framework/examples/Makefile.conf
+++ b/test/java/foundation/pEp/jniadapter/test/pitytest/examples/Makefile.conf
@@ -1,9 +1,9 @@
-JAVA_PKG_BASENAME=foundation.pEp.jniadapter.test.framework.examples
-JAVA_PKG_BASEPATH=foundation/pEp/jniadapter/test/framework/examples
+JAVA_PKG_BASENAME=foundation.pEp.jniadapter.test.pitytest.examples
+JAVA_PKG_BASEPATH=foundation/pEp/jniadapter/test/pitytest/examples
 JAVA_CWD=../../../../../../../
-JAVA=java
+JAVA=java -enableassertions
 
-JAVA_CLASSES_FRAMEWORK= \
+JAVA_CLASSES_PITYTEST= \
  	../../TestSuite.class \
  	../../TestUnit.class \
  	../../TestContextInterface.class \
diff --git a/test/java/foundation/pEp/jniadapter/test/framework/examples/ctxinitfail/Makefile b/test/java/foundation/pEp/jniadapter/test/pitytest/examples/ctxinitfail/Makefile
similarity index 84%
rename from test/java/foundation/pEp/jniadapter/test/framework/examples/ctxinitfail/Makefile
rename to test/java/foundation/pEp/jniadapter/test/pitytest/examples/ctxinitfail/Makefile
index 2faca28..ed02c86 100644
--- a/test/java/foundation/pEp/jniadapter/test/framework/examples/ctxinitfail/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/pitytest/examples/ctxinitfail/Makefile
@@ -5,8 +5,8 @@ TEST_UNIT_NAME=ctxinitfail
 JAVA_CLASSES = \
  	TestMain.class \
 
-# Use the test framework
-JAVA_CLASSES += $(JAVA_CLASSES_FRAMEWORK)
+# Use PityTest
+JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
 
 .PHONY: compile run test clean
 
diff --git a/test/java/foundation/pEp/jniadapter/test/framework/examples/ctxinitfail/TestMain.java b/test/java/foundation/pEp/jniadapter/test/pitytest/examples/ctxinitfail/TestMain.java
similarity index 70%
rename from test/java/foundation/pEp/jniadapter/test/framework/examples/ctxinitfail/TestMain.java
rename to test/java/foundation/pEp/jniadapter/test/pitytest/examples/ctxinitfail/TestMain.java
index 995d6ed..b63b995 100644
--- a/test/java/foundation/pEp/jniadapter/test/framework/examples/ctxinitfail/TestMain.java
+++ b/test/java/foundation/pEp/jniadapter/test/pitytest/examples/ctxinitfail/TestMain.java
@@ -1,8 +1,8 @@
-package foundation.pEp.jniadapter.test.framework.examples.ctxinitfail;
+package foundation.pEp.jniadapter.test.pitytest.examples.ctxinitfail;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
 
-import foundation.pEp.jniadapter.test.framework.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
 
 
 class CtxInitFailContext extends AbstractTestContext {
@@ -11,7 +11,7 @@ class CtxInitFailContext extends AbstractTestContext {
 
     @Override
     public void init() throws Throwable {
-        name = "UnitTestFrameWorkWithoutAName";
+        name = "PityTest";
         result = 50 / 0;
     }
 }
@@ -22,13 +22,13 @@ class TestMain {
 
         new TestUnit<CtxInitFailContext>("ctxinitfail1", new CtxInitFailContext(), ctx -> {
             // do stuff using the context
-            // Test FAILS on unhandled exception, otherwise SUCCESS
+            // throw or assert, to let a testunit fail
             log("Hello World from: " + ctx.name);
         });
 
         new TestUnit<CtxInitFailContext>("ctxinitfail1", new CtxInitFailContext(), ctx -> {
             // do stuff using the context
-            // Test FAILS on unhandled exception, otherwise SUCCESS
+            // throw or assert, to let a testunit fail
             log("Hello World from: " + ctx.name);
         });
 
@@ -36,19 +36,19 @@ class TestMain {
 
         new TestUnit<CtxInitFailContext>("ctxinitfail2", failingContext, ctx -> {
             // do stuff using the context
-            // Test FAILS on unhandled exception, otherwise SUCCESS
+            // throw or assert, to let a testunit fail
             log("Hello World from: " + ctx.name);
         });
 
         new TestUnit<CtxInitFailContext>("ctxinitfail3", failingContext, ctx -> {
             // do stuff using the context
-            // Test FAILS on unhandled exception, otherwise SUCCESS
+            // throw or assert, to let a testunit fail
             log("Hello World from: " + ctx.name);
         });
 
         new TestUnit<CtxInitFailContext>("ctxinitfail4", failingContext, ctx -> {
             // do stuff using the context
-            // Test FAILS on unhandled exception, otherwise SUCCESS
+            // throw or assert, to let a testunit fail
             log("Hello World from: " + ctx.name);
         });
 
diff --git a/test/java/foundation/pEp/jniadapter/test/framework/examples/ctxmembers/Makefile b/test/java/foundation/pEp/jniadapter/test/pitytest/examples/ctxmembers/Makefile
similarity index 84%
rename from test/java/foundation/pEp/jniadapter/test/framework/examples/ctxmembers/Makefile
rename to test/java/foundation/pEp/jniadapter/test/pitytest/examples/ctxmembers/Makefile
index b151a65..7820571 100644
--- a/test/java/foundation/pEp/jniadapter/test/framework/examples/ctxmembers/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/pitytest/examples/ctxmembers/Makefile
@@ -5,8 +5,8 @@ TEST_UNIT_NAME=ctxmembers
 JAVA_CLASSES = \
  	TestMain.class \
 
-# Use the test framework
-JAVA_CLASSES += $(JAVA_CLASSES_FRAMEWORK)
+# Use PityTest
+JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
 
 .PHONY: compile run test clean
 
diff --git a/test/java/foundation/pEp/jniadapter/test/framework/examples/ctxmembers/TestMain.java b/test/java/foundation/pEp/jniadapter/test/pitytest/examples/ctxmembers/TestMain.java
similarity index 81%
rename from test/java/foundation/pEp/jniadapter/test/framework/examples/ctxmembers/TestMain.java
rename to test/java/foundation/pEp/jniadapter/test/pitytest/examples/ctxmembers/TestMain.java
index 1fab12c..261ee0a 100644
--- a/test/java/foundation/pEp/jniadapter/test/framework/examples/ctxmembers/TestMain.java
+++ b/test/java/foundation/pEp/jniadapter/test/pitytest/examples/ctxmembers/TestMain.java
@@ -1,7 +1,7 @@
-package foundation.pEp.jniadapter.test.framework.examples.ctxmembers;
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
-import foundation.pEp.jniadapter.test.framework.*;
-import foundation.pEp.jniadapter.test.framework.utils.TestUtils;
+package foundation.pEp.jniadapter.test.pitytest.examples.ctxmembers;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
+import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
 
 
 // Context member object instantiation
@@ -22,7 +22,7 @@ class CtxMembersTestContext extends AbstractTestContext {
         log("=== OUTPUT FROM TEST CONTEXT INIT BEGIN ===");
         log(getTestContextName()+ " - init() called");
         correct = new ExampleCtxMember(true);
-        name = "UnitTestFrameWorkWithoutAName";
+        name = "PityTest";
         log("=== OUTPUT FROM TEST CONTEXT INIT END   ===");
     }
 }
@@ -31,7 +31,7 @@ class TestMain {
     public static void main(String[] args) throws Exception {
         TestUnit test = new TestUnit<CtxMembersTestContext>("ctxmembers",new CtxMembersTestContext() , ctx  -> {
             // do stuff using the context
-            // Test FAILS on unhandled exception, otherwise SUCCESS
+            // throw or assert, to let a testunit fail
             log("=== OUTPUT FROM THE TEST ITSELF BEGIN ===");
             log("Hello World from: " + ctx.name);
             log("=== OUTPUT FROM THE TEST ITSELF END   ===");
diff --git a/test/java/foundation/pEp/jniadapter/test/framework/examples/helloworld/Makefile b/test/java/foundation/pEp/jniadapter/test/pitytest/examples/helloworld/Makefile
similarity index 84%
rename from test/java/foundation/pEp/jniadapter/test/framework/examples/helloworld/Makefile
rename to test/java/foundation/pEp/jniadapter/test/pitytest/examples/helloworld/Makefile
index de97c29..a1fec04 100644
--- a/test/java/foundation/pEp/jniadapter/test/framework/examples/helloworld/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/pitytest/examples/helloworld/Makefile
@@ -5,8 +5,8 @@ TEST_UNIT_NAME=helloworld
 JAVA_CLASSES = \
  	TestMain.class \
 
-# Use the test framework
-JAVA_CLASSES += $(JAVA_CLASSES_FRAMEWORK)
+# Use PityTest
+JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
 
 .PHONY: compile run test clean
 
diff --git a/test/java/foundation/pEp/jniadapter/test/framework/examples/helloworld/TestMain.java b/test/java/foundation/pEp/jniadapter/test/pitytest/examples/helloworld/TestMain.java
similarity index 72%
rename from test/java/foundation/pEp/jniadapter/test/framework/examples/helloworld/TestMain.java
rename to test/java/foundation/pEp/jniadapter/test/pitytest/examples/helloworld/TestMain.java
index a19e2d5..955f065 100644
--- a/test/java/foundation/pEp/jniadapter/test/framework/examples/helloworld/TestMain.java
+++ b/test/java/foundation/pEp/jniadapter/test/pitytest/examples/helloworld/TestMain.java
@@ -1,6 +1,6 @@
-package foundation.pEp.jniadapter.test.framework.examples.helloworld;
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
-import foundation.pEp.jniadapter.test.framework.*;
+package foundation.pEp.jniadapter.test.pitytest.examples.helloworld;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
 
 
 class HelloWorldTestContext extends AbstractTestContext {
@@ -8,7 +8,7 @@ class HelloWorldTestContext extends AbstractTestContext {
 
     @Override
     public void init() throws Throwable {
-        name = "UnitTestFrameWorkWithoutAName";
+        name = "PityTest";
     }
 }
 
@@ -16,7 +16,7 @@ class TestMain {
     public static void main(String[] args) throws Exception {
         new TestUnit<HelloWorldTestContext>("Hello World1",new HelloWorldTestContext() , ctx  -> {
             // do stuff using the context
-            // Test FAILS on unhandled exception, otherwise SUCCESS
+            // throw or assert, to let a testunit fail
             log("=== OUTPUT FROM THE TEST ITSELF BEGIN ===");
             log("OK Hello World 1 from: " + ctx.name);
             log("=== OUTPUT FROM THE TEST ITSELF END   ===");
@@ -24,7 +24,7 @@ class TestMain {
 
         new TestUnit<HelloWorldTestContext>("Hello World2",new HelloWorldTestContext() , ctx  -> {
             // do stuff using the context
-            // Test FAILS on unhandled exception, otherwise SUCCESS
+            // throw or assert, to let a testunit fail
             log("=== OUTPUT FROM THE TEST ITSELF BEGIN ===");
             log("OK Hello World 2 from: " + ctx.name);
             log("=== OUTPUT FROM THE TEST ITSELF END   ===");
@@ -32,11 +32,11 @@ class TestMain {
 
         new TestUnit<HelloWorldTestContext>("Hello World3",new HelloWorldTestContext() , ctx  -> {
             // do stuff using the context
-            // Test FAILS on unhandled exception, otherwise SUCCESS
+            // throw or assert, to let a testunit fail
             log("=== OUTPUT FROM THE TEST ITSELF BEGIN ===");
             log("Failing Hello World 3 from: " + ctx.name);
             log("=== OUTPUT FROM THE TEST ITSELF END   ===");
-            throw new RuntimeException();
+            assert false;
         }).run();
     }
 }
diff --git a/test/java/foundation/pEp/jniadapter/test/framework/examples/testsuite/Makefile b/test/java/foundation/pEp/jniadapter/test/pitytest/examples/testsuite/Makefile
similarity index 84%
rename from test/java/foundation/pEp/jniadapter/test/framework/examples/testsuite/Makefile
rename to test/java/foundation/pEp/jniadapter/test/pitytest/examples/testsuite/Makefile
index 326b17b..e54d839 100644
--- a/test/java/foundation/pEp/jniadapter/test/framework/examples/testsuite/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/pitytest/examples/testsuite/Makefile
@@ -5,8 +5,8 @@ TEST_UNIT_NAME=testsuite
 JAVA_CLASSES = \
  	TestMain.class \
 
-# Use the test framework
-JAVA_CLASSES += $(JAVA_CLASSES_FRAMEWORK)
+# Use PityTest
+JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
 
 .PHONY: compile run test clean
 
diff --git a/test/java/foundation/pEp/jniadapter/test/framework/examples/testsuite/TestMain.java b/test/java/foundation/pEp/jniadapter/test/pitytest/examples/testsuite/TestMain.java
similarity index 83%
rename from test/java/foundation/pEp/jniadapter/test/framework/examples/testsuite/TestMain.java
rename to test/java/foundation/pEp/jniadapter/test/pitytest/examples/testsuite/TestMain.java
index 431dafa..18b00a8 100644
--- a/test/java/foundation/pEp/jniadapter/test/framework/examples/testsuite/TestMain.java
+++ b/test/java/foundation/pEp/jniadapter/test/pitytest/examples/testsuite/TestMain.java
@@ -1,13 +1,13 @@
-package foundation.pEp.jniadapter.test.framework.examples.testsuite;
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
-import foundation.pEp.jniadapter.test.framework.*;
+package foundation.pEp.jniadapter.test.pitytest.examples.testsuite;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
 
 class TestSuiteContext extends AbstractTestContext {
     String name;
 
     @Override
     public void init() throws Throwable {
-        name = "UnitTestFrameWorkWithoutAName";
+        name = "PityTest";
     }
 }
 
diff --git a/test/java/foundation/pEp/jniadapter/test/framework/utils/Pair.java b/test/java/foundation/pEp/jniadapter/test/pitytest/utils/Pair.java
similarity index 87%
rename from test/java/foundation/pEp/jniadapter/test/framework/utils/Pair.java
rename to test/java/foundation/pEp/jniadapter/test/pitytest/utils/Pair.java
index e65551f..1ac23d0 100644
--- a/test/java/foundation/pEp/jniadapter/test/framework/utils/Pair.java
+++ b/test/java/foundation/pEp/jniadapter/test/pitytest/utils/Pair.java
@@ -1,4 +1,4 @@
-package foundation.pEp.jniadapter.test.framework.utils;
+package foundation.pEp.jniadapter.test.pitytest.utils;
 
 public class Pair<K, V> {
     private K key = null;
diff --git a/test/java/foundation/pEp/jniadapter/test/framework/utils/TestUtils.java b/test/java/foundation/pEp/jniadapter/test/pitytest/utils/TestUtils.java
similarity index 98%
rename from test/java/foundation/pEp/jniadapter/test/framework/utils/TestUtils.java
rename to test/java/foundation/pEp/jniadapter/test/pitytest/utils/TestUtils.java
index ba486d3..c8fba5c 100644
--- a/test/java/foundation/pEp/jniadapter/test/framework/utils/TestUtils.java
+++ b/test/java/foundation/pEp/jniadapter/test/pitytest/utils/TestUtils.java
@@ -1,4 +1,4 @@
-package foundation.pEp.jniadapter.test.framework.utils;
+package foundation.pEp.jniadapter.test.pitytest.utils;
 
 import java.io.File;
 import java.io.IOException;
@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-//import static foundation.pEp.jniadapter.test.framework.TestLogger.log;
+//import static foundation.pEp.jniadapter.test.pitytest.TestLogger.log;
 
 public class TestUtils {
     // Pure static class
diff --git a/test/java/foundation/pEp/jniadapter/test/regression/Makefile b/test/java/foundation/pEp/jniadapter/test/regression/Makefile
index a620b71..0df99b2 100644
--- a/test/java/foundation/pEp/jniadapter/test/regression/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/regression/Makefile
@@ -7,7 +7,7 @@ JAVA_CLASSES = \
  	TestMain.class \
 	../utils/AdapterBaseTestContext.class
 
-JAVA_CLASSES += $(JAVA_CLASSES_FRAMEWORK)
+JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
 
 .PHONY: compile run test clean
 
diff --git a/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java b/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java
index ed3da47..d01b3a6 100644
--- a/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java
+++ b/test/java/foundation/pEp/jniadapter/test/regression/TestMain.java
@@ -1,5 +1,5 @@
 package foundation.pEp.jniadapter.test.regression;
-import foundation.pEp.jniadapter.test.framework.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
 import foundation.pEp.jniadapter.test.utils.*;
 import foundation.pEp.jniadapter.*;
 
diff --git a/test/java/foundation/pEp/jniadapter/test/templateAlice/Makefile b/test/java/foundation/pEp/jniadapter/test/templateAlice/Makefile
index 1ba568d..4ea392e 100644
--- a/test/java/foundation/pEp/jniadapter/test/templateAlice/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/templateAlice/Makefile
@@ -9,7 +9,7 @@ JAVA_CLASSES = \
  	../utils/AdapterTestUtils.class \
  	../utils/TestCallbacks.class
 
-JAVA_CLASSES += $(JAVA_CLASSES_FRAMEWORK)
+JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
 
 .PHONY: compile alice test clean
 
diff --git a/test/java/foundation/pEp/jniadapter/test/templateAlice/TestAlice.java b/test/java/foundation/pEp/jniadapter/test/templateAlice/TestAlice.java
index 4160836..d82a4f7 100644
--- a/test/java/foundation/pEp/jniadapter/test/templateAlice/TestAlice.java
+++ b/test/java/foundation/pEp/jniadapter/test/templateAlice/TestAlice.java
@@ -1,7 +1,7 @@
 package foundation.pEp.jniadapter.test.templateAlice;
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
-import foundation.pEp.jniadapter.test.framework.*;
-import foundation.pEp.jniadapter.test.framework.utils.TestUtils;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
+import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
 import foundation.pEp.jniadapter.test.utils.*;
 
 class TestAlice {
@@ -11,7 +11,7 @@ class TestAlice {
 
         new TestUnit<AdapterBaseTestContext>("Test Alice",new AdapterBaseTestContext() , ctx  -> {
             // do stuff using the context
-            // Test FAILS on unhandled exception, otherwise SUCCESS
+            // throw or assert, to let a testunit fail
 
             ctx.alice = ctx.engine.myself(ctx.alice);
 
diff --git a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/Makefile b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/Makefile
index 3ee7096..a868856 100644
--- a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/Makefile
@@ -10,7 +10,7 @@ JAVA_CLASSES = \
  	../utils/AdapterTestUtils.class \
  	../utils/TestCallbacks.class
 
-JAVA_CLASSES += $(JAVA_CLASSES_FRAMEWORK)
+JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
 
 .PHONY: compile alice bob test clean
 
diff --git a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestAlice.java b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestAlice.java
index 0b11319..c200e88 100644
--- a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestAlice.java
+++ b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestAlice.java
@@ -1,9 +1,9 @@
 package foundation.pEp.jniadapter.test.templateAliceBob;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
 
-import foundation.pEp.jniadapter.test.framework.*;
-import foundation.pEp.jniadapter.test.framework.utils.TestUtils;
+import foundation.pEp.jniadapter.test.pitytest.*;
+import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
 import foundation.pEp.jniadapter.test.utils.*;
 
 class TestAlice {
diff --git a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestBob.java b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestBob.java
index 0af8d6e..d70c030 100644
--- a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestBob.java
+++ b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestBob.java
@@ -1,9 +1,9 @@
 package foundation.pEp.jniadapter.test.templateAliceBob;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
 
-import foundation.pEp.jniadapter.test.framework.*;
-import foundation.pEp.jniadapter.test.framework.utils.TestUtils;
+import foundation.pEp.jniadapter.test.pitytest.*;
+import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
 import foundation.pEp.jniadapter.test.utils.*;
 
 class TestBob {
diff --git a/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/Makefile b/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/Makefile
index 526f8b2..32a8ec5 100644
--- a/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/Makefile
@@ -11,7 +11,7 @@ JAVA_CLASSES = \
  	../utils/AdapterTestUtils.class \
  	../utils/TestCallbacks.class
 
-JAVA_CLASSES += $(JAVA_CLASSES_FRAMEWORK)
+JAVA_CLASSES += $(JAVA_CLASSES_PITYTEST)
 
 .PHONY: compile alice bob carol test clean
 
diff --git a/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestAlice.java b/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestAlice.java
index cdccc00..82eaf1e 100644
--- a/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestAlice.java
+++ b/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestAlice.java
@@ -1,7 +1,7 @@
 package foundation.pEp.jniadapter.test.templateAliceBobCarol;
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
-import foundation.pEp.jniadapter.test.framework.*;
-import foundation.pEp.jniadapter.test.framework.utils.TestUtils;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
+import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
 import foundation.pEp.jniadapter.test.utils.*;
 
 class TestAlice {
@@ -11,7 +11,7 @@ class TestAlice {
 
         new TestUnit<AdapterBaseTestContext>("Test Alice",new AdapterBaseTestContext() , ctx  -> {
             // do stuff using the context
-            // Test FAILS on unhandled exception, otherwise SUCCESS
+            // throw or assert, to let a testunit fail
 
             ctx.alice = ctx.engine.myself(ctx.alice);
 
diff --git a/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestBob.java b/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestBob.java
index 69468f6..9121f1c 100644
--- a/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestBob.java
+++ b/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestBob.java
@@ -1,7 +1,7 @@
 package foundation.pEp.jniadapter.test.templateAliceBobCarol;
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
-import foundation.pEp.jniadapter.test.framework.*;
-import foundation.pEp.jniadapter.test.framework.utils.TestUtils;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
+import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
 import foundation.pEp.jniadapter.test.utils.*;
 
 class TestBob {
@@ -11,7 +11,7 @@ class TestBob {
 
         new TestUnit<AdapterBaseTestContext>("Test Bob",new AdapterBaseTestContext() , ctx  -> {
             // do stuff using the context
-            // Test FAILS on unhandled exception, otherwise SUCCESS
+            // throw or assert, to let a testunit fail
 
             ctx.bob = ctx.engine.myself(ctx.bob);
 
diff --git a/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestCarol.java b/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestCarol.java
index 0175680..d57b93d 100644
--- a/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestCarol.java
+++ b/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestCarol.java
@@ -1,7 +1,7 @@
 package foundation.pEp.jniadapter.test.templateAliceBobCarol;
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
-import foundation.pEp.jniadapter.test.framework.*;
-import foundation.pEp.jniadapter.test.framework.utils.TestUtils;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
+import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
 import foundation.pEp.jniadapter.test.utils.*;
 
 class TestCarol {
@@ -11,7 +11,7 @@ class TestCarol {
 
         new TestUnit<AdapterBaseTestContext>("Test Carol",new AdapterBaseTestContext() , ctx  -> {
             // do stuff using the context
-            // Test FAILS on unhandled exception, otherwise SUCCESS
+            // throw or assert, to let a testunit fail
 
 //            ctx.carol = ctx.engine.myself(ctx.carol);
 
diff --git a/test/java/foundation/pEp/jniadapter/test/utils/AdapterBaseTestContext.java b/test/java/foundation/pEp/jniadapter/test/utils/AdapterBaseTestContext.java
index de9648a..4434654 100644
--- a/test/java/foundation/pEp/jniadapter/test/utils/AdapterBaseTestContext.java
+++ b/test/java/foundation/pEp/jniadapter/test/utils/AdapterBaseTestContext.java
@@ -1,10 +1,7 @@
 package foundation.pEp.jniadapter.test.utils;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
-
-import foundation.pEp.jniadapter.test.framework.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
 import foundation.pEp.jniadapter.*;
-import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.*;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
diff --git a/test/java/foundation/pEp/jniadapter/test/utils/AdapterTestUtils.java b/test/java/foundation/pEp/jniadapter/test/utils/AdapterTestUtils.java
index 24661ce..48e3efb 100644
--- a/test/java/foundation/pEp/jniadapter/test/utils/AdapterTestUtils.java
+++ b/test/java/foundation/pEp/jniadapter/test/utils/AdapterTestUtils.java
@@ -4,7 +4,7 @@ import foundation.pEp.jniadapter.*;
 import java.util.ArrayList;
 import java.util.Vector;
 
-import static foundation.pEp.jniadapter.test.framework.utils.TestUtils.clipString;
+import static foundation.pEp.jniadapter.test.pitytest.utils.TestUtils.clipString;
 
 public class AdapterTestUtils {
     public static String identityToString(Identity i, Boolean full) {
diff --git a/test/java/foundation/pEp/jniadapter/test/utils/TestCallbacks.java b/test/java/foundation/pEp/jniadapter/test/utils/TestCallbacks.java
index de03c83..c0381c7 100644
--- a/test/java/foundation/pEp/jniadapter/test/utils/TestCallbacks.java
+++ b/test/java/foundation/pEp/jniadapter/test/utils/TestCallbacks.java
@@ -1,6 +1,6 @@
 package foundation.pEp.jniadapter.test.utils;
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
-import foundation.pEp.jniadapter.test.framework.*;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+
 import foundation.pEp.jniadapter.*;
 
 public class TestCallbacks implements Sync.MessageToSendCallback, Sync.NotifyHandshakeCallback {
diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/FsMQManager.java b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/FsMQManager.java
index eb0ac9e..1f58aaf 100644
--- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/FsMQManager.java
+++ b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/FsMQManager.java
@@ -1,12 +1,12 @@
 package foundation.pEp.jniadapter.test.utils.transport.fsmqmanager;
 
-import foundation.pEp.jniadapter.test.framework.utils.TestUtils;
+import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
 import foundation.pEp.jniadapter.test.utils.transport.fsmsgqueue.FsMsgQueue;
 
 import java.io.*;
 import java.util.*;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.log;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.log;
 
 public class FsMQManager {
     public FsMQIdentities identities = null;
diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/Makefile.conf b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/Makefile.conf
index adad3ba..d0d7cfd 100644
--- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/Makefile.conf
+++ b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/Makefile.conf
@@ -11,19 +11,19 @@ JAVA_CLASSES_FSMSGQUEUE= \
  	../../UnknownIdentityException.class \
  	../../../fsmsgqueue/FsMsgQueue.class
 
-JAVA_CLASSES_FRAMEWORK= \
- 	../../../../../framework/TestSuite.class \
- 	../../../../../framework/TestUnit.class \
- 	../../../../../framework/TestContextInterface.class \
- 	../../../../../framework/AbstractTestContext.class \
- 	../../../../../framework/TestLogger.class \
- 	../../../../../framework/utils/TestUtils.class \
- 	../../../../../framework/utils/Pair.class \
- 	../../../../../framework/TestState.class \
- 	../../../../../framework/TestResult.class
+JAVA_CLASSES_PITYTEST= \
+ 	../../../../../pitytest/TestSuite.class \
+ 	../../../../../pitytest/TestUnit.class \
+ 	../../../../../pitytest/TestContextInterface.class \
+ 	../../../../../pitytest/AbstractTestContext.class \
+ 	../../../../../pitytest/TestLogger.class \
+ 	../../../../../pitytest/utils/TestUtils.class \
+ 	../../../../../pitytest/utils/Pair.class \
+ 	../../../../../pitytest/TestState.class \
+ 	../../../../../pitytest/TestResult.class
 
 JAVA_CLASSES_TESTSCOMMON= \
 	../utils/FsMQManagerTestUtils.class \
 	../ctx/FsMQManagerBaseTestContext.class
 
-JAVA_CLASSES_TESTSCOMMON += $(JAVA_CLASSES_FRAMEWORK)
\ No newline at end of file
+JAVA_CLASSES_TESTSCOMMON += $(JAVA_CLASSES_PITYTEST)
\ No newline at end of file
diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/ctx/FsMQManagerBaseTestContext.java b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/ctx/FsMQManagerBaseTestContext.java
index 4437f72..e896773 100644
--- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/ctx/FsMQManagerBaseTestContext.java
+++ b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/ctx/FsMQManagerBaseTestContext.java
@@ -1,7 +1,7 @@
 package foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.test.ctx;
 
 import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.*;
-import foundation.pEp.jniadapter.test.framework.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
 import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.test.utils.FsMQManagerTestUtils;
 
 import java.util.*;
diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/identities/Makefile b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/identities/Makefile
index 89cf74c..ca19942 100644
--- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/identities/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/identities/Makefile
@@ -6,6 +6,7 @@ JAVA_CLASSES = \
  	TestMain.class \
 
 JAVA_CLASSES += $(JAVA_CLASSES_FSMSGQUEUE)
+JAVA_CLASSES += $(JAVA_CLASSES_TESTSCOMMON)
 
 .PHONY: compile run test clean
 
diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/identities/TestMain.java b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/identities/TestMain.java
index 47c7e61..beb43a7 100644
--- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/identities/TestMain.java
+++ b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/identities/TestMain.java
@@ -1,9 +1,9 @@
 package foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.test.identities;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
 
 import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.*;
-import foundation.pEp.jniadapter.test.framework.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
 import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.test.utils.FsMQManagerTestUtils;
 
 import java.util.ArrayList;
diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_ping/TestAlice.java b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_ping/TestAlice.java
index 33383f0..565ada5 100644
--- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_ping/TestAlice.java
+++ b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_ping/TestAlice.java
@@ -1,10 +1,10 @@
 package foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.test.stateless_ping;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
 
-import foundation.pEp.jniadapter.test.framework.utils.TestUtils;
+import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
 import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.*;
-import foundation.pEp.jniadapter.test.framework.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
 import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.test.ctx.*;
 
 import java.io.IOException;
diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_ping/TestBob.java b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_ping/TestBob.java
index 5996dff..5ec65e1 100644
--- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_ping/TestBob.java
+++ b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_ping/TestBob.java
@@ -1,10 +1,10 @@
 package foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.test.stateless_ping;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
 
-import foundation.pEp.jniadapter.test.framework.utils.TestUtils;
+import foundation.pEp.jniadapter.test.pitytest.utils.TestUtils;
 import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.*;
-import foundation.pEp.jniadapter.test.framework.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
 import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.test.ctx.*;
 
 import java.io.IOException;
diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_rxtx/TestMain.java b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_rxtx/TestMain.java
index 4e45c6c..28ca193 100644
--- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_rxtx/TestMain.java
+++ b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_rxtx/TestMain.java
@@ -1,9 +1,9 @@
 package foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.test.stateless_rxtx;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
 
 import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.*;
-import foundation.pEp.jniadapter.test.framework.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
 
 import java.util.ArrayList;
 
diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/utils/FsMQManagerTestUtils.java b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/utils/FsMQManagerTestUtils.java
index a42713d..8f19a71 100644
--- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/utils/FsMQManagerTestUtils.java
+++ b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/utils/FsMQManagerTestUtils.java
@@ -3,7 +3,7 @@ package foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.test.utils;
 import java.util.ArrayList;
 import java.util.List;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.log;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.log;
 
 public class FsMQManagerTestUtils {
     public static List<String> createTestMessages(String from, int count) {
diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/FsMsgQueue.java b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/FsMsgQueue.java
index cf5dae7..cb3256d 100644
--- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/FsMsgQueue.java
+++ b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/FsMsgQueue.java
@@ -1,9 +1,9 @@
 package foundation.pEp.jniadapter.test.utils.transport.fsmsgqueue;
 
-import foundation.pEp.jniadapter.test.framework.utils.Pair;
+import foundation.pEp.jniadapter.test.pitytest.utils.Pair;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
-import static foundation.pEp.jniadapter.test.framework.utils.TestUtils.*;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+import static foundation.pEp.jniadapter.test.pitytest.utils.TestUtils.*;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/test/Makefile.conf b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/test/Makefile.conf
index 5524ae4..3e16b69 100644
--- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/test/Makefile.conf
+++ b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/test/Makefile.conf
@@ -5,3 +5,16 @@ JAVA=java -enableassertions
 
 JAVA_CLASSES_FSMSGQUEUE= \
  	../../FsMsgQueue.class
+
+JAVA_CLASSES_PITYTEST= \
+ 	../../../../../pitytest/TestSuite.class \
+ 	../../../../../pitytest/TestUnit.class \
+ 	../../../../../pitytest/TestContextInterface.class \
+ 	../../../../../pitytest/AbstractTestContext.class \
+ 	../../../../../pitytest/TestLogger.class \
+ 	../../../../../pitytest/utils/TestUtils.class \
+ 	../../../../../pitytest/utils/Pair.class \
+ 	../../../../../pitytest/TestState.class \
+ 	../../../../../pitytest/TestResult.class
+
+JAVA_CLASSES_TESTSCOMMON += $(JAVA_CLASSES_PITYTEST)
\ No newline at end of file
diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/test/regression/Makefile b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/test/regression/Makefile
index f4c22bb..ab7ff9c 100644
--- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/test/regression/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/test/regression/Makefile
@@ -6,6 +6,7 @@ JAVA_CLASSES = \
  	TestMain.class \
 
 JAVA_CLASSES += $(JAVA_CLASSES_FSMSGQUEUE)
+JAVA_CLASSES += $(JAVA_CLASSES_TESTSCOMMON)
 
 .PHONY: compile run test clean
 
diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/test/regression/TestMain.java b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/test/regression/TestMain.java
index 6268392..9228676 100644
--- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/test/regression/TestMain.java
+++ b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/test/regression/TestMain.java
@@ -1,11 +1,11 @@
 package foundation.pEp.jniadapter.test.utils.transport.fsmsgqueue.test.regression;
 
-import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
-import static foundation.pEp.jniadapter.test.framework.utils.TestUtils.*;
+import static foundation.pEp.jniadapter.test.pitytest.TestLogger.*;
+import static foundation.pEp.jniadapter.test.pitytest.utils.TestUtils.*;
 
 import foundation.pEp.jniadapter.test.utils.transport.fsmsgqueue.*;
 
-import foundation.pEp.jniadapter.test.framework.*;
+import foundation.pEp.jniadapter.test.pitytest.*;
 
 import java.io.File;
 import java.util.ArrayList;