diff --git a/test/java/foundation/pEp/jniadapter/test/basic/TestMain.java b/test/java/foundation/pEp/jniadapter/test/basic/TestMain.java
index 12dc192..ef46b34 100644
--- a/test/java/foundation/pEp/jniadapter/test/basic/TestMain.java
+++ b/test/java/foundation/pEp/jniadapter/test/basic/TestMain.java
@@ -17,6 +17,11 @@ class BasicTestContext extends AdapterBaseTestContext {
     public BasicTestContext() {
         setTestContextName("BasicTestContext");
     }
+
+    public BasicTestContext init() throws Throwable{
+        super.init();
+        return this;
+    }
 }
 
 class TestMain {
diff --git a/test/java/foundation/pEp/jniadapter/test/jni111/TestAlice.java b/test/java/foundation/pEp/jniadapter/test/jni111/TestAlice.java
index 550c2c3..4adf7df 100644
--- a/test/java/foundation/pEp/jniadapter/test/jni111/TestAlice.java
+++ b/test/java/foundation/pEp/jniadapter/test/jni111/TestAlice.java
@@ -16,10 +16,11 @@ import java.util.Vector;
 
 class JNI111TestContext extends AdapterBaseTestContext {
     @Override
-    public void init() throws RuntimeException {
+    public JNI111TestContext init() throws Throwable {
         super.init();
         alice = null;
         bob = null;
+        return this;
     }
 }
 
diff --git a/test/java/foundation/pEp/jniadapter/test/jni115/TestAlice.java b/test/java/foundation/pEp/jniadapter/test/jni115/TestAlice.java
index 2aba549..9a4678a 100644
--- a/test/java/foundation/pEp/jniadapter/test/jni115/TestAlice.java
+++ b/test/java/foundation/pEp/jniadapter/test/jni115/TestAlice.java
@@ -19,7 +19,7 @@ class Jni115TestContext extends AdapterBaseTestContext {
     public List<Message> messagesToBob;
 
     @Override
-    public void init() throws RuntimeException {
+    public Jni115TestContext init() throws Throwable {
         super.init();
         messagesToBobSmall = new ArrayList<>();
         messagesToBobBig = new ArrayList<>();
@@ -52,6 +52,7 @@ class Jni115TestContext extends AdapterBaseTestContext {
             messagesToBobHuge.add(tmp);
         }
         logRaw("\n");
+        return this;
     }
 
 }
diff --git a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/MultiPeerCTX.java b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/MultiPeerCTX.java
index 4206abc..3a5c9d5 100644
--- a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/MultiPeerCTX.java
+++ b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/MultiPeerCTX.java
@@ -51,7 +51,7 @@ class MultiPeerCTX extends FsMQManagerTestContext {
         super(selfAddress);
     }
 
-    public void init() throws Throwable {
+    public MultiPeerCTX init() throws Throwable {
         super.init();
         vID = new Vector<Identity>();
         vStr = new Vector<String>();
@@ -97,5 +97,6 @@ class MultiPeerCTX extends FsMQManagerTestContext {
         log("pEp PER_USER_DIR   : " + engine.getUserDirectory());
         log("pEp ProtocolVersion: " + engine.getProtocolVersion());
         log("pEp Version        : " + engine.getVersion());
+        return this;
     }
 }
diff --git a/test/java/foundation/pEp/jniadapter/test/utils/AdapterBaseTestContext.java b/test/java/foundation/pEp/jniadapter/test/utils/AdapterBaseTestContext.java
index 74980c0..5470d41 100644
--- a/test/java/foundation/pEp/jniadapter/test/utils/AdapterBaseTestContext.java
+++ b/test/java/foundation/pEp/jniadapter/test/utils/AdapterBaseTestContext.java
@@ -59,7 +59,7 @@ public class AdapterBaseTestContext extends AbstractTestContext {
     public Message msgToSelf;
     public Message msgToBob;
 
-    public void init() throws RuntimeException {
+    public AdapterBaseTestContext init() throws Throwable {
         callbacks = new TestCallbacks();
         engine = new Engine();
         engine.setMessageToSendCallback(callbacks);
@@ -106,7 +106,7 @@ public class AdapterBaseTestContext extends AbstractTestContext {
         } catch (Throwable e) {
             throw new RuntimeException(e);
         }
-
+        return this;
     }
 
 }
\ 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 0542b35..dc64485 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
@@ -23,7 +23,7 @@ public class FsMQManagerBaseTestContext extends AbstractTestContext {
     }
 
     @Override
-    public void init() throws Throwable {
+    public FsMQManagerBaseTestContext init() throws Throwable {
         peerNames = new ArrayList<>();
         peerNames.add("Alice");
         peerNames.add("Bob");
@@ -31,6 +31,7 @@ public class FsMQManagerBaseTestContext extends AbstractTestContext {
         createPeerMapAndPeerList();
         defineSelfAndUpdatePeers();
         messages = FsMQManagerTestUtils.createTestMessages(self.getAddress(), MSG_COUNT);
+        return this;
     }
 
     private void createPeerMapAndPeerList() {
diff --git a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/ctx/FsMQManagerTestContext.java b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/ctx/FsMQManagerTestContext.java
index 261ecb3..6d10bca 100644
--- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/ctx/FsMQManagerTestContext.java
+++ b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/ctx/FsMQManagerTestContext.java
@@ -10,10 +10,11 @@ public class FsMQManagerTestContext extends FsMQManagerBaseTestContext {
     }
 
     @Override
-    public void init() throws Throwable {
+    public FsMQManagerTestContext init() throws Throwable {
         super.init();
         qm = new FsMQManager(self);
         qm.identities.addAll(peerList);
+        return this;
     }
 
 }
\ No newline at end of file
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 70f23b8..76ddb3b 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
@@ -31,8 +31,9 @@ class FsMQManagerIdentitiesTestContext extends AbstractTestContext {
     List<String> messages;
 
     @Override
-    public void init() throws Throwable {
+    public FsMQManagerIdentitiesTestContext init() throws Throwable {
         messages = FsMQManagerTestUtils.createTestMessages(ownAddress, MSG_COUNT);
+        return this;
     }
 }
 
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 3dd3070..f8aafe2 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
@@ -14,13 +14,13 @@ class FsMQManagerBaseTestContext extends AbstractTestContext {
     Entity carol;
 
     @Override
-    public void init() throws Throwable {
+    public FsMQManagerBaseTestContext init() throws Throwable {
         alice = new Entity("Alice");
         bob = new Entity("Bob");
         carol = new Entity("Carol");
         alice.add(bob);
         alice.add(carol);
-
+        return this;
     }
 
     class Entity {
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 2dd38c2..3dfe994 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
@@ -20,9 +20,10 @@ class FsMsgQueueTestContext extends AbstractTestContext {
     FsMsgQueue queue;
 
     @Override
-    public void init() throws Throwable {
+    public FsMsgQueueTestContext init() throws Throwable {
         deleteQDir();
         messages = createTestMessages(msgCount);
+        return this;
     }
 
     public void deleteQDir() {
@@ -32,6 +33,7 @@ class FsMsgQueueTestContext extends AbstractTestContext {
             deleteRecursively(qDir);
             if (qDir.exists()) throw new RuntimeException("Cant delete Dir:" + qDirPath);
         }
+
     }
 
     public ArrayList<String> createTestMessages(int count) {
diff --git a/test/java/foundation/pEp/pitytest/TestContextInterface.java b/test/java/foundation/pEp/pitytest/TestContextInterface.java
index eadd972..cd75f46 100644
--- a/test/java/foundation/pEp/pitytest/TestContextInterface.java
+++ b/test/java/foundation/pEp/pitytest/TestContextInterface.java
@@ -1,7 +1,7 @@
 package foundation.pEp.pitytest;
 
 public interface TestContextInterface {
-    void init() throws Throwable;
+    TestContextInterface init() throws Throwable;
 
     boolean isInitialized();
 
diff --git a/test/java/foundation/pEp/pitytest/examples/ctxinitfail/TestMain.java b/test/java/foundation/pEp/pitytest/examples/ctxinitfail/TestMain.java
index 8f787de..125c2a2 100644
--- a/test/java/foundation/pEp/pitytest/examples/ctxinitfail/TestMain.java
+++ b/test/java/foundation/pEp/pitytest/examples/ctxinitfail/TestMain.java
@@ -10,9 +10,13 @@ class CtxInitFailContext extends AbstractTestContext {
     int result;
 
     @Override
-    public void init() throws Throwable {
+    public CtxInitFailContext init() throws RuntimeException {
         name = "PityTest";
+        log("Hello World from: " + name);
+//        throw  new RuntimeException("regddjkl");
         result = 50 / 0;
+
+        return this;
     }
 }
 
diff --git a/test/java/foundation/pEp/pitytest/examples/ctxmembers/TestMain.java b/test/java/foundation/pEp/pitytest/examples/ctxmembers/TestMain.java
index 7fcce08..11228c9 100644
--- a/test/java/foundation/pEp/pitytest/examples/ctxmembers/TestMain.java
+++ b/test/java/foundation/pEp/pitytest/examples/ctxmembers/TestMain.java
@@ -18,12 +18,13 @@ class CtxMembersTestContext extends AbstractTestContext {
     ExampleCtxMember incorrect = new ExampleCtxMember(false); // WRONG
 
     @Override
-    public void init() throws Throwable {
+    public CtxMembersTestContext init() throws Throwable {
         log("=== OUTPUT FROM TEST CONTEXT INIT BEGIN ===");
         log(getTestContextName()+ " - init() called");
         correct = new ExampleCtxMember(true);
         name = "PityTest";
         log("=== OUTPUT FROM TEST CONTEXT INIT END   ===");
+        return this;
     }
 }
 
diff --git a/test/java/foundation/pEp/pitytest/examples/helloworld/TestMain.java b/test/java/foundation/pEp/pitytest/examples/helloworld/TestMain.java
index 1924aee..16044b1 100644
--- a/test/java/foundation/pEp/pitytest/examples/helloworld/TestMain.java
+++ b/test/java/foundation/pEp/pitytest/examples/helloworld/TestMain.java
@@ -7,8 +7,9 @@ class HelloWorldTestContext extends AbstractTestContext {
     String name;
 
     @Override
-    public void init() throws Throwable {
+    public HelloWorldTestContext init() throws Throwable {
         name = "PityTest";
+        return this;
     }
 }
 
diff --git a/test/java/foundation/pEp/pitytest/examples/testsuite/TestMain.java b/test/java/foundation/pEp/pitytest/examples/testsuite/TestMain.java
index 06d2485..af96af1 100644
--- a/test/java/foundation/pEp/pitytest/examples/testsuite/TestMain.java
+++ b/test/java/foundation/pEp/pitytest/examples/testsuite/TestMain.java
@@ -6,8 +6,9 @@ class TestSuiteContext extends AbstractTestContext {
     String name;
 
     @Override
-    public void init() throws Throwable {
+    public TestSuiteContext init() throws Throwable {
         name = "PityTest";
+        return this;
     }
 }