1 files changed, 21 insertions, 22 deletions
diff --git a/src/testing/test_kyc_api.c b/src/testing/test_kyc_api.c
index a60f965a..f4f87552 100644
--- a/src/testing/test_kyc_api.c
+++ b/src/testing/test_kyc_api.c
@@ -101,9 +101,9 @@ static char *merchant_url_i1a;
  * @param label label to use for the command.
  */
 #define CMD_EXEC_AGGREGATOR(label) \
-  TALER_TESTING_cmd_exec_aggregator_with_kyc (label "-aggregator", \
-                                              CONFIG_FILE), \
-  TALER_TESTING_cmd_exec_transfer (label "-transfer", CONFIG_FILE)
+        TALER_TESTING_cmd_exec_aggregator_with_kyc (label "-aggregator", \
+                                                    CONFIG_FILE), \
+        TALER_TESTING_cmd_exec_transfer (label "-transfer", CONFIG_FILE)
 
 /**
  * Execute the taler-exchange-wirewatch command with
@@ -112,10 +112,10 @@ static char *merchant_url_i1a;
  * @param label label to use for the command.
  */
 #define CMD_EXEC_WIREWATCH(label)           \
-  TALER_TESTING_cmd_exec_wirewatch2 ( \
-    label,                            \
-    CONFIG_FILE,                      \
-    "exchange-account-exchange")
+        TALER_TESTING_cmd_exec_wirewatch2 ( \
+          label,                            \
+          CONFIG_FILE,                      \
+          "exchange-account-exchange")
 
 
 /**
@@ -211,6 +211,20 @@ run (void *cls,
       MHD_HTTP_OK,
       "create-proposal-1",
       NULL),
+    TALER_TESTING_cmd_merchant_get_instance (
+      "get-default-instance",
+      merchant_url,
+      NULL,
+      MHD_HTTP_OK,
+      "instance-create-default-setup"),
+    TALER_TESTING_cmd_admin_add_kycauth (
+      "merchant-kyc-auth-transfer",
+      "EUR:0.01",
+      &cred.ba,
+      merchant_payto,
+      "get-default-instance"),
+    CMD_EXEC_WIREWATCH (
+      "import-kyc-account-withdraw"),
     TALER_TESTING_cmd_merchant_pay_order (
       "deposit-simple",
       merchant_url,
@@ -247,22 +261,7 @@ run (void *cls,
     TALER_TESTING_cmd_depositcheck (
       "deposit-check",
       CONFIG_FILE),
-    TALER_TESTING_cmd_merchant_get_instance (
-      "get-default-instance",
-      merchant_url,
-      NULL,
-      MHD_HTTP_OK,
-      "instance-create-default-setup"),
-    TALER_TESTING_cmd_admin_add_kycauth (
-      "merchant-kyc-auth-transfer",
-      "EUR:0.01",
-      &cred.ba,
-      merchant_payto,
-      "get-default-instance"),
-    CMD_EXEC_WIREWATCH (
-      "import-kyc-account-withdraw"),
     /* Now we should get a status of pending */
-    // FIXME: currently runs into timeout!
     TALER_TESTING_cmd_merchant_kyc_get (
       "kyc-pending",
       merchant_url,