diff --git a/test/java/foundation/pEp/jniadapter/test/Makefile.conf b/test/java/foundation/pEp/jniadapter/test/Makefile.conf
index 58dc32a..f36c1a5 100644
--- a/test/java/foundation/pEp/jniadapter/test/Makefile.conf
+++ b/test/java/foundation/pEp/jniadapter/test/Makefile.conf
@@ -3,8 +3,17 @@ JAVA_PKG_BASEPATH=foundation/pEp/jniadapter/test
 REPOROOT=../..
 JAVA_CWD=../../../../../
 JAVA_RESOURCES_DIR=../resources
-JAVA_PEP_HOME_DIR=$(JAVA_RESOURCES_DIR)/per-user-dirs
-PEP_HOME_DIR=$(JAVA_CWD)$(JAVA_PEP_HOME_DIR)
+
+JAVA_PEP_HOME_DIR_ALICE=$(JAVA_RESOURCES_DIR)/per-user-dirs/alice
+JAVA_PEP_HOME_DIR_BOB=$(JAVA_RESOURCES_DIR)/per-user-dirs/bob
+JAVA_PEP_HOME_DIR_CAROL=$(JAVA_RESOURCES_DIR)/per-user-dirs/carol
+JAVA_PEP_HOME_DIR=$(JAVA_PEP_HOME_DIR_ALICE)
+
+PEP_HOME_DIR_ALICE=$(JAVA_CWD)$(JAVA_PEP_HOME_DIR_ALICE)
+PEP_HOME_DIR_BOB=$(JAVA_CWD)$(JAVA_PEP_HOME_DIR_BOB)
+PEP_HOME_DIR_CAROL=$(JAVA_CWD)$(JAVA_PEP_HOME_DIR_CAROL)
+PEP_HOME_DIR=$(PEP_HOME_DIR_ALICE)
+
 CLASSPATH=.:$(REPOROOT)/src
 
 JAVA=java -Xcheck:jni -cp $(CLASSPATH) -Djava.library.path=$(CLASSPATH)
diff --git a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/Makefile b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/Makefile
index c02d07f..3ee7096 100644
--- a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/Makefile
@@ -1,20 +1,26 @@
 include ../../../../../../../Makefile.conf
 include ../Makefile.conf
 
-TEST_UNIT_NAME=templateAlice
+TEST_UNIT_NAME=templateAliceBob
 
 JAVA_CLASSES = \
- 	TestMain.class
+ 	TestAlice.class \
+ 	TestBob.class \
+ 	../utils/AdapterBaseTestContext.class \
+ 	../utils/AdapterTestUtils.class \
+ 	../utils/TestCallbacks.class
 
 JAVA_CLASSES += $(JAVA_CLASSES_FRAMEWORK)
 
-.PHONY: compile run test clean
+.PHONY: compile alice bob test clean
 
-all: compile
-	$(MAKE) run
+all: alice compile
 
-run: compile clean-pep-home
-	cd $(JAVA_CWD);pwd;HOME=$(JAVA_PEP_HOME_DIR) $(JAVA) $(JAVA_PKG_BASENAME).$(TEST_UNIT_NAME).TestMain
+alice: compile clean-pep-home-alice
+	cd $(JAVA_CWD);pwd;HOME=$(JAVA_PEP_HOME_DIR_ALICE) $(JAVA) $(JAVA_PKG_BASENAME).$(TEST_UNIT_NAME).TestAlice
+
+bob: compile clean-pep-home-bob
+	cd $(JAVA_CWD);pwd;HOME=$(JAVA_PEP_HOME_DIR_BOB) $(JAVA) $(JAVA_PKG_BASENAME).$(TEST_UNIT_NAME).TestBob
 
 compile: $(JAVA_CLASSES)
 
@@ -28,6 +34,10 @@ clean:
 	rm -Rf .gnupg
 	rm -Rf .lldb
 
-clean-pep-home:
-	rm -rf $(PEP_HOME_DIR)/*
-	rm -rf $(PEP_HOME_DIR)/.pEp
\ No newline at end of file
+clean-pep-home: clean-pep-home-alice clean-pep-home-bob
+
+clean-pep-home-alice:
+	rm -rf $(PEP_HOME_DIR_ALICE)/.pEp
+
+clean-pep-home-bob:
+	rm -rf $(PEP_HOME_DIR_BOB)/.pEp
diff --git a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestAlice.java b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestAlice.java
new file mode 100644
index 0000000..e278ac4
--- /dev/null
+++ b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestAlice.java
@@ -0,0 +1,32 @@
+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.utils.*;
+
+class TestAlice {
+    public static void main(String[] args) throws Exception {
+        TestSuite.setVerbose(true);
+        TestSuite.setTestColor(TestUtils.TermColor.GREEN);
+
+        new TestUnit<AdapterBaseTestContext>("Test Alice",new AdapterBaseTestContext() , ctx  -> {
+            // do stuff using the context
+            // Test FAILS on unhandled exception, otherwise SUCCESS
+
+            ctx.alice = ctx.engine.myself(ctx.alice);
+
+            if(ctx.alice.fpr == null) {
+                throw new RuntimeException();
+            }
+
+            for(int i=0; i < 1000; i++ ) {
+                log("Alice is waiting...");
+                TestUtils.sleep(1000);
+            }
+
+        }).add();
+
+        TestSuite.run();
+    }
+}
+
+
diff --git a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestBob.java b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestBob.java
new file mode 100644
index 0000000..8543112
--- /dev/null
+++ b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestBob.java
@@ -0,0 +1,32 @@
+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.utils.*;
+
+class TestBob {
+    public static void main(String[] args) throws Exception {
+        TestSuite.setVerbose(true);
+        TestSuite.setTestColor(TestUtils.TermColor.YELLOW);
+
+        new TestUnit<AdapterBaseTestContext>("Test Bob",new AdapterBaseTestContext() , ctx  -> {
+            // do stuff using the context
+            // Test FAILS on unhandled exception, otherwise SUCCESS
+
+            ctx.bob = ctx.engine.myself(ctx.bob);
+
+            if(ctx.bob.fpr == null) {
+                throw new RuntimeException();
+            }
+
+            for(int i=0; i < 1000; i++ ) {
+                log("Bob is waiting...");
+                TestUtils.sleep(1000);
+            }
+
+        }).add();
+
+        TestSuite.run();
+    }
+}
+
+