diff --git a/test/java/foundation/pEp/jniadapter/test/Makefile.conf b/test/java/foundation/pEp/jniadapter/test/Makefile.conf
index f36c1a5..ef6c079 100644
--- a/test/java/foundation/pEp/jniadapter/test/Makefile.conf
+++ b/test/java/foundation/pEp/jniadapter/test/Makefile.conf
@@ -19,11 +19,16 @@ CLASSPATH=.:$(REPOROOT)/src
 JAVA=java -Xcheck:jni -cp $(CLASSPATH) -Djava.library.path=$(CLASSPATH)
 
 JAVA_CLASSES_FRAMEWORK= \
- 	../framework/TestUnit.class \
- 	../framework/TestContextInterface.class \
- 	../framework/AbstractTestContext.class \
- 	../framework/TestLogger.class \
- 	../framework/TestUtils.class
+ 	../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
+
 
 
 ifdef ENGINE_LIB_PATH
diff --git a/test/java/foundation/pEp/jniadapter/test/framework/TestLogger.java b/test/java/foundation/pEp/jniadapter/test/framework/TestLogger.java
index c7ed681..febe312 100644
--- a/test/java/foundation/pEp/jniadapter/test/framework/TestLogger.java
+++ b/test/java/foundation/pEp/jniadapter/test/framework/TestLogger.java
@@ -1,9 +1,11 @@
 package foundation.pEp.jniadapter.test.framework;
 
