diff --git a/test/java/foundation/pEp/jniadapter/test/jni100/TestMain.java b/test/java/foundation/pEp/jniadapter/test/jni100/TestMain.java
index 2a0ddd8..28e4df0 100644
--- a/test/java/foundation/pEp/jniadapter/test/jni100/TestMain.java
+++ b/test/java/foundation/pEp/jniadapter/test/jni100/TestMain.java
@@ -3,6 +3,8 @@ import foundation.pEp.pitytest.*;
 import foundation.pEp.jniadapter.*;
 import foundation.pEp.jniadapter.test.utils.*;
 
+import java.util.Vector;
+
 
 class TestMain {
     public static void main(String[] args) throws Exception {
@@ -15,7 +17,7 @@ class TestMain {
             ctx.alice = ctx.engine.myself(ctx.alice);
             TestLogger.log(AdapterTestUtils.identityToString(ctx.alice, true));
 
-            Message msg1 = ctx.engine.encrypt_message(ctx.msgToBob, ctx.vStr, Message.EncFormat.PEP);
+            Message msg1 = ctx.engine.encrypt_message(ctx.msgToBob, new Vector<String>(), Message.EncFormat.PEP);
 
             ctx.engine.key_reset_all_own_keys();
 
diff --git a/test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java b/test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java
index aad0166..75cd06f 100644
--- a/test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java
+++ b/test/java/foundation/pEp/jniadapter/test/jni98/TestMain.java
@@ -5,6 +5,8 @@ import foundation.pEp.jniadapter.Message;
 import foundation.pEp.pitytest.TestUnit;
 import foundation.pEp.jniadapter.test.utils.AdapterBaseTestContext;
 
+import java.util.Vector;
+
 import static foundation.pEp.pitytest.TestLogger.log;
 import static foundation.pEp.pitytest.TestLogger.logH2;
 import static foundation.pEp.jniadapter.test.utils.AdapterTestUtils.msgToString;
@@ -45,7 +47,7 @@ class TestMain {
 
             logH2("Verify msg2");
             decrypt_message_Return result = null;
-            result = ctx.engine.decrypt_message(msg2, ctx.vStr, 0);
+            result = ctx.engine.decrypt_message(msg2, new Vector<String>(), 0);
             log("\n" + msgToString(result.dst, false));
         }).run();
 
diff --git a/test/java/foundation/pEp/jniadapter/test/utils/AdapterBaseTestContext.java b/test/java/foundation/pEp/jniadapter/test/utils/AdapterBaseTestContext.java
index 311c2e5..74980c0 100644
--- a/test/java/foundation/pEp/jniadapter/test/utils/AdapterBaseTestContext.java
+++ b/test/java/foundation/pEp/jniadapter/test/utils/AdapterBaseTestContext.java
@@ -59,14 +59,7 @@ public class AdapterBaseTestContext extends AbstractTestContext {
     public Message msgToSelf;
     public Message msgToBob;
 
-    // Misc
-    public Vector<Identity> vID;
-    public Vector<String> vStr;
-
     public void init() throws RuntimeException {
-        vID = new Vector<Identity>();
-        vStr = new Vector<String>();
-
         callbacks = new TestCallbacks();
         engine = new Engine();
         engine.setMessageToSendCallback(callbacks);
@@ -91,9 +84,6 @@ public class AdapterBaseTestContext extends AbstractTestContext {
         msgToSelf = AdapterTestUtils.makeNewTestMessage(alice, alice, Message.Direction.Outgoing);
         msgToBob = AdapterTestUtils.makeNewTestMessage(alice, bob, Message.Direction.Outgoing);
 
-        vID.add(bob);
-        vStr.add("StringItem");
-
         Path path;
         path = Paths.get(filenameBobPub);
         try {
diff --git a/test/java/foundation/pEp/pitytest/TestContextInterface.java b/test/java/foundation/pEp/pitytest/TestContextInterface.java
index 177bbb5..eadd972 100644
--- a/test/java/foundation/pEp/pitytest/TestContextInterface.java
+++ b/test/java/foundation/pEp/pitytest/TestContextInterface.java
@@ -2,10 +2,16 @@ package foundation.pEp.pitytest;
 
 public interface TestContextInterface {
     void init() throws Throwable;
+
     boolean isInitialized();
+
     void setInitialized(boolean initialized);
+
     boolean isUninitializable();
+
     void setUninitializable(boolean uninitializable);
+
     String getTestContextName();
+
     void setTestContextName(String name);
 }