diff --git a/src/lib/test_exchange_api.c b/src/lib/test_exchange_api.c
index 1a582ec12..076d12bb9 100644
--- a/src/lib/test_exchange_api.c
+++ b/src/lib/test_exchange_api.c
@@ -575,7 +575,7 @@ run (void *cls,
                                        "EUR:5",
                                        MHD_HTTP_OK),
     /* Make coin invalid */
-    TALER_TESTING_cmd_revoke ("revoke-1",
+    TALER_TESTING_cmd_revoke ("revoke-0-EUR:5",
                               MHD_HTTP_OK,
                               "payback-withdraw-coin-1",
                               CONFIG_FILE),
@@ -644,32 +644,32 @@ run (void *cls,
      * revoked and we did not bother to create a new one... *///
     CMD_TRANSFER_TO_EXCHANGE ("payback-create-reserve-2",
                               "EUR:2.02"),
-    TALER_TESTING_cmd_check_bank_admin_transfer
-      ("check-payback-create-reserve-2",
-      "EUR:2.02", bc.user42_payto, bc.exchange_payto,
-      "payback-create-reserve-2"),
-
+    TALER_TESTING_cmd_check_bank_admin_transfer ("ck-payback-create-reserve-2",
+                                                 "EUR:2.02",
+                                                 bc.user42_payto,
+                                                 bc.exchange_payto,
+                                                 "payback-create-reserve-2"),
     /* Make previous command effective. */
     CMD_EXEC_WIREWATCH ("wirewatch-5"),
-
     /* Withdraw a 1 EUR coin, at fee of 1 ct */
     TALER_TESTING_cmd_withdraw_amount ("payback-withdraw-coin-2a",
                                        "payback-create-reserve-2",
                                        "EUR:1",
                                        MHD_HTTP_OK),
-
     /* Withdraw a 1 EUR coin, at fee of 1 ct */
     TALER_TESTING_cmd_withdraw_amount ("payback-withdraw-coin-2b",
                                        "payback-create-reserve-2",
                                        "EUR:1",
                                        MHD_HTTP_OK),
-    TALER_TESTING_cmd_deposit
-      ("payback-deposit-partial",
-      "payback-withdraw-coin-2a", 0,
-      bc.user42_payto,
-      "{\"items\":[{\"name\":\"more ice cream\",\"value\":1}]}",
-      GNUNET_TIME_UNIT_ZERO, "EUR:0.5", MHD_HTTP_OK),
-    TALER_TESTING_cmd_revoke ("revoke-2",
+    TALER_TESTING_cmd_deposit ("payback-deposit-partial",
+                               "payback-withdraw-coin-2a",
+                               0,
+                               bc.user42_payto,
+                               "{\"items\":[{\"name\":\"more ice cream\",\"value\":1}]}",
+                               GNUNET_TIME_UNIT_ZERO,
+                               "EUR:0.5",
+                               MHD_HTTP_OK),
+    TALER_TESTING_cmd_revoke ("revoke-1-EUR:1",
                               MHD_HTTP_OK,
                               "payback-withdraw-coin-2a",
                               CONFIG_FILE),
@@ -769,7 +769,7 @@ run (void *cls,
                                       "refresh-melt-1",
                                       MHD_HTTP_OK),
     /* Make refreshed coin invalid */
-    TALER_TESTING_cmd_revoke ("revoke-1",
+    TALER_TESTING_cmd_revoke ("revoke-2-EUR:5",
                               MHD_HTTP_OK,
                               "refresh-melt-1",
                               CONFIG_FILE),
@@ -805,12 +805,12 @@ run (void *cls,
                                       "refresh-melt-2",
                                       MHD_HTTP_OK),
     /* Revokes refreshed EUR:0.1 coin  */
-    TALER_TESTING_cmd_revoke ("revoke-2",
+    TALER_TESTING_cmd_revoke ("revoke-3-EUR:0.1",
                               MHD_HTTP_OK,
                               "refresh-reveal-2",
                               CONFIG_FILE),
     /* Revoke also original coin denomination */
-    TALER_TESTING_cmd_revoke ("revoke-3",
+    TALER_TESTING_cmd_revoke ("revoke-4-EUR:5",
                               MHD_HTTP_OK,
                               "withdraw-revocation-coin-1",
                               CONFIG_FILE),