diff --git a/threema-connector-demo/processes/ThreemaDemoProcess.p.json b/threema-connector-demo/processes/ThreemaDemoProcess.p.json
index 4deb411..715015a 100644
--- a/threema-connector-demo/processes/ThreemaDemoProcess.p.json
+++ b/threema-connector-demo/processes/ThreemaDemoProcess.p.json
@@ -269,8 +269,14 @@
             { "name" : "privatekey", "type" : "String" }
           ],
           "map" : {
-            "param.publicKey" : "in.publicKey",
-            "param.privatekey" : "in.privatekey"
+            "param.publicKey" : [
+              "in.publicKey",
+              "in.publicKey"
+            ],
+            "param.privatekey" : [
+              "in.privatekey",
+              "in.privatekey"
+            ]
           }
         }
       },
diff --git a/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPair.xhtml b/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPair.xhtml
index 7e3573a..df685f8 100644
--- a/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPair.xhtml
+++ b/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPair.xhtml
@@ -25,7 +25,7 @@
         <br />
         <div class="command-btns">
           <p:commandLink id="cancel" actionListener="#{ivyWorkflowView.cancel()}" value="Cancel" />
-          <p:commandButton id="proceed" actionListener="#{logic.close}" value="Proceed" update="form" icon="pi pi-check" />
+          <p:commandButton id="proceed" actionListener="#{logic.close}" value="Close" update="form" icon="pi pi-check" />
         </div>
       </h:form>
 
diff --git a/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPairProcess.p.json b/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPairProcess.p.json
index 257b427..e08a9c5 100644
--- a/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPairProcess.p.json
+++ b/threema-connector-demo/src_hd/threema/connector/demo/KeyPair/KeyPairProcess.p.json
@@ -1,6 +1,6 @@
 {
   "format" : "10.0.0",
-  "id" : "18B8EF27D89ED10D",
+  "id" : "18B902D7EEB4DF97",
   "kind" : "HTML_DIALOG",
   "config" : {
     "data" : "threema.connector.demo.KeyPair.KeyPairData"
@@ -21,7 +21,7 @@
             "out.privatekey" : "param.privatekey"
           }
         },
-        "guid" : "18B8EF27D8A1D1A5"
+        "guid" : "18B902D7EEFA5F64"
       },
       "visual" : {
         "at" : { "x" : 96, "y" : 64 }
@@ -38,7 +38,7 @@
       "type" : "HtmlDialogEventStart",
       "name" : "close",
       "config" : {
-        "guid" : "18B8EF27D8CA39FE"
+        "guid" : "18B902D7EFFC72C5"
       },
       "visual" : {
         "at" : { "x" : 96, "y" : 160 }
diff --git a/threema-connector-test/src/ch/ivyteam/threema/mocks/ThreemaServiceMock.java b/threema-connector-test/src/ch/ivyteam/threema/mocks/ThreemaServiceMock.java
index 860e3b8..0d9076d 100644
--- a/threema-connector-test/src/ch/ivyteam/threema/mocks/ThreemaServiceMock.java
+++ b/threema-connector-test/src/ch/ivyteam/threema/mocks/ThreemaServiceMock.java
@@ -25,8 +25,7 @@ public class ThreemaServiceMock {
   static final String PATH_SUFFIX = "mock";
   private static final String THREEMA_ID = "validId";
   public static final String URI = "{" + IvyDefaultJaxRsTemplates.APP_URL + "}/api/" + PATH_SUFFIX;
-  // {ivy.app.baseurl}/api/mock
-  // https://msgapi.threema.ch
+
 
   @GET
   @Path("/lookup/{type}/{id}")
diff --git a/threema-connector-webtest/src_test/threema/connector/webtest/MessageMultipleRecipientsTest.java b/threema-connector-webtest/src_test/threema/connector/webtest/MessageMultipleRecipientsTest.java
index ed26b67..fd7ba3c 100644
--- a/threema-connector-webtest/src_test/threema/connector/webtest/MessageMultipleRecipientsTest.java
+++ b/threema-connector-webtest/src_test/threema/connector/webtest/MessageMultipleRecipientsTest.java
@@ -7,6 +7,7 @@
 import static com.codeborne.selenide.Selenide.open;
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.By;
 
@@ -20,6 +21,11 @@
 @IvyWebTest
 public class MessageMultipleRecipientsTest {
 
+  @AfterEach
+  public void cleanFixture(WebAppFixture fixture) {
+    fixture.resetConfig("RestClients.ThreemaGateway.Url");
+  }
+
   @Test
   public void sendMessage(WebAppFixture fixture) {
     String mockUrl = ThreemaServiceMock.URI.replaceAll("\\{", "%7B").replaceAll("\\}", "%7D").replaceAll("/", "%2F");
diff --git a/threema-connector-webtest/src_test/threema/connector/webtest/MessageSingleRecipientTest.java b/threema-connector-webtest/src_test/threema/connector/webtest/MessageSingleRecipientTest.java
index 70c5537..ba5e437 100644
--- a/threema-connector-webtest/src_test/threema/connector/webtest/MessageSingleRecipientTest.java
+++ b/threema-connector-webtest/src_test/threema/connector/webtest/MessageSingleRecipientTest.java
@@ -8,6 +8,7 @@
 import static com.codeborne.selenide.Selenide.open;
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.By;
 
@@ -22,6 +23,12 @@
 @IvyWebTest
 public class MessageSingleRecipientTest {
 
+  @AfterEach
+  public void cleanFixture(WebAppFixture fixture) {
+    fixture.resetConfig("RestClients.ThreemaGateway.Url");
+  }
+
+
   @Test
   public void sendMessage(WebAppFixture fixture) {
     String mockUrl = ThreemaServiceMock.URI.replaceAll("\\{", "%7B").replaceAll("\\}", "%7D").replaceAll("/", "%2F");