diff --git a/test/java/foundation/pEp/jniadapter/test/Makefile.conf b/test/java/foundation/pEp/jniadapter/test/Makefile.conf
index c275826..bddc9d6 100644
--- a/test/java/foundation/pEp/jniadapter/test/Makefile.conf
+++ b/test/java/foundation/pEp/jniadapter/test/Makefile.conf
@@ -3,7 +3,7 @@ JAVA_PKG_BASEPATH=foundation/pEp/jniadapter/test
 REPOROOT=../..
 JAVA_CWD=../../../../../
 JAVA_RESOURCES_DIR=../resources
-JAVA_PEP_HOME_DIR=$(JAVA_RESOURCES_DIR)/pep-home
+JAVA_PEP_HOME_DIR=$(JAVA_RESOURCES_DIR)/per-user-dirs
 PEP_HOME_DIR=$(JAVA_CWD)$(JAVA_PEP_HOME_DIR)
 CLASSPATH=.:$(REPOROOT)/src
 
diff --git a/test/java/foundation/pEp/jniadapter/test/jni92/SyncCallbacks.java b/test/java/foundation/pEp/jniadapter/test/jni92/SyncCallbacks.java
deleted file mode 100644
index 69fe067..0000000
--- a/test/java/foundation/pEp/jniadapter/test/jni92/SyncCallbacks.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package foundation.pEp.jniadapter.test.jni92;
-import foundation.pEp.jniadapter.test.utils.TestUtils;
-import foundation.pEp.jniadapter.*;
-
-class SyncCallbacks implements Sync.MessageToSendCallback, Sync.NotifyHandshakeCallback {
-    public void messageToSend(Message message)
-    {
-        TestUtils.logH2("Message to send called");
-        TestUtils.log("From: " + message.getFrom());
-        TestUtils.log("To: " + message.getTo());
-        TestUtils.log("Subject: " + message.getShortmsg());
-        TestUtils.log("Attachement[0]: " + message.getAttachments().get(0).toString());
-        TestUtils.logSectEnd("");
-    }
-
-    public void notifyHandshake(Identity myself, Identity partner, SyncHandshakeSignal signal)
-    {
-        TestUtils.logH2("Notify handshake called");
-        TestUtils.log("Myself: " + myself);
-        TestUtils.log("Partner: " + partner);
-        TestUtils.log("Signal: " + signal);
-        TestUtils.logSectEnd("");
-    }
-}
\ No newline at end of file
diff --git a/test/java/foundation/pEp/jniadapter/test/template/Makefile b/test/java/foundation/pEp/jniadapter/test/templateAlice/Makefile
similarity index 91%
rename from test/java/foundation/pEp/jniadapter/test/template/Makefile
rename to test/java/foundation/pEp/jniadapter/test/templateAlice/Makefile
index 81b12b9..c02d07f 100644
--- a/test/java/foundation/pEp/jniadapter/test/template/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/templateAlice/Makefile
@@ -1,7 +1,7 @@
 include ../../../../../../../Makefile.conf
 include ../Makefile.conf
 
-TEST_UNIT_NAME=template
+TEST_UNIT_NAME=templateAlice
 
 JAVA_CLASSES = \
  	TestMain.class
diff --git a/test/java/foundation/pEp/jniadapter/test/template/TestMain.java b/test/java/foundation/pEp/jniadapter/test/templateAlice/TestMain.java
similarity index 83%
rename from test/java/foundation/pEp/jniadapter/test/template/TestMain.java
rename to test/java/foundation/pEp/jniadapter/test/templateAlice/TestMain.java
index 79a29a8..0a8a847 100644
--- a/test/java/foundation/pEp/jniadapter/test/template/TestMain.java
+++ b/test/java/foundation/pEp/jniadapter/test/templateAlice/TestMain.java
@@ -1,5 +1,5 @@
-package foundation.pEp.jniadapter.test.template;
-import  foundation.pEp.jniadapter.test.framework.*;
+package foundation.pEp.jniadapter.test.templateAlice;
+import foundation.pEp.jniadapter.test.framework.*;
 import foundation.pEp.jniadapter.test.utils.AdapterBaseTestContext;
 
 
diff --git a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/Makefile b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/Makefile
new file mode 100644
index 0000000..c02d07f
--- /dev/null
+++ b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/Makefile
@@ -0,0 +1,33 @@
+include ../../../../../../../Makefile.conf
+include ../Makefile.conf
+
+TEST_UNIT_NAME=templateAlice
+
+JAVA_CLASSES = \
+ 	TestMain.class
+
+JAVA_CLASSES += $(JAVA_CLASSES_FRAMEWORK)
+
+.PHONY: compile run test clean
+
+all: compile
+	$(MAKE) run
+
+run: compile clean-pep-home
+	cd $(JAVA_CWD);pwd;HOME=$(JAVA_PEP_HOME_DIR) $(JAVA) $(JAVA_PKG_BASENAME).$(TEST_UNIT_NAME).TestMain
+
+compile: $(JAVA_CLASSES)
+
+%.class: %.java
+	cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
+
+clean:
+	rm -f $(JAVA_CLASSES)
+	rm -f *.class
+	rm -f *.log
+	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
diff --git a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestMain.java b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestMain.java
new file mode 100644
index 0000000..5866b96
--- /dev/null
+++ b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/TestMain.java
@@ -0,0 +1,21 @@
+package foundation.pEp.jniadapter.test.templateAliceBob;
+import foundation.pEp.jniadapter.test.framework.*;
+import foundation.pEp.jniadapter.test.utils.AdapterBaseTestContext;
+
+
+class TestMain {
+    public static void main(String[] args) throws Exception {
+        new TestUnit<AdapterBaseTestContext>("Test Template",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();
+            }
+        }).run();
+    }
+}
+
+
diff --git a/test/resources/pep-home/.dontdeleteme b/test/resources/per-user-dirs/.dontdeleteme
similarity index 100%
rename from test/resources/pep-home/.dontdeleteme
rename to test/resources/per-user-dirs/.dontdeleteme