+import foundation.pEp.jniadapter.test.framework.utils.TestUtils;
+
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 
-import static foundation.pEp.jniadapter.test.framework.TestUtils.*;
+import static foundation.pEp.jniadapter.test.framework.utils.TestUtils.*;
 
 public class TestLogger {
     static {
diff --git a/test/java/foundation/pEp/jniadapter/test/framework/TestSuite.java b/test/java/foundation/pEp/jniadapter/test/framework/TestSuite.java
index f5c6f08..8bdb92d 100644
--- a/test/java/foundation/pEp/jniadapter/test/framework/TestSuite.java
+++ b/test/java/foundation/pEp/jniadapter/test/framework/TestSuite.java
@@ -1,8 +1,8 @@
 package foundation.pEp.jniadapter.test.framework;
 
 import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
-import static foundation.pEp.jniadapter.test.framework.TestUtils.TermColor;
-import static foundation.pEp.jniadapter.test.framework.TestUtils.*;
+import static foundation.pEp.jniadapter.test.framework.utils.TestUtils.TermColor;
+import static foundation.pEp.jniadapter.test.framework.utils.TestUtils.*;
 
 import java.util.ArrayList;
 
diff --git a/test/java/foundation/pEp/jniadapter/test/framework/TestUnit.java b/test/java/foundation/pEp/jniadapter/test/framework/TestUnit.java
index 225fadd..1472136 100644
--- a/test/java/foundation/pEp/jniadapter/test/framework/TestUnit.java
+++ b/test/java/foundation/pEp/jniadapter/test/framework/TestUnit.java
@@ -1,8 +1,10 @@
 package foundation.pEp.jniadapter.test.framework;
 
+import foundation.pEp.jniadapter.test.framework.utils.TestUtils;
+
 import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
-import static foundation.pEp.jniadapter.test.framework.TestUtils.TermColor;
-import static foundation.pEp.jniadapter.test.framework.TestUtils.colorString;
+import static foundation.pEp.jniadapter.test.framework.utils.TestUtils.TermColor;
+import static foundation.pEp.jniadapter.test.framework.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/framework/examples/Makefile.conf
index e90272d..a4b1e63 100644
--- a/test/java/foundation/pEp/jniadapter/test/framework/examples/Makefile.conf
+++ b/test/java/foundation/pEp/jniadapter/test/framework/examples/Makefile.conf
@@ -9,6 +9,8 @@ JAVA_CLASSES_FRAMEWORK= \
  	../../TestContextInterface.class \
  	../../AbstractTestContext.class \
  	../../TestLogger.class \
- 	../../TestUtils.class \
+ 	../../utils/TestUtils.class \
+ 	../../utils/Pair.class \
  	../../TestState.class \
  	../../TestResult.class
+
diff --git a/test/java/foundation/pEp/jniadapter/test/framework/examples/ctxmembers/TestMain.java b/test/java/foundation/pEp/jniadapter/test/framework/examples/ctxmembers/TestMain.java
index 61cb2c0..1fab12c 100644
--- a/test/java/foundation/pEp/jniadapter/test/framework/examples/ctxmembers/TestMain.java
+++ b/test/java/foundation/pEp/jniadapter/test/framework/examples/ctxmembers/TestMain.java
@@ -1,6 +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;
 
 
 // Context member object instantiation
diff --git a/test/java/foundation/pEp/jniadapter/test/framework/utils/Pair.java b/test/java/foundation/pEp/jniadapter/test/framework/utils/Pair.java
new file mode 100644
index 0000000..e65551f
--- /dev/null
+++ b/test/java/foundation/pEp/jniadapter/test/framework/utils/Pair.java
@@ -0,0 +1,28 @@
+package foundation.pEp.jniadapter.test.framework.utils;
+
+public class Pair<K, V> {
+    private K key = null;
+    private V value = null;
+
+    public K getKey() {
+        return key;
+    }
+
+    public void setKey(K key) {
+        this.key = key;
+    }
+
+    public V getValue() {
+        return value;
+    }
+
+    public void setValue(V value) {
+        this.value = value;
+    }
+
+    public Pair(K f, V s) {
+        key = f;
+        value = s;
+    }
+}
+
diff --git a/test/java/foundation/pEp/jniadapter/test/framework/TestUtils.java b/test/java/foundation/pEp/jniadapter/test/framework/utils/TestUtils.java
similarity index 98%
rename from test/java/foundation/pEp/jniadapter/test/framework/TestUtils.java
rename to test/java/foundation/pEp/jniadapter/test/framework/utils/TestUtils.java
index 7d4cb65..ba486d3 100644
--- a/test/java/foundation/pEp/jniadapter/test/framework/TestUtils.java
+++ b/test/java/foundation/pEp/jniadapter/test/framework/utils/TestUtils.java
@@ -1,4 +1,4 @@
-package foundation.pEp.jniadapter.test.framework;
+package foundation.pEp.jniadapter.test.framework.utils;
 
 import java.io.File;
 import java.io.IOException;
@@ -17,6 +17,8 @@ import java.util.stream.Collectors;
 //import static foundation.pEp.jniadapter.test.framework.TestLogger.log;
 
 public class TestUtils {
+    // Pure static class
+    private TestUtils() { }
 
     /*
     System
diff --git a/test/java/foundation/pEp/jniadapter/test/templateAlice/TestAlice.java b/test/java/foundation/pEp/jniadapter/test/templateAlice/TestAlice.java
index c594bf4..4160836 100644
--- a/test/java/foundation/pEp/jniadapter/test/templateAlice/TestAlice.java
+++ b/test/java/foundation/pEp/jniadapter/test/templateAlice/TestAlice.java
@@ -1,6 +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 foundation.pEp.jniadapter.test.utils.*;
 
 class TestAlice {
diff --git a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestAlice.java b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestAlice.java
index f36244e..0b11319 100644
--- a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestAlice.java
+++ b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestAlice.java
@@ -3,6 +3,7 @@ package foundation.pEp.jniadapter.test.templateAliceBob;
 import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
 
 import foundation.pEp.jniadapter.test.framework.*;
+import foundation.pEp.jniadapter.test.framework.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 e7bdc27..0af8d6e 100644
--- a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestBob.java
+++ b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestBob.java
@@ -3,6 +3,7 @@ package foundation.pEp.jniadapter.test.templateAliceBob;
 import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
 
 import foundation.pEp.jniadapter.test.framework.*;
+import foundation.pEp.jniadapter.test.framework.utils.TestUtils;
 import foundation.pEp.jniadapter.test.utils.*;
 
 class TestBob {
diff --git a/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestAlice.java b/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestAlice.java
index 12eb2b5..cdccc00 100644
--- a/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestAlice.java
+++ b/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestAlice.java
@@ -1,6 +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 foundation.pEp.jniadapter.test.utils.*;
 
 class TestAlice {
diff --git a/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestBob.java b/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestBob.java
index 99c3af8..69468f6 100644
--- a/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestBob.java
+++ b/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestBob.java
@@ -1,6 +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 foundation.pEp.jniadapter.test.utils.*;
 
 class TestBob {
diff --git a/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestCarol.java b/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestCarol.java
index 5dfc2b3..0175680 100644
--- a/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestCarol.java
+++ b/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/TestCarol.java
@@ -1,6 +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 foundation.pEp.jniadapter.test.utils.*;
 
 class TestCarol {
diff --git a/test/java/foundation/pEp/jniadapter/test/utils/AdapterTestUtils.java b/test/java/foundation/pEp/jniadapter/test/utils/AdapterTestUtils.java
index 93d7cb7..24661ce 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.TestUtils.clipString;
+import static foundation.pEp.jniadapter.test.framework.utils.TestUtils.clipString;
 
 public class AdapterTestUtils {
     public static String identityToString(Identity i, Boolean full) {
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 b92952b..eb0ac9e 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,11 +1,10 @@
 package foundation.pEp.jniadapter.test.utils.transport.fsmqmanager;
 
-import foundation.pEp.jniadapter.test.framework.TestUtils;
+import foundation.pEp.jniadapter.test.framework.utils.TestUtils;
 import foundation.pEp.jniadapter.test.utils.transport.fsmsgqueue.FsMsgQueue;
 
 import java.io.*;
 import java.util.*;
-import java.util.concurrent.TimeoutException;
 
 import static foundation.pEp.jniadapter.test.framework.TestLogger.log;
 
@@ -41,7 +40,7 @@ public class FsMQManager {
     }
 
     // Blocking read
-    // Returns null if no messages available
+    // Returns null if no messages available within timeout
     public FsMQMessage receiveMessage(int timeoutSec) throws IOException, ClassNotFoundException {
         FsMQMessage ret = null;
         FsMsgQueue onwQueue = identities.getQueueForIdentity(identities.self.getAddress());
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 8f118dd..adad3ba 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
@@ -17,7 +17,8 @@ JAVA_CLASSES_FRAMEWORK= \
  	../../../../../framework/TestContextInterface.class \
  	../../../../../framework/AbstractTestContext.class \
  	../../../../../framework/TestLogger.class \
- 	../../../../../framework/TestUtils.class \
+ 	../../../../../framework/utils/TestUtils.class \
+ 	../../../../../framework/utils/Pair.class \
  	../../../../../framework/TestState.class \
  	../../../../../framework/TestResult.class
 
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 b2e21ba..33383f0 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
@@ -2,6 +2,7 @@ package foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.test.stateles
 
 import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
 
+import foundation.pEp.jniadapter.test.framework.utils.TestUtils;
 import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.*;
 import foundation.pEp.jniadapter.test.framework.*;
 import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.test.ctx.*;
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 83cb8df..5996dff 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
@@ -2,6 +2,7 @@ package foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.test.stateles
 
 import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
 
+import foundation.pEp.jniadapter.test.framework.utils.TestUtils;
 import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.*;
 import foundation.pEp.jniadapter.test.framework.*;
 import foundation.pEp.jniadapter.test.utils.transport.fsmqmanager.test.ctx.*;
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 3403279..cf5dae7 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,7 +1,9 @@
 package foundation.pEp.jniadapter.test.utils.transport.fsmsgqueue;
 
+import foundation.pEp.jniadapter.test.framework.utils.Pair;
+
 import static foundation.pEp.jniadapter.test.framework.TestLogger.*;
-import static foundation.pEp.jniadapter.test.framework.TestUtils.*;
+import static foundation.pEp.jniadapter.test.framework.utils.TestUtils.*;
 
 import java.io.File;
 import java.io.IOException;
@@ -273,29 +275,3 @@ public class FsMsgQueue implements Queue<String> {
 
 }
 
-class Pair<K, V> {
-    private K key = null;
-    private V value = null;
-
-    public K getKey() {
-        return key;
-    }
-
-    public void setKey(K key) {
-        this.key = key;
-    }
-
-    public V getValue() {
-        return value;
-    }
-
-    public void setValue(V value) {
-        this.value = value;
-    }
-
-    public Pair(K f, V s) {
-        key = f;
-        value = s;
-    }
-}
-
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 7efafb4..6268392 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,7 +1,7 @@
 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.TestUtils.*;
+import static foundation.pEp.jniadapter.test.framework.utils.TestUtils.*;
 
 import foundation.pEp.jniadapter.test.utils.transport.fsmsgqueue.*;