420 files changed, 134 insertions, 250 deletions
diff --git a/contrib/Makefile.am.in b/contrib/Makefile.am.in
index 9ae18eb3..fa57a851 100644
--- a/contrib/Makefile.am.in
+++ b/contrib/Makefile.am.in
@@ -1,8 +1,8 @@
 # This file is in the public domain.
 
-tmplpkgdatadir = $(prefix)/share/taler/merchant/templates/
-staticpkgdatadir = $(prefix)/share/taler/merchant/static/
-spapkgdatadir = $(prefix)/share/taler/merchant/spa/
+tmplpkgdatadir = $(prefix)/share/taler-merchant/templates/
+staticpkgdatadir = $(prefix)/share/taler-merchant/static/
+spapkgdatadir = $(prefix)/share/taler-merchant/spa/
 
 bin_SCRIPTS = \
   taler-merchant-dbconfig
diff --git a/debian/etc/taler/conf.d/merchant.conf b/debian/etc/taler-merchant/conf.d/merchant.conf
index 48516157..48516157 100644
--- a/debian/etc/taler/conf.d/merchant.conf
+++ b/debian/etc/taler-merchant/conf.d/merchant.conf
diff --git a/debian/etc/taler/secrets/merchant-db.secret.conf b/debian/etc/taler-merchant/secrets/merchant-db.secret.conf
index 6cbbb24c..6cbbb24c 100644
--- a/debian/etc/taler/secrets/merchant-db.secret.conf
+++ b/debian/etc/taler-merchant/secrets/merchant-db.secret.conf
diff --git a/debian/etc/taler-merchant/taler-merchant.conf b/debian/etc/taler-merchant/taler-merchant.conf
new file mode 100644
index 00000000..9eb70e2e
--- /dev/null
+++ b/debian/etc/taler-merchant/taler-merchant.conf
@@ -0,0 +1,26 @@
+# Main entry point for the GNU Taler configuration.
+#
+# Structure:
+# - taler-merchant.conf is the main configuration entry point
+#   used by all Taler merchant components (the file you are currently
+#   looking at.
+# - overrides.conf contains configuration overrides that are
+#   set by some tools that help with the configuration,
+#   and should not be edited by humans.  Comments in this file
+#   are not preserved.
+# - conf.d/ contains configuration files for
+#   Taler components, which can be read by all
+#   users of the system and are included by the main
+#   configuration.
+# - secrets/ contains configuration snippets
+#   with secrets for particular services.
+#   These files should have restrictive permissions
+#   so that only users of the relevant services
+#   can read it.  All files in it should end with
+#   ".secret.conf".
+
+# Inline configurations from all Taler components.
+@inline-matching@ conf.d/*.conf
+
+# Overrides from tools that help with configuration.
+@inline@ overrides.conf
diff --git a/debian/taler-merchant.install b/debian/taler-merchant.install
index b1d93b17..03f5840f 100644
--- a/debian/taler-merchant.install
+++ b/debian/taler-merchant.install
@@ -1,11 +1,9 @@
-usr/bin/
-usr/lib/*/taler/*.so
+usr/bin/taler-merchant-*
+usr/lib/*/taler-merchant/*.so
 usr/lib/*/libtalermerchantdb.so.*
-usr/share/man/man1/*
-/usr/share/info/taler-merchant*
-/usr/share/taler/merchant/*
-/usr/share/taler/sql/merchant/*
-/usr/share/taler/config.d/*
+usr/share/man/man1/taler-merchant*
+usr/share/man/man5/taler-merchant*
+usr/share/info/taler-merchant*
+usr/share/taler-merchant/*
 
 debian/etc/* /etc/
-
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 979f320f..86b756a9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,16 +1,17 @@
 SUBDIRS = . doxygen
 
 man_MANS = \
-  prebuilt/man/taler-merchant-benchmark.1 \
-  prebuilt/man/taler-merchant-dbconfig.1 \
-  prebuilt/man/taler-merchant-dbinit.1 \
-  prebuilt/man/taler-merchant-depositcheck.1 \
+  prebuilt/man/taler-merchant-benchmark.1         \
+  prebuilt/man/taler-merchant-config.1            \
+  prebuilt/man/taler-merchant-dbconfig.1          \
+  prebuilt/man/taler-merchant-dbinit.1            \
+  prebuilt/man/taler-merchant-depositcheck.1      \
   prebuilt/man/taler-merchant-exchangekeyupdate.1 \
-  prebuilt/man/taler-merchant-httpd.1 \
-  prebuilt/man/taler-merchant-kyccheck.1 \
-  prebuilt/man/taler-merchant-passwd.1 \
-  prebuilt/man/taler-merchant-reconciliation.1 \
-  prebuilt/man/taler-merchant-webhook.1 \
+  prebuilt/man/taler-merchant-httpd.1             \
+  prebuilt/man/taler-merchant-kyccheck.1          \
+  prebuilt/man/taler-merchant-passwd.1            \
+  prebuilt/man/taler-merchant-reconciliation.1    \
+  prebuilt/man/taler-merchant-webhook.1           \
   prebuilt/man/taler-merchant-wirewatch.1
 
 info_TEXINFOS = \
diff --git a/doc/prebuilt b/doc/prebuilt
-Subproject dac140335967c9c8409698186f0cba0635c7cd7
+Subproject de586c1110d18523dd762304c65e6f051690ba1
diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am
index d5ddda41..9b8a845e 100644
--- a/src/backend/Makefile.am
+++ b/src/backend/Makefile.am
@@ -6,7 +6,7 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
-pkgcfgdir = $(prefix)/share/taler/config.d/
+pkgcfgdir = $(prefix)/share/taler-merchant/config.d/
 
 pkgcfg_DATA = \
   kudos.conf \
diff --git a/src/backend/merchant.conf b/src/backend/merchant.conf
index 44ec72d7..1231eddd 100644
--- a/src/backend/merchant.conf
+++ b/src/backend/merchant.conf
@@ -6,6 +6,9 @@
 # General settings for the backend.
 [merchant]
 
+# Default currency we use.
+CURRENCY = KUDOS
+
 # Use TCP or UNIX domain sockets?
 SERVE = tcp
 
diff --git a/src/backend/taler-merchant-httpd.c b/src/backend/taler-merchant-httpd.c
index f14c2c7e..34bed4ad 100644
--- a/src/backend/taler-merchant-httpd.c
+++ b/src/backend/taler-merchant-httpd.c
@@ -2263,6 +2263,7 @@ run (void *cls,
 
   if (GNUNET_SYSERR ==
       TALER_config_get_currency (cfg,
+                                 "merchant",
                                  &TMH_currency))
   {
 
@@ -2317,7 +2318,14 @@ run (void *cls,
                                             "merchant",
                                             "FORCE_AUDIT"))
     TMH_force_audit = GNUNET_YES;
-  TALER_TEMPLATING_init ("merchant");
+  if (GNUNET_OK !=
+      TALER_TEMPLATING_init (TALER_EXCHANGE_project_data ()))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed to setup templates\n");
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
   if (GNUNET_OK !=
       TMH_spa_init ())
   {
diff --git a/src/backend/taler-merchant-httpd_post-orders-ID-abort.c b/src/backend/taler-merchant-httpd_post-orders-ID-abort.c
index 80c6930b..19ee4cb7 100644
--- a/src/backend/taler-merchant-httpd_post-orders-ID-abort.c
+++ b/src/backend/taler-merchant-httpd_post-orders-ID-abort.c
@@ -884,6 +884,7 @@ parse_abort (struct MHD_Connection *connection,
       struct RefundDetails *rd = &ac->rd[coins_index];
       const char *exchange_url;
       struct GNUNET_JSON_Specification ispec[] = {
+        /* FIXME: this is breaking multi-currency support! */
         TALER_JSON_spec_amount ("contribution",
                                 TMH_currency,
                                 &rd->amount_with_fee),
diff --git a/src/backend/taler-merchant-httpd_private-post-orders.c b/src/backend/taler-merchant-httpd_private-post-orders.c
index 2b2931f1..a39e3202 100644
--- a/src/backend/taler-merchant-httpd_private-post-orders.c
+++ b/src/backend/taler-merchant-httpd_private-post-orders.c
@@ -886,36 +886,36 @@ execute_transaction (struct OrderContext *oc)
   }
 
   {
-    enum GNUNET_DB_QueryStatus qs;
+    enum GNUNET_DB_QueryStatus wqs;
     json_t *jhook;
 
-    jhook = GNUNET_JSON_PACK(
-      GNUNET_JSON_pack_string("order_id",
-                              oc->parse_order.order_id),
-      GNUNET_JSON_pack_object_incref("contract",
-                                     oc->serialize_order.contract),
-      GNUNET_JSON_pack_string("instance_id",
-                              oc->hc->instance->settings.id)
-    );
-    GNUNET_assert(NULL != jhook);
+    jhook = GNUNET_JSON_PACK (
+      GNUNET_JSON_pack_string ("order_id",
+                               oc->parse_order.order_id),
+      GNUNET_JSON_pack_object_incref ("contract",
+                                      oc->serialize_order.contract),
+      GNUNET_JSON_pack_string ("instance_id",
+                               oc->hc->instance->settings.id)
+      );
+    GNUNET_assert (NULL != jhook);
 
-    qs = TMH_trigger_webhook(oc->hc->instance->settings.id,
-                                     "order_created",
-                                     jhook);
+    wqs = TMH_trigger_webhook (oc->hc->instance->settings.id,
+                               "order_created",
+                               jhook);
 
-    json_decref(jhook);
+    json_decref (jhook);
 
-    if (0 < qs)
+    if (0 < wqs)
     {
       TMH_db->rollback (TMH_db->cls);
-      if (GNUNET_DB_STATUS_SOFT_ERROR == qs)
-        return qs;
-      GNUNET_break (GNUNET_DB_STATUS_HARD_ERROR == qs);
+      if (GNUNET_DB_STATUS_SOFT_ERROR == wqs)
+        return wqs;
+      GNUNET_break (GNUNET_DB_STATUS_HARD_ERROR == wqs);
       reply_with_error (oc,
                         MHD_HTTP_INTERNAL_SERVER_ERROR,
                         TALER_EC_GENERIC_DB_STORE_FAILED,
                         "failed to trigger webhooks");
-      return qs;
+      return wqs;
     }
   }
 
diff --git a/src/backend/taler-merchant-httpd_spa.c b/src/backend/taler-merchant-httpd_spa.c
index 6992f519..c8ff4782 100644
--- a/src/backend/taler-merchant-httpd_spa.c
+++ b/src/backend/taler-merchant-httpd_spa.c
@@ -316,7 +316,7 @@ TMH_spa_init ()
       return GNUNET_SYSERR;
     }
     GNUNET_asprintf (&dn,
-                     "%smerchant/spa/",
+                     "%s/spa/",
                      path);
     GNUNET_free (path);
   }
diff --git a/src/backenddb/Makefile.am b/src/backenddb/Makefile.am
index 8ade2260..926bbfb2 100644
--- a/src/backenddb/Makefile.am
+++ b/src/backenddb/Makefile.am
@@ -1,14 +1,14 @@
 # This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
 
-plugindir = $(libdir)/taler
+plugindir = $(libdir)/taler-merchant
 
-pkgcfgdir = $(prefix)/share/taler/config.d/
+pkgcfgdir = $(prefix)/share/taler-merchant/config.d/
 
 pkgcfg_DATA = \
   merchantdb-postgres.conf
 
-sqldir = $(prefix)/share/taler/sql/merchant/
+sqldir = $(prefix)/share/taler-merchant/sql/
 
 sqlinputs = \
   pg_*.sql \
diff --git a/src/backenddb/merchantdb-postgres.conf b/src/backenddb/merchantdb-postgres.conf
index 33b4b838..34be3e7e 100644
--- a/src/backenddb/merchantdb-postgres.conf
+++ b/src/backenddb/merchantdb-postgres.conf
@@ -1,6 +1,6 @@
 [merchantdb-postgres]
-CONFIG = "postgres:///talermerchant"
+CONFIG = "postgres:///taler-merchant"
 
 # Where are the SQL files to setup our tables?
 # Important: this MUST end with a "/"!
-SQL_DIR = ${DATADIR}sql/merchant/
+SQL_DIR = ${DATADIR}sql/
diff --git a/src/backenddb/test-merchantdb-postgres.conf b/src/backenddb/test-merchantdb-postgres.conf
index 5ddb86d8..f9c882fc 100644
--- a/src/backenddb/test-merchantdb-postgres.conf
+++ b/src/backenddb/test-merchantdb-postgres.conf
@@ -6,7 +6,7 @@ CONFIG = postgres:///talercheck
 
 # Where are the SQL files to setup our tables?
 # Important: this MUST end with a "/"!
-SQL_DIR = ${DATADIR}sql/merchant/
+SQL_DIR = ${DATADIR}sql/
 
 [taler]
 CURRENCY = "EUR"
 \ No newline at end of file
diff --git a/src/merchant-tools/benchmark-common.conf b/src/merchant-tools/benchmark-common.conf
index 66bf584c..ad4aaf46 100644
--- a/src/merchant-tools/benchmark-common.conf
+++ b/src/merchant-tools/benchmark-common.conf
@@ -2,10 +2,13 @@
 [paths]
 TALER_TEST_HOME=exchange_benchmark_home/
 
-[taler]
+[exchange]
 CURRENCY=EUR
 CURRENCY_ROUND_UNIT=EUR:0.01
 
+[merchant]
+CURRENCY=EUR
+
 [merchant-benchmark]
 MERCHANT_URL = "http://localhost:9966/"
 
diff --git a/src/merchant-tools/taler-merchant-benchmark.c b/src/merchant-tools/taler-merchant-benchmark.c
index 63a7a7f6..48bf0d0b 100644
--- a/src/merchant-tools/taler-merchant-benchmark.c
+++ b/src/merchant-tools/taler-merchant-benchmark.c
@@ -567,6 +567,7 @@ main (int argc,
     }
     if (GNUNET_OK !=
         TALER_config_get_currency (cfg,
+                                   "merchant",
                                    &currency))
     {
       TALER_LOG_ERROR ("Failed to read currency from configuration\n");
diff --git a/src/testing/.gitignore b/src/testing/.gitignore
index 07fd2be3..bd564cd8 100644
--- a/src/testing/.gitignore
+++ b/src/testing/.gitignore
@@ -16,3 +16,7 @@ test_kyc_api
 test_merchant_api_home/taler/exchange-secmod-*
 *.edited
 test_merchant_api_home/taler/exchange-offline/secm_tofus.pub
+test_merchant_api_home/.local/share/taler-exchange/exchange-secmod-cs/
+test_merchant_api_home/.local/share/taler-exchange/exchange-secmod-eddsa/
+test_merchant_api_home/.local/share/taler-exchange/exchange-secmod-rsa/
+test_merchant_api_home/.local/share/taler-exchange/exchange-offline/secm_tofus.pub
diff --git a/src/testing/test_kyc_api.conf b/src/testing/test_kyc_api.conf
index ff3a80e0..c10fb4f0 100644
--- a/src/testing/test_kyc_api.conf
+++ b/src/testing/test_kyc_api.conf
@@ -3,10 +3,6 @@
 [PATHS]
 TALER_TEST_HOME = test_merchant_api_home/
 
-[taler]
-CURRENCY = EUR
-CURRENCY_ROUND_UNIT = EUR:0.01
-
 [merchant-exchange-kudos]
 DISABLED = YES
 
@@ -28,19 +24,28 @@ DB = postgres
 # This specifies which database the postgres backend uses.
 [merchantdb-postgres]
 CONFIG = postgres:///talercheck
-SQL_DIR = $DATADIR/sql/merchant/
+SQL_DIR = ${DATADIR}sql/
 
 [merchant-exchange-test]
-MASTER_KEY = NKX42KSCQHDQK7CF1PC6X9DMQPXW6KHXKGD3DPQJMP32FKXSWYK0
+MASTER_KEY = KHA6YSPRQV1ZFCF144SY8KJNR588XA8DA0F6510FKJW30DJFJNAG
 EXCHANGE_BASE_URL = http://localhost:8081/
 CURRENCY = EUR
 
+[auditor]
+BASE_URL = "http://localhost:8083/"
+AUDITOR_PRIV_FILE = ${TALER_DATA_HOME}/auditor/offline-keys/auditor.priv
+DB = postgres
+PUBLIC_KEY = A29P1DRGXVTJZV1HFG251QPAW3ZTC681ZJWXB1T0RWGPE2HQSGZG
+TALER_AUDITOR_SALT = test
+
 [auditordb-postgres]
 CONFIG = postgres:///talercheck
 
 [exchange]
+CURRENCY = EUR
+CURRENCY_ROUND_UNIT = EUR:0.01
 PORT = 8081
-MASTER_PUBLIC_KEY = NKX42KSCQHDQK7CF1PC6X9DMQPXW6KHXKGD3DPQJMP32FKXSWYK0
+MASTER_PUBLIC_KEY = KHA6YSPRQV1ZFCF144SY8KJNR588XA8DA0F6510FKJW30DJFJNAG
 BASE_URL = "http://localhost:8081/"
 STEFAN_ABS = "EUR:5"
 ENABLE_KYC = YES
diff --git a/src/testing/test_merchant_api.conf b/src/testing/test_merchant_api.conf
index 87dc6401..58245a4f 100644
--- a/src/testing/test_merchant_api.conf
+++ b/src/testing/test_merchant_api.conf
@@ -3,10 +3,6 @@
 [PATHS]
 TALER_TEST_HOME = test_merchant_api_home/
 
-[taler]
-CURRENCY = EUR
-CURRENCY_ROUND_UNIT = EUR:0.01
-
 [merchant-exchange-kudos]
 DISABLED = YES
 
@@ -35,29 +31,39 @@ PWD_HASH_CONFIG = { "cost": 4 }
 PWD_AUTH_COMPAT = yes
 
 [merchant]
+CURRENCY = EUR
 PORT = 8080
 SERVE = tcp
 DB = postgres
 
 [merchantdb-postgres]
 CONFIG = postgres:///talercheck
-SQL_DIR = $DATADIR/sql/merchant/
+SQL_DIR = ${DATADIR}sql/
 
 [merchant-exchange-test]
-MASTER_KEY = NKX42KSCQHDQK7CF1PC6X9DMQPXW6KHXKGD3DPQJMP32FKXSWYK0
+MASTER_KEY = KHA6YSPRQV1ZFCF144SY8KJNR588XA8DA0F6510FKJW30DJFJNAG
 EXCHANGE_BASE_URL = http://localhost:8081/
 CURRENCY = EUR
 
 [exchange]
+CURRENCY = EUR
+CURRENCY_ROUND_UNIT = EUR:0.01
 AML_THRESHOLD = EUR:1000000
 PORT = 8081
-MASTER_PUBLIC_KEY = NKX42KSCQHDQK7CF1PC6X9DMQPXW6KHXKGD3DPQJMP32FKXSWYK0
+MASTER_PUBLIC_KEY = KHA6YSPRQV1ZFCF144SY8KJNR588XA8DA0F6510FKJW30DJFJNAG
 BASE_URL = "http://localhost:8081/"
 STEFAN_ABS = "EUR:5"
 
 [exchangedb-postgres]
 CONFIG = "postgres:///talercheck"
 
+[auditor]
+BASE_URL = "http://localhost:8083/"
+AUDITOR_PRIV_FILE = ${TALER_DATA_HOME}/auditor/offline-keys/auditor.priv
+DB = postgres
+PUBLIC_KEY = A29P1DRGXVTJZV1HFG251QPAW3ZTC681ZJWXB1T0RWGPE2HQSGZG
+TALER_AUDITOR_SALT = test
+
 [auditordb-postgres]
 CONFIG = postgres:///talercheck
 
diff --git a/src/testing/test_merchant_api_home/.config/taler/merchant/account-3.json b/src/testing/test_merchant_api_home/.config/taler/merchant/account-3.json
deleted file mode 100644
index 70e8bbb6..00000000
--- a/src/testing/test_merchant_api_home/.config/taler/merchant/account-3.json
+++ /dev/null
@@ -1 +0,0 @@
-{"payto_uri":"payto://x-taler-bank/localhost/3","salt":"KHMDP5RV4K75TYZAAZEFSB33AQK5DECEDAQB3AYCXZHB50W83RC5C08H5CRNNG9BWQXN3RD52WCQ09A3MFJDJASGB3PRPA03V3TEGCR"}
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/.config/taler/merchant/default.priv b/src/testing/test_merchant_api_home/.config/taler/merchant/default.priv
deleted file mode 100644
index 8299ad28..00000000
--- a/src/testing/test_merchant_api_home/.config/taler/merchant/default.priv
+++ /dev/null
@@ -1 +0,0 @@
-~�~j�&i�4q���l�BM:ƾ��Oߪ�#
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/.config/taler/merchant/dtip.priv b/src/testing/test_merchant_api_home/.config/taler/merchant/dtip.priv
deleted file mode 100644
index ff3842bb..00000000
--- a/src/testing/test_merchant_api_home/.config/taler/merchant/dtip.priv
+++ /dev/null
@@ -1 +0,0 @@
-�����47%T������ҟ�\�v}�"hP!��.
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/.config/taler/merchant/nulltip.priv b/src/testing/test_merchant_api_home/.config/taler/merchant/nulltip.priv
deleted file mode 100644
index db695e5c..00000000
--- a/src/testing/test_merchant_api_home/.config/taler/merchant/nulltip.priv
+++ /dev/null
@@ -1,2 +0,0 @@
-b���y~�]�m���~��r�1fcT0�4Q�
-ds�
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/.config/taler/merchant/reserve/dtip.priv b/src/testing/test_merchant_api_home/.config/taler/merchant/reserve/dtip.priv
deleted file mode 100644
index c586db18..00000000
--- a/src/testing/test_merchant_api_home/.config/taler/merchant/reserve/dtip.priv
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/.config/taler/merchant/reserve/nulltip.priv b/src/testing/test_merchant_api_home/.config/taler/merchant/reserve/nulltip.priv
deleted file mode 100644
index edf062ea..00000000
--- a/src/testing/test_merchant_api_home/.config/taler/merchant/reserve/nulltip.priv
+++ /dev/null
@@ -1 +0,0 @@
-Bu#ĜW0�*~����$R��O��������pk
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/.config/taler/merchant/reserve/tip.priv b/src/testing/test_merchant_api_home/.config/taler/merchant/reserve/tip.priv
deleted file mode 100644
index 5ee3bce0..00000000
--- a/src/testing/test_merchant_api_home/.config/taler/merchant/reserve/tip.priv
+++ /dev/null
@@ -1 +0,0 @@
-��V���<���g�Jΰ�Xc;�K���i�"
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/.config/taler/merchant/tip.priv b/src/testing/test_merchant_api_home/.config/taler/merchant/tip.priv
deleted file mode 100644
index ba920729..00000000
--- a/src/testing/test_merchant_api_home/.config/taler/merchant/tip.priv
+++ /dev/null
@@ -1 +0,0 @@
--�ylx;�b�~2�.�l��8P��ĕ���b�
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/.config/taler/merchant/tor.priv b/src/testing/test_merchant_api_home/.config/taler/merchant/tor.priv
deleted file mode 100644
index 5d94c717..00000000
--- a/src/testing/test_merchant_api_home/.config/taler/merchant/tor.priv
+++ /dev/null
@@ -1 +0,0 @@
-d�\���2��ȈaK���#�+Nf/Fs�lG��
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/.config/taler/test.json b/src/testing/test_merchant_api_home/.config/taler/test.json
deleted file mode 100644
index 74cdc92b..00000000
--- a/src/testing/test_merchant_api_home/.config/taler/test.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "The exchange",
-  "account_number": 3,
-  "bank_url": "http://localhost:8083/",
-  "salt": "6259MV4W9V8D2A75RSGGPKYHQRXRPQZ33EBG263JZRJ6SA5HK0RRKHV70TNA1RVRG77M57CCFVSK2B0EJN3SR8S21F0ZX2MR9DNVG50",
-  "type": "test",
-  "sig": "8C3D3J816S29AA2AJ7P9TS6W13KFNFS2RCVYJEWRBNHRRMTTRAWKY7WA1N3G54E4K3XAC2HN6JDHS42TWR5315J34JHHCKV618K221G"
-}
diff --git a/src/testing/test_merchant_api_home/.local/share/taler-auditor/offline-keys/auditor.priv b/src/testing/test_merchant_api_home/.local/share/taler-auditor/offline-keys/auditor.priv
new file mode 100644
index 00000000..da158181
--- /dev/null
+++ b/src/testing/test_merchant_api_home/.local/share/taler-auditor/offline-keys/auditor.priv
@@ -0,0 +1 @@
+"�0Ll(�&����\d������%�쎫��
+\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/.local/share/taler-exchange/exchange-offline/master.priv b/src/testing/test_merchant_api_home/.local/share/taler-exchange/exchange-offline/master.priv
new file mode 100644
index 00000000..7a441405
--- /dev/null
+++ b/src/testing/test_merchant_api_home/.local/share/taler-exchange/exchange-offline/master.priv
@@ -0,0 +1 @@
+�sJh,������Ţ�<��k�yV㮷
+\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/.local/share/taler/exchange-offline/master.priv b/src/testing/test_merchant_api_home/.local/share/taler/exchange-offline/master.priv
deleted file mode 100644
index efee2ec3..00000000
--- a/src/testing/test_merchant_api_home/.local/share/taler/exchange-offline/master.priv
+++ /dev/null
@@ -1 +0,0 @@
-L���kCO���ױ��������a��M�)G@_�
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/.local/share/taler/merchant/merchant.priv b/src/testing/test_merchant_api_home/.local/share/taler/merchant/merchant.priv
deleted file mode 100644
index fd6e5f7f..00000000
--- a/src/testing/test_merchant_api_home/.local/share/taler/merchant/merchant.priv
+++ /dev/null
@@ -1 +0,0 @@
-��,�Y%�FF<��R��9ϳ5��v\���k4�6
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/auditor/offline-keys/auditor.priv b/src/testing/test_merchant_api_home/taler/auditor/offline-keys/auditor.priv
deleted file mode 100644
index b1d1e3e1..00000000
--- a/src/testing/test_merchant_api_home/taler/auditor/offline-keys/auditor.priv
+++ /dev/null
@@ -1 +0,0 @@
-�Y�74N������O���V|1��\uY0G�r��
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1696437704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1696437704
deleted file mode 100644
index ab4ab213..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1696437704
+++ /dev/null
@@ -1 +0,0 @@
-��ٞ�����>e@cD���Ӵ_!��.�"
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1697042204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1697042204
deleted file mode 100644
index 895251e7..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1697042204
+++ /dev/null
@@ -1 +0,0 @@
-��57洴�TU^�޹Q�&k�
-'�GRT��J�
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1697646704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1697646704
deleted file mode 100644
index bf62233c..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1697646704
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1698251204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1698251204
deleted file mode 100644
index 0ad216c4..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1698251204
+++ /dev/null
@@ -1 +0,0 @@
-��^��t�9�2L�j7�iS7�D^��t(��|�
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1698855704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1698855704
deleted file mode 100644
index 31e290ff..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1698855704
+++ /dev/null
@@ -1 +0,0 @@
-�Fl6;�Z�̥hd>cȩ+�q8��i��]��	
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1699460204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1699460204
deleted file mode 100644
index 60a6a9d8..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1699460204
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1700064704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1700064704
deleted file mode 100644
index bf23c192..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1700064704
+++ /dev/null
@@ -1 +0,0 @@
-�v�k�=�h�L�2�PoK~���҈i�k�8X
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1700669204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1700669204
deleted file mode 100644
index bb72cade..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1700669204
+++ /dev/null
@@ -1 +0,0 @@
-�G�Ȑ�Mw7#9�\�r�\#�)�����(�K
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1701273704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1701273704
deleted file mode 100644
index fe214623..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1701273704
+++ /dev/null
@@ -1 +0,0 @@
-A�s����2�I}�y���eЪ�c0- K����
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1701878204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1701878204
deleted file mode 100644
index dc26e8b6..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1701878204
+++ /dev/null
@@ -1 +0,0 @@
-�~�e�G�Z�; l¾�~�~K�L�m%��
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1702482704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1702482704
deleted file mode 100644
index 45bf2bed..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1702482704
+++ /dev/null
@@ -1,2 +0,0 @@
-�4|�7&<
-_��}����)|5��V��Y�:��P
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1703087204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1703087204
deleted file mode 100644
index da362cdf..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1703087204
+++ /dev/null
@@ -1 +0,0 @@
-�A0�>gc���	���F�U�����h�t�.Q
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1703691704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1703691704
deleted file mode 100644
index ba11ebec..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1703691704
+++ /dev/null
@@ -1,2 +0,0 @@
-ʾ:�C���%y�A	
-����J���5-��
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1704296204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1704296204
deleted file mode 100644
index 727eff6b..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1704296204
+++ /dev/null
@@ -1 +0,0 @@
-���{��u�p�S��W/W�����p�V�fKj
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1704900704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1704900704
deleted file mode 100644
index 25552b45..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1704900704
+++ /dev/null
@@ -1 +0,0 @@
-�����KxƏ�aA'�D�41��B�4O[�
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1705505204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1705505204
deleted file mode 100644
index 7242fa0d..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1705505204
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1706109704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1706109704
deleted file mode 100644
index 34b500c6..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1706109704
+++ /dev/null
@@ -1 +0,0 @@
-�D-d�ÿ�!�!��[y�H$�m7����%
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1706714204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1706714204
deleted file mode 100644
index 3fe013b7..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1706714204
+++ /dev/null
@@ -1 +0,0 @@
-��b��$�ߗ����q_�~�9�o�g`;�c��
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1707318704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1707318704
deleted file mode 100644
index 5053597b..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1707318704
+++ /dev/null
@@ -1,2 +0,0 @@
-�6�_���k�}�6"Ti�C͎��f
-���
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1707923204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1707923204
deleted file mode 100644
index 5cad2bc1..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1707923204
+++ /dev/null
@@ -1,2 +0,0 @@
-
-*[	(�mab���M^+x��_��MגҖ�D
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1708527704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1708527704
deleted file mode 100644
index d1ad1680..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1708527704
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1709132204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1709132204
deleted file mode 100644
index c79ca30e..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1709132204
+++ /dev/null
@@ -1 +0,0 @@
-Yx��/*��ǭ��Md2�-g���y��j�ΐ�N
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1709736704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1709736704
deleted file mode 100644
index 94a9482c..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1709736704
+++ /dev/null
@@ -1 +0,0 @@
-���p�usF�m���mDrL���<�w�;?<
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1710341204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1710341204
deleted file mode 100644
index 0ec117aa..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1710341204
+++ /dev/null
@@ -1 +0,0 @@
-3c&K�3�P<�����Yg��Pe��R~��u�Q
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1710945704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1710945704
deleted file mode 100644
index 0afb9a9b..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1710945704
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1711550204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1711550204
deleted file mode 100644
index 2f382d5f..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1711550204
+++ /dev/null
@@ -1,2 +0,0 @@
-6��8h�wb=u����/��
-�@�P_�jD�6
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1712154704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1712154704
deleted file mode 100644
index bf6ed47c..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1712154704
+++ /dev/null
@@ -1 +0,0 @@
-�s��ISn�=k���F%*Y�T��
-k��ia
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1712759204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1712759204
deleted file mode 100644
index f0135fb3..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1712759204
+++ /dev/null
@@ -1 +0,0 @@
-��Ԟ��uBUߓ(0\���G���g��
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1713363704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1713363704
deleted file mode 100644
index 921f8b6f..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1713363704
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1713968204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1713968204
deleted file mode 100644
index ca4f82a0..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1713968204
+++ /dev/null
@@ -1 +0,0 @@
-|�X�CF�m����6�
-�cB���*)?Wr
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1714572704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1714572704
deleted file mode 100644
index a2a6d38e..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1714572704
+++ /dev/null
@@ -1 +0,0 @@
-�����N�TFpI�~WZ�$n^�}�A��з��
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1715177204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1715177204
deleted file mode 100644
index d6712222..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1715177204
+++ /dev/null
@@ -1 +0,0 @@
-q�M/Ӗΰ�Q��й��C�����h�L
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1715781704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1715781704
deleted file mode 100644
index 70103e65..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1715781704
+++ /dev/null
@@ -1 +0,0 @@
-��7֖���^;P_����`)�3:���Q��
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1716386204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1716386204
deleted file mode 100644
index 9b43f31d..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1716386204
+++ /dev/null
@@ -1 +0,0 @@
-�0s23J�z�Bp{��Q�%�ɜu	�Ә�
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1716990704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1716990704
deleted file mode 100644
index 27fae6fe..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1716990704
+++ /dev/null
@@ -1 +0,0 @@
-
-<Z~V�8l(�3Ǉ7����L����"��
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1717595204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1717595204
deleted file mode 100644
index 72ae4efd..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1717595204
+++ /dev/null
@@ -1 +0,0 @@
-
-;~������������D�l*��,�ĳ��
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1696437704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1696437704
deleted file mode 100644
index 256151dc..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1696437704
+++ /dev/null
@@ -1 +0,0 @@
-9&g��هPH<�J����a8D�#���N�B�
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1697042204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1697042204
deleted file mode 100644
index fdae36a5..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1697042204
+++ /dev/null
@@ -1 +0,0 @@
-�;sڛ��[��t����ں��f�'��kkC�	
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1697646704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1697646704
deleted file mode 100644
index 07c534ba..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1697646704
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1698251204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1698251204
deleted file mode 100644
index d733cf16..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1698251204
+++ /dev/null
@@ -1 +0,0 @@
-�ʠ;����Tp2�)D�-hw�M�:��7ŝQ�M
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1698855704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1698855704
deleted file mode 100644
index 9c5bb02c..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1698855704
+++ /dev/null
@@ -1 +0,0 @@
-}묾���@,"����	LG�t��߲ʸN�
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1699460204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1699460204
deleted file mode 100644
index 98456040..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1699460204
+++ /dev/null
@@ -1 +0,0 @@
-�z���r�ɳ	��cF��P�R��5k~_���
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1700064704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1700064704
deleted file mode 100644
index 2fe3435c..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1700064704
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1700669204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1700669204
deleted file mode 100644
index 6024c31a..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1700669204
+++ /dev/null
@@ -1 +0,0 @@
-kS��M��(�!�������tΠ��G�L=�:
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1701273704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1701273704
deleted file mode 100644
index 36dde967..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1701273704
+++ /dev/null
@@ -1 +0,0 @@
-���n��q5�����y��T�#F3���
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1701878204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1701878204
deleted file mode 100644
index c65618d6..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1701878204
+++ /dev/null
@@ -1 +0,0 @@
-E|���`5;��r�ó����]�`��
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1702482704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1702482704
deleted file mode 100644
index 4f50e1ec..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1702482704
+++ /dev/null
@@ -1,2 +0,0 @@
-�0jɋÏV��Z��ъ��۫���
-כ��
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1703087204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1703087204
deleted file mode 100644
index 48a9b32f..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1703087204
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1703691704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1703691704
deleted file mode 100644
index 95978f6c..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1703691704
+++ /dev/null
@@ -1 +0,0 @@
-���`+�zg��0��b�k�?m
-�i3u�
-b��
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1704296204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1704296204
deleted file mode 100644
index f476a698..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1704296204
+++ /dev/null
@@ -1 +0,0 @@
-Y>š�}ο��yKEv�02���2PZ����
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1704900704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1704900704
deleted file mode 100644
index 01c429af..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1704900704
+++ /dev/null
@@ -1 +0,0 @@
-�IER�Åp�!"5�����I� ��p(C��~
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1705505204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1705505204
deleted file mode 100644
index b8c127a6..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1705505204
+++ /dev/null
@@ -1 +0,0 @@
-H���f�Y_��<��ii�i]�%⩨Q
-�.�|�
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1706109704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1706109704
deleted file mode 100644
index e8d10e5a..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1706109704
+++ /dev/null
@@ -1,3 +0,0 @@
-��9B1�Z
-_�rpn���2,�h{ڤ
-�����
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1706714204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1706714204
deleted file mode 100644
index f1752f7b..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1706714204
+++ /dev/null
@@ -1 +0,0 @@
-Γ[J��Q�M
-��OT�N[�y2��6I�
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1707318704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1707318704
deleted file mode 100644
index 53710bff..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1707318704
+++ /dev/null
@@ -1 +0,0 @@
-OC;.K��f0�b���gi�V=cF}�:J�ż�
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1707923204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1707923204
deleted file mode 100644
index d8359467..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1707923204
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1708527704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1708527704
deleted file mode 100644
index 35f5f4c3..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1708527704
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1709132204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1709132204
deleted file mode 100644
index f6f02e40..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1709132204
+++ /dev/null
@@ -1 +0,0 @@
-s�-�*���8���Ji<ۑ�p��\���
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1709736704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1709736704
deleted file mode 100644
index 291492bd..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1709736704
+++ /dev/null
@@ -1 +0,0 @@
-�SI�@��fS��G�S��V�d⽄�&ޑb
-�
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1710341204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1710341204
deleted file mode 100644
index c7e79229..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1710341204
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1710945704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1710945704
deleted file mode 100644
index b65e0bda..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1710945704
+++ /dev/null
@@ -1 +0,0 @@
-�K��e6��n�CAF�~��<������c{
-�R
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1711550204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1711550204
deleted file mode 100644
index 4763e3bf..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1711550204
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1712154704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1712154704
deleted file mode 100644
index 3803be3c..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1712154704
+++ /dev/null
@@ -1 +0,0 @@
-���~vl�ZČ�dc��i���z?���C
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1712759204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1712759204
deleted file mode 100644
index efde898d..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1712759204
+++ /dev/null
@@ -1 +0,0 @@
-����2���Ϛ�Ux��^�PK��Dx�6
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1713363704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1713363704
deleted file mode 100644
index 8f34857c..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1713363704
+++ /dev/null
@@ -1 +0,0 @@
-v�Q�7a��ph���l��;�M�^U g-
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1713968204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1713968204
deleted file mode 100644
index 8827ac75..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1713968204
+++ /dev/null
@@ -1 +0,0 @@
-FR(r;�:����[N�<�M7�}Ā͂�IT
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1714572704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1714572704
deleted file mode 100644
index 74c227bf..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1714572704
+++ /dev/null
@@ -1 +0,0 @@
-�ȝ?̵�����,�@N�r�9��1����˥�
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1715177204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1715177204
deleted file mode 100644
index 5442c9b8..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1715177204
+++ /dev/null
@@ -1 +0,0 @@
-N�^0�Ym�t��ү*8є�M�d���ֈ
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1715781704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1715781704
deleted file mode 100644
index b6ceae19..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1715781704
+++ /dev/null
@@ -1 +0,0 @@
-M��*��d�&L�_��Z�͵�I����
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1716386204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1716386204
deleted file mode 100644
index 30facaaa..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1716386204
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1716990704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1716990704
deleted file mode 100644
index 0e28c81d..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1716990704
+++ /dev/null
@@ -1 +0,0 @@
-�>]����y�%��
-Y}DxCm�$wGE�
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1717595204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1717595204
deleted file mode 100644
index 1a5f9273..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1717595204
+++ /dev/null
@@ -1,2 +0,0 @@
-+�_Rm�OְAJ����d��&���}
-�",
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1696437704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1696437704
deleted file mode 100644
index 2260d03f..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1696437704
+++ /dev/null
@@ -1 +0,0 @@
-u�4Gxn�v]�,����uyH�1rӸ
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1697042204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1697042204
deleted file mode 100644
index 193e653d..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1697042204
+++ /dev/null
@@ -1,2 +0,0 @@
-]�H<�����
-��".�k43h��W���x�	
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1697646704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1697646704
deleted file mode 100644
index 47bc14d8..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1697646704
+++ /dev/null
@@ -1 +0,0 @@
-��Ä��հ�������@�[�*U�k���r
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1698251204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1698251204
deleted file mode 100644
index ba2059c4..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1698251204
+++ /dev/null
@@ -1 +0,0 @@
-؅�S�Ge��݉G`\֜XY���P/��حP�N
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1698855704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1698855704
deleted file mode 100644
index c41becef..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1698855704
+++ /dev/null
@@ -1 +0,0 @@
-�Z��<î�f�"��!�)�%�i�ܠ�â��t
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1699460204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1699460204
deleted file mode 100644
index ef4541c3..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1699460204
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1700064704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1700064704
deleted file mode 100644
index 4110af46..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1700064704
+++ /dev/null
@@ -1 +0,0 @@
-faN
-�H��'��^�>A����tn+[#5Y
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1700669204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1700669204
deleted file mode 100644
index b6bd01a3..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1700669204
+++ /dev/null
@@ -1 +0,0 @@
-˛oO���P6��QD���W�q$k�0J���
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1701273704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1701273704
deleted file mode 100644
index 9785b04d..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1701273704
+++ /dev/null
@@ -1 +0,0 @@
-�ⲭ��w��/ɕV�v��%�,i��	6#�	
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1701878204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1701878204
deleted file mode 100644
index 45dd2690..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1701878204
+++ /dev/null
@@ -1 +0,0 @@
-�=�p�;Ɛ��T3M[��x��|�m�~�O
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1702482704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1702482704
deleted file mode 100644
index 286d043e..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1702482704
+++ /dev/null
@@ -1 +0,0 @@
-t6�Jo������q��`�KKd:%���(��S)
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1703087204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1703087204
deleted file mode 100644
index 9a49a0d7..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1703087204
+++ /dev/null
@@ -1 +0,0 @@
-M�9�; Y�i��&!B���Oź0,�A�˒	b�
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1703691704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1703691704
deleted file mode 100644
index 7b831419..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1703691704
+++ /dev/null
@@ -1 +0,0 @@
-N��،�D���־q>A-;�������irf
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1704296204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1704296204
deleted file mode 100644
index e107b922..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1704296204
+++ /dev/null
@@ -1 +0,0 @@
-ma�H0��l%��y��X?Y6_8��X��G
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1704900704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1704900704
deleted file mode 100644
index 455ecdb7..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1704900704
+++ /dev/null
@@ -1 +0,0 @@
-�_�2y|��Ӡ�o݋��[�ڣoV�R�m
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1705505204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1705505204
deleted file mode 100644
index b0afe0cd..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1705505204
+++ /dev/null
@@ -1 +0,0 @@
-�ˈ�j�ɥ<M*�Ұ{�S�H4���j��Q�
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1706109704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1706109704
deleted file mode 100644
index cf96d588..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1706109704
+++ /dev/null
@@ -1 +0,0 @@
-����B�y�ؗ�~�{�M�NW�3KQ�5���
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1706714204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1706714204
deleted file mode 100644
index fdce10fe..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1706714204
+++ /dev/null
@@ -1 +0,0 @@
-^�[���Ŀ��j>���m0�Ygڳy� 
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1707318704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1707318704
deleted file mode 100644
index 4ce6db5e..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1707318704
+++ /dev/null
@@ -1 +0,0 @@
-m��� �������{���LO|SߌG���T3e
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1707923204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1707923204
deleted file mode 100644
index d273e552..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1707923204
+++ /dev/null
@@ -1 +0,0 @@
-T��h�2�{��5��Z�z�D���S*�)6a
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1709132204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1709132204
deleted file mode 100644
index 868af8ef..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1709132204
+++ /dev/null
@@ -1 +0,0 @@
-�n/3��W'��ۗ=�5mV���[���
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1709736704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1709736704
deleted file mode 100644
index 538ee496..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1709736704
+++ /dev/null
@@ -1 +0,0 @@
-����HO�˲%�ྡ��c�]X��>���
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1710341204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1710341204
deleted file mode 100644
index a24da62f..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1710341204
+++ /dev/null
@@ -1 +0,0 @@
-�yz��ͥ
-�HW@-��&y���.���/`�-
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1710945704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1710945704
deleted file mode 100644
index b4ca3f1f..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1710945704
+++ /dev/null
@@ -1 +0,0 @@
-܀އ#׭x0��ƚTcn�٢�-���r�
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1711550204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1711550204
deleted file mode 100644
index c57cde50..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1711550204
+++ /dev/null
@@ -1 +0,0 @@
-��M�d�Hn?�
-3Џ��H����/�"Q�
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1712154704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1712154704
deleted file mode 100644
index c085d0a8..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1712154704
+++ /dev/null
@@ -1 +0,0 @@
-7�9}��3�N�v�V�4VM�*ǆVZ��	
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1712759204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1712759204
deleted file mode 100644
index a29b261b..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1712759204
+++ /dev/null
@@ -1 +0,0 @@
-x�H��0iK��FoO?PІͤd��08
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1713363704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1713363704
deleted file mode 100644
index eb6972f8..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1713363704
+++ /dev/null
@@ -1 +0,0 @@
-4���,�@W��!�X���~<Txqf8A'C�
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1713968204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1713968204
deleted file mode 100644
index e3e18a16..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1713968204
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1714572704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1714572704
deleted file mode 100644
index 7d288934..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1714572704
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1715177204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1715177204
deleted file mode 100644
index c44343f9..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1715177204
+++ /dev/null
@@ -1 +0,0 @@
-I��<58N*'!�\�AX�,S<~�<�E���h
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1715781704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1715781704
deleted file mode 100644
index 2521c428..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1715781704
+++ /dev/null
@@ -1,2 +0,0 @@
-r�j>u��l�H۩T!���ˡ?
-��ID����
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1716386204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1716386204
deleted file mode 100644
index 7a016552..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1716386204
+++ /dev/null
@@ -1 +0,0 @@
-��)�F!��
-@�bL`�O]FD�,�(�>��
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1716990704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1716990704
deleted file mode 100644
index 7cafdb67..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1716990704
+++ /dev/null
@@ -1 +0,0 @@
- �ܻ(��F�N)���1��c�n8�Tx�U
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1717595204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1717595204
deleted file mode 100644
index c7772341..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1717595204
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1696437704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1696437704
deleted file mode 100644
index 3a48e83c..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1696437704
+++ /dev/null
@@ -1 +0,0 @@
-	������1p�J9A[�x������7.ka�p
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1697042204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1697042204
deleted file mode 100644
index 02fcbef5..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1697042204
+++ /dev/null
@@ -1 +0,0 @@
-�(�(F��;3,ʇț�WI��h�z!��؇[
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1697646704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1697646704
deleted file mode 100644
index 514a546f..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1697646704
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1698251204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1698251204
deleted file mode 100644
index b082e7da..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1698251204
+++ /dev/null
@@ -1 +0,0 @@
-�Cx�,�K�N�ƆkUY�����z�9�R�o+nf�
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1698855704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1698855704
deleted file mode 100644
index 969cb8d8..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1698855704
+++ /dev/null
@@ -1 +0,0 @@
-Mq�B����4鎥r�P�Ƈ����Hgi�
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1699460204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1699460204
deleted file mode 100644
index fcfb97a2..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1699460204
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1700064704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1700064704
deleted file mode 100644
index d7f0cffe..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1700064704
+++ /dev/null
@@ -1 +0,0 @@
-�����9RN�H����ě�L+7NL�iL��
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1700669204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1700669204
deleted file mode 100644
index 912e633f..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1700669204
+++ /dev/null
@@ -1 +0,0 @@
-A�0��$�^�뢈��/�u�SE}������	
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1701273704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1701273704
deleted file mode 100644
index c2d88da1..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1701273704
+++ /dev/null
@@ -1 +0,0 @@
-(��*	U�B�㫼�,�X'"���\J�|�k3�
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1701878204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1701878204
deleted file mode 100644
index 14281a72..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1701878204
+++ /dev/null
@@ -1 +0,0 @@
-s���R���z��4���Ÿsd�_�Jߣ�u
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1702482704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1702482704
deleted file mode 100644
index 3f1f19d8..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1702482704
+++ /dev/null
@@ -1 +0,0 @@
-Mne6�{�ᒘ�E1U� Vх���P"?�R
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1703087204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1703087204
deleted file mode 100644
index 4ce8f1ff..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1703087204
+++ /dev/null
@@ -1 +0,0 @@
-�����$�[�R���n�������P7�G�)
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1703691704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1703691704
deleted file mode 100644
index 1971537b..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1703691704
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1704296204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1704296204
deleted file mode 100644
index 77c8c1d5..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1704296204
+++ /dev/null
@@ -1 +0,0 @@
-%y�k/lw5�^��_�و٭t`�2{�T���8i	
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1704900704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1704900704
deleted file mode 100644
index c946503d..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1704900704
+++ /dev/null
@@ -1 +0,0 @@
-�Mrq�Dq��rEtjX��N�{�Z�T���
-�4
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1705505204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1705505204
deleted file mode 100644
index 86eea5e2..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1705505204
+++ /dev/null
@@ -1 +0,0 @@
-���xCa^dO��������?�[݌x1V��
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1706109704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1706109704
deleted file mode 100644
index 1057eb4c..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1706109704
+++ /dev/null
@@ -1 +0,0 @@
-P��E��ƞ��O�5r���0iH�Kb�13
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1706714204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1706714204
deleted file mode 100644
index 3cbb16ef..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1706714204
+++ /dev/null
@@ -1 +0,0 @@
-�BǀE��{�����+���oP�ᕲ���"
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1707318704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1707318704
deleted file mode 100644
index 7f4ce85b..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1707318704
+++ /dev/null
@@ -1,2 +0,0 @@
-�=�ʾ���E�
-VS��9�X��{}ei\���u
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1707923204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1707923204
deleted file mode 100644
index d44fbfb7..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1707923204
+++ /dev/null
@@ -1 +0,0 @@
-!2^�.O��I�$^��0X�Ĵq��n��|4�
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1708527704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1708527704
deleted file mode 100644
index cba4467a..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1708527704
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1709132204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1709132204
deleted file mode 100644
index 528b7eee..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1709132204
+++ /dev/null
@@ -1 +0,0 @@
-��CC�e��A	M��Bd�;/�
-���n��
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1709736704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1709736704
deleted file mode 100644
index a5e1d42a..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1709736704
+++ /dev/null
@@ -1 +0,0 @@
-o��>�I��D��Ņ�bvJ�HNa7)�1��i
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1710341204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1710341204
deleted file mode 100644
index 47341063..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1710341204
+++ /dev/null
@@ -1 +0,0 @@
-�Rۦ�%D1g�B�Y��y�p���@㥎ix
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1710945704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1710945704
deleted file mode 100644
index ebbad9d4..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1710945704
+++ /dev/null
@@ -1 +0,0 @@
-(~�c�f��aM��� M���JjR�	���
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1711550204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1711550204
deleted file mode 100644
index db6a523e..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1711550204
+++ /dev/null
@@ -1 +0,0 @@
-!QV�^p7"�/��v�]ߤ�dūD�r=�
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1712154704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1712154704
deleted file mode 100644
index d281cbcc..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1712154704
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1712759204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1712759204
deleted file mode 100644
index 4cd2c6aa..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1712759204
+++ /dev/null
@@ -1 +0,0 @@
-�����ڊ����n��<;q.���N�
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1713363704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1713363704
deleted file mode 100644
index dba39243..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1713363704
+++ /dev/null
@@ -1 +0,0 @@
-u�>/�{��&AN|�s�3� C�Z����-��
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1713968204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1713968204
deleted file mode 100644
index 7cda9094..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1713968204
+++ /dev/null
@@ -1 +0,0 @@
-��?7��!CS�%A� ��¦��5C�4���
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1714572704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1714572704
deleted file mode 100644
index 6fe94e82..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1714572704
+++ /dev/null
@@ -1 +0,0 @@
-ct��B�i�6,���uW�C2�n��Y�]�
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1715177204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1715177204
deleted file mode 100644
index 02d135b2..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1715177204
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1715781704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1715781704
deleted file mode 100644
index b3015f6f..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1715781704
+++ /dev/null
@@ -1 +0,0 @@
-AvG�!�
-��<���o��S�6��߈n����"�
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1716386204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1716386204
deleted file mode 100644
index 2f426abf..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1716386204
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1716990704 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1716990704
deleted file mode 100644
index 61d52a98..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1716990704
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1717595204 b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1717595204
deleted file mode 100644
index f839fc3d..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1717595204
+++ /dev/null
@@ -1 +0,0 @@
-�A)�����/V��.���q���u/5P�x���
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/secmod-private-key b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/secmod-private-key
deleted file mode 100644
index 8c53f4b1..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/secmod-private-key
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-eddsa/secmod-private-key b/src/testing/test_merchant_api_home/taler/exchange-secmod-eddsa/secmod-private-key
deleted file mode 100644
index a1ae416d..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-eddsa/secmod-private-key
+++ /dev/null
@@ -1 +0,0 @@
-�\�"�h(QH�,e�҃=ۜ2�NX�ښ�8��
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/exchange-secmod-rsa/secmod-private-key b/src/testing/test_merchant_api_home/taler/exchange-secmod-rsa/secmod-private-key
deleted file mode 100644
index 26eda485..00000000
--- a/src/testing/test_merchant_api_home/taler/exchange-secmod-rsa/secmod-private-key
+++ /dev/null
@@ -1 +0,0 @@
-=E�<6�$��1�D��qzj��p�J	��O�n
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/taler/auditor/offline-keys/auditor.priv b/src/testing/test_merchant_api_home/taler/taler/auditor/offline-keys/auditor.priv
deleted file mode 100644
index b1d1e3e1..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/auditor/offline-keys/auditor.priv
+++ /dev/null
@@ -1 +0,0 @@
-�Y�74N������O���V|1��\uY0G�r��
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-eddsa/1626561343 b/src/testing/test_merchant_api_home/taler/taler/crypto-eddsa/1626561343
deleted file mode 100644
index 4ebda709..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-eddsa/1626561343
+++ /dev/null
@@ -1 +0,0 @@
-�_ۥ�2�r+j@����(ld�Te����KJUtZ
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-eddsa/1633818643 b/src/testing/test_merchant_api_home/taler/taler/crypto-eddsa/1633818643
deleted file mode 100644
index f59e876d..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-eddsa/1633818643
+++ /dev/null
@@ -1 +0,0 @@
-]t��R~9��-0F�NP�g�zܤIB��H>A
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-eddsa/1641075943 b/src/testing/test_merchant_api_home/taler/taler/crypto-eddsa/1641075943
deleted file mode 100644
index 6bff5766..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-eddsa/1641075943
+++ /dev/null
@@ -1 +0,0 @@
-��7M�"s`���e����|ݓ���N-k�
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-eddsa/1648333243 b/src/testing/test_merchant_api_home/taler/taler/crypto-eddsa/1648333243
deleted file mode 100644
index 1421144a..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-eddsa/1648333243
+++ /dev/null
@@ -1 +0,0 @@
-8:o�`-��ci�Klçn4<��bJz'I
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-eddsa/1655590543 b/src/testing/test_merchant_api_home/taler/taler/crypto-eddsa/1655590543
deleted file mode 100644
index 6cc325dc..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-eddsa/1655590543
+++ /dev/null
@@ -1 +0,0 @@
-�����9�$k���..���l��_�L����o
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1626554443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1626554443
deleted file mode 100644
index c9dc2198..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1626554443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1627158943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1627158943
deleted file mode 100644
index 502eb080..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1627158943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1627763443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1627763443
deleted file mode 100644
index 38e4d600..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1627763443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1628367943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1628367943
deleted file mode 100644
index 94b19c17..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1628367943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1628972443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1628972443
deleted file mode 100644
index 2d806502..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1628972443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1629576943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1629576943
deleted file mode 100644
index 95e73f8d..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1629576943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1630181443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1630181443
deleted file mode 100644
index 90ab6274..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1630181443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1630785943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1630785943
deleted file mode 100644
index 93a7c0f6..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1630785943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1631390443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1631390443
deleted file mode 100644
index 7f1a34b4..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1631390443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1631994943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1631994943
deleted file mode 100644
index e7aead59..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1631994943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1632599443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1632599443
deleted file mode 100644
index 9a3ca629..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1632599443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1633203943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1633203943
deleted file mode 100644
index eefe38a7..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1633203943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1633808443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1633808443
deleted file mode 100644
index 83e32064..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1633808443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1634412943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1634412943
deleted file mode 100644
index 34c4f7cc..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1634412943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1635017443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1635017443
deleted file mode 100644
index 7003d582..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1635017443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1635621943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1635621943
deleted file mode 100644
index 4ec323d5..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1635621943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1636226443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1636226443
deleted file mode 100644
index ddf1340c..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1636226443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1636830943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1636830943
deleted file mode 100644
index e621edf4..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1636830943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1637435443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1637435443
deleted file mode 100644
index 8db32a7e..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1637435443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1638039943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1638039943
deleted file mode 100644
index 92ce9d37..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1638039943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1638644443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1638644443
deleted file mode 100644
index 68e1385f..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1638644443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1639248943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1639248943
deleted file mode 100644
index 0a4a34f4..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1639248943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1639853443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1639853443
deleted file mode 100644
index f41231b9..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1639853443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1640457943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1640457943
deleted file mode 100644
index 1ccd0bf8..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1640457943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1641062443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1641062443
deleted file mode 100644
index 1682390a..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1641062443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1641666943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1641666943
deleted file mode 100644
index 820be0de..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1641666943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1642271443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1642271443
deleted file mode 100644
index 775a21bf..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1642271443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1642875943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1642875943
deleted file mode 100644
index bc45ac1b..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1642875943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1643480443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1643480443
deleted file mode 100644
index 1594724d..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1643480443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1644084943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1644084943
deleted file mode 100644
index 77191330..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1644084943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1644689443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1644689443
deleted file mode 100644
index d881d7cb..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1644689443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1645293943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1645293943
deleted file mode 100644
index c2b33607..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1645293943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1645898443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1645898443
deleted file mode 100644
index bbebc198..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1645898443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1646502943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1646502943
deleted file mode 100644
index ec849ae2..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1646502943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1647107443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1647107443
deleted file mode 100644
index 9fa67082..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1647107443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1647711943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1647711943
deleted file mode 100644
index 4bddf10c..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1647711943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1648316443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1648316443
deleted file mode 100644
index f20c785d..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1648316443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1648920943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1648920943
deleted file mode 100644
index 89cfa2fa..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1648920943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1649525443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1649525443
deleted file mode 100644
index a2cdc311..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1649525443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1650129943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1650129943
deleted file mode 100644
index 9d028df0..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1650129943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1650734443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1650734443
deleted file mode 100644
index b704ed0f..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1650734443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1651338943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1651338943
deleted file mode 100644
index 5cba6be3..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1651338943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1651943443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1651943443
deleted file mode 100644
index c052e2da..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1651943443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1652547943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1652547943
deleted file mode 100644
index 5e9796d9..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1652547943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1653152443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1653152443
deleted file mode 100644
index 47132826..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1653152443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1653756943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1653756943
deleted file mode 100644
index c850ac55..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1653756943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1654361443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1654361443
deleted file mode 100644
index fcc92868..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1654361443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1654965943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1654965943
deleted file mode 100644
index 7828b2b5..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1654965943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1655570443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1655570443
deleted file mode 100644
index e787aa88..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1655570443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1656174943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1656174943
deleted file mode 100644
index fce4eb9b..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1656174943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1656779443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1656779443
deleted file mode 100644
index b411b18b..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1656779443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1657383943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1657383943
deleted file mode 100644
index 60079b13..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1657383943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1657988443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1657988443
deleted file mode 100644
index e52e35c1..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1657988443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1658592943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1658592943
deleted file mode 100644
index 59425e07..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_1/1658592943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1626554443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1626554443
deleted file mode 100644
index 2b0458b0..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1626554443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1627158943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1627158943
deleted file mode 100644
index ff26fa40..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1627158943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1627763443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1627763443
deleted file mode 100644
index c4c1fcdb..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1627763443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1628367943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1628367943
deleted file mode 100644
index 0c085113..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1628367943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1628972443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1628972443
deleted file mode 100644
index ac7ada27..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1628972443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1629576943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1629576943
deleted file mode 100644
index 5b89db7d..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1629576943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1630181443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1630181443
deleted file mode 100644
index 94693552..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1630181443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1630785943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1630785943
deleted file mode 100644
index 78c03b5a..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1630785943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1631390443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1631390443
deleted file mode 100644
index bd93e1ec..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1631390443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1631994943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1631994943
deleted file mode 100644
index 5bf7bc2d..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1631994943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1632599443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1632599443
deleted file mode 100644
index 4e0b5e0f..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1632599443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1633203943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1633203943
deleted file mode 100644
index 9826bb6b..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1633203943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1633808443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1633808443
deleted file mode 100644
index cb7c3234..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1633808443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1634412943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1634412943
deleted file mode 100644
index 41de9949..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1634412943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1635017443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1635017443
deleted file mode 100644
index 1ed3e2e7..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1635017443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1635621943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1635621943
deleted file mode 100644
index a5712db6..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1635621943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1636226443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1636226443
deleted file mode 100644
index 3c26311d..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1636226443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1636830943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1636830943
deleted file mode 100644
index ad2e4fe5..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1636830943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1637435443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1637435443
deleted file mode 100644
index 423be019..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1637435443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1638039943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1638039943
deleted file mode 100644
index 32b37b0f..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1638039943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1638644443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1638644443
deleted file mode 100644
index 807680bf..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1638644443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1639248943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1639248943
deleted file mode 100644
index a3b5a0e0..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1639248943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1639853443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1639853443
deleted file mode 100644
index 931a1b79..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1639853443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1640457943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1640457943
deleted file mode 100644
index b6ca34b5..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1640457943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1641062443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1641062443
deleted file mode 100644
index eb65de21..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1641062443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1641666943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1641666943
deleted file mode 100644
index a1674e27..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1641666943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1642271443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1642271443
deleted file mode 100644
index 4186fed2..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1642271443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1642875943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1642875943
deleted file mode 100644
index cc215d0f..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1642875943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1643480443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1643480443
deleted file mode 100644
index 4b4f7f82..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1643480443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1644084943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1644084943
deleted file mode 100644
index 0b15bd15..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1644084943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1644689443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1644689443
deleted file mode 100644
index ee6e55c0..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1644689443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1645293943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1645293943
deleted file mode 100644
index 3a30a716..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1645293943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1645898443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1645898443
deleted file mode 100644
index 15d356dc..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1645898443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1646502943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1646502943
deleted file mode 100644
index 47d0c3a4..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1646502943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1647107443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1647107443
deleted file mode 100644
index 6b111343..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1647107443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1647711943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1647711943
deleted file mode 100644
index 2b4cdaf6..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1647711943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1648316443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1648316443
deleted file mode 100644
index 0828bec8..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1648316443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1648920943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1648920943
deleted file mode 100644
index 23c07f08..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1648920943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1649525443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1649525443
deleted file mode 100644
index 2f45e330..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1649525443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1650129943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1650129943
deleted file mode 100644
index 1179c2b7..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1650129943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1650734443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1650734443
deleted file mode 100644
index 780c61d9..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1650734443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1651338943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1651338943
deleted file mode 100644
index c550ea6a..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1651338943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1651943443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1651943443
deleted file mode 100644
index 601ae6cc..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1651943443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1652547943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1652547943
deleted file mode 100644
index cffb0785..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1652547943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1653152443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1653152443
deleted file mode 100644
index 515f1183..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1653152443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1653756943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1653756943
deleted file mode 100644
index 533900fd..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1653756943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1654361443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1654361443
deleted file mode 100644
index 431bc19e..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1654361443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1654965943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1654965943
deleted file mode 100644
index a21336fa..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1654965943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1655570443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1655570443
deleted file mode 100644
index 43229366..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1655570443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1656174943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1656174943
deleted file mode 100644
index 1925ea41..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1656174943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1656779443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1656779443
deleted file mode 100644
index cd2e5e7b..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1656779443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1657383943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1657383943
deleted file mode 100644
index 028daf37..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1657383943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1657988443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1657988443
deleted file mode 100644
index 58d9e8f2..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1657988443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1658592943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1658592943
deleted file mode 100644
index abc9311b..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_5/1658592943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1626554443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1626554443
deleted file mode 100644
index 654311d0..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1626554443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1627158943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1627158943
deleted file mode 100644
index 4e28d3cf..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1627158943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1627763443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1627763443
deleted file mode 100644
index 65de1c88..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1627763443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1628367943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1628367943
deleted file mode 100644
index fbc5af8c..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1628367943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1628972443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1628972443
deleted file mode 100644
index bf78cee2..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1628972443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1629576943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1629576943
deleted file mode 100644
index 46e87d1d..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1629576943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1630181443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1630181443
deleted file mode 100644
index 2de0a06d..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1630181443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1630785943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1630785943
deleted file mode 100644
index f3adfb6b..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1630785943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1631390443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1631390443
deleted file mode 100644
index 09858250..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1631390443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1631994943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1631994943
deleted file mode 100644
index 8b5d1085..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1631994943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1632599443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1632599443
deleted file mode 100644
index 0f335ebd..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1632599443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1633203943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1633203943
deleted file mode 100644
index 1cc0dce1..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1633203943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1633808443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1633808443
deleted file mode 100644
index 4aed01bc..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1633808443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1634412943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1634412943
deleted file mode 100644
index de1118b1..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1634412943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1635017443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1635017443
deleted file mode 100644
index bf49a823..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1635017443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1635621943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1635621943
deleted file mode 100644
index 5143421a..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1635621943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1636226443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1636226443
deleted file mode 100644
index b3689451..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1636226443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1636830943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1636830943
deleted file mode 100644
index 033ad011..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1636830943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1637435443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1637435443
deleted file mode 100644
index 2a1805d7..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1637435443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1638039943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1638039943
deleted file mode 100644
index f517aa86..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1638039943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1638644443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1638644443
deleted file mode 100644
index 044e0d3e..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1638644443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1639248943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1639248943
deleted file mode 100644
index 6e3bdce3..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1639248943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1639853443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1639853443
deleted file mode 100644
index 57cc9645..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1639853443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1640457943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1640457943
deleted file mode 100644
index ecb4a203..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1640457943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1641062443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1641062443
deleted file mode 100644
index 8a2f3a75..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1641062443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1641666943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1641666943
deleted file mode 100644
index 1b261a6d..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1641666943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1642271443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1642271443
deleted file mode 100644
index 089b873e..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1642271443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1642875943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1642875943
deleted file mode 100644
index 4205bc9f..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1642875943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1643480443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1643480443
deleted file mode 100644
index c62e385f..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1643480443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1644084943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1644084943
deleted file mode 100644
index 0d1aba5a..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1644084943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1644689443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1644689443
deleted file mode 100644
index b29f0270..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1644689443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1645293943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1645293943
deleted file mode 100644
index 12941a40..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1645293943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1645898443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1645898443
deleted file mode 100644
index 5ecfa498..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1645898443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1646502943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1646502943
deleted file mode 100644
index 4ffff379..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1646502943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1647107443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1647107443
deleted file mode 100644
index 8aad7b5d..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1647107443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1647711943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1647711943
deleted file mode 100644
index 72e89b66..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1647711943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1648316443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1648316443
deleted file mode 100644
index 1456d349..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1648316443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1648920943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1648920943
deleted file mode 100644
index d405c337..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1648920943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1649525443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1649525443
deleted file mode 100644
index f1f93785..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1649525443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1650129943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1650129943
deleted file mode 100644
index bbfc50dc..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1650129943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1650734443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1650734443
deleted file mode 100644
index eb55424d..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1650734443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1651338943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1651338943
deleted file mode 100644
index ffe4fdf0..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1651338943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1651943443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1651943443
deleted file mode 100644
index d1208a2c..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1651943443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1652547943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1652547943
deleted file mode 100644
index 63b05ec2..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1652547943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1653152443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1653152443
deleted file mode 100644
index f81db926..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1653152443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1653756943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1653756943
deleted file mode 100644
index b6eb861f..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1653756943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1654361443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1654361443
deleted file mode 100644
index 23821fae..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1654361443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1654965943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1654965943
deleted file mode 100644
index 6d5198fa..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1654965943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1655570443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1655570443
deleted file mode 100644
index 311483d9..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1655570443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1656174943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1656174943
deleted file mode 100644
index 9a365d77..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1656174943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1656779443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1656779443
deleted file mode 100644
index b4d8d28b..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1656779443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1657383943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1657383943
deleted file mode 100644
index 781697b3..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1657383943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1657988443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1657988443
deleted file mode 100644
index 18420168..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1657988443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1658592943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1658592943
deleted file mode 100644
index 973eb566..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_1/1658592943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1626554443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1626554443
deleted file mode 100644
index 5c1e1a7d..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1626554443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1627158943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1627158943
deleted file mode 100644
index 96a0efd8..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1627158943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1627763443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1627763443
deleted file mode 100644
index eeea5d7b..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1627763443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1628367943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1628367943
deleted file mode 100644
index 22ea6727..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1628367943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1628972443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1628972443
deleted file mode 100644
index 9a271c2f..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1628972443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1629576943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1629576943
deleted file mode 100644
index 9b84ae3f..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1629576943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1630181443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1630181443
deleted file mode 100644
index d0ae6246..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1630181443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1630785943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1630785943
deleted file mode 100644
index 889130ad..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1630785943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1631390443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1631390443
deleted file mode 100644
index f41c8d04..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1631390443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1631994943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1631994943
deleted file mode 100644
index 0632bddc..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1631994943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1632599443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1632599443
deleted file mode 100644
index c13ae3d5..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1632599443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1633203943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1633203943
deleted file mode 100644
index f3d65edd..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1633203943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1633808443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1633808443
deleted file mode 100644
index 01190d88..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1633808443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1634412943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1634412943
deleted file mode 100644
index 0f1bd20f..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1634412943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1635017443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1635017443
deleted file mode 100644
index 109fa02c..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1635017443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1635621943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1635621943
deleted file mode 100644
index 575f616a..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1635621943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1636226443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1636226443
deleted file mode 100644
index a98b45f7..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1636226443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1636830943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1636830943
deleted file mode 100644
index c038715a..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1636830943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1637435443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1637435443
deleted file mode 100644
index 592e22eb..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1637435443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1638039943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1638039943
deleted file mode 100644
index 4609184d..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1638039943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1638644443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1638644443
deleted file mode 100644
index 32e65969..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1638644443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1639248943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1639248943
deleted file mode 100644
index e84bc300..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1639248943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1639853443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1639853443
deleted file mode 100644
index 0f4a3a0a..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1639853443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1640457943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1640457943
deleted file mode 100644
index 9981a143..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1640457943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1641062443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1641062443
deleted file mode 100644
index 7b2bbc6f..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1641062443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1641666943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1641666943
deleted file mode 100644
index 2ff58656..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1641666943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1642271443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1642271443
deleted file mode 100644
index cc3c144e..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1642271443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1642875943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1642875943
deleted file mode 100644
index 24c32e68..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1642875943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1643480443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1643480443
deleted file mode 100644
index 9a3d2e91..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1643480443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1644084943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1644084943
deleted file mode 100644
index bd002e8d..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1644084943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1644689443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1644689443
deleted file mode 100644
index 820c2362..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1644689443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1645293943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1645293943
deleted file mode 100644
index 3e7f6b71..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1645293943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1645898443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1645898443
deleted file mode 100644
index 63bdb271..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1645898443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1646502943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1646502943
deleted file mode 100644
index 9fd36ee5..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1646502943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1647107443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1647107443
deleted file mode 100644
index 140e200b..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1647107443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1647711943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1647711943
deleted file mode 100644
index 1118e221..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1647711943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1648316443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1648316443
deleted file mode 100644
index 5c1797ed..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1648316443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1648920943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1648920943
deleted file mode 100644
index fcc85a41..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1648920943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1649525443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1649525443
deleted file mode 100644
index a504ee57..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1649525443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1650129943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1650129943
deleted file mode 100644
index bcff9616..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1650129943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1650734443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1650734443
deleted file mode 100644
index ec6bbf71..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1650734443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1651338943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1651338943
deleted file mode 100644
index d6b25100..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1651338943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1651943443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1651943443
deleted file mode 100644
index 6b2abf18..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1651943443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1652547943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1652547943
deleted file mode 100644
index 8e2df783..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1652547943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1653152443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1653152443
deleted file mode 100644
index f3fdeec5..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1653152443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1653756943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1653756943
deleted file mode 100644
index b7db07db..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1653756943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1654361443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1654361443
deleted file mode 100644
index b354955d..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1654361443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1654965943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1654965943
deleted file mode 100644
index 079028cc..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1654965943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1655570443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1655570443
deleted file mode 100644
index 5fdea4a8..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1655570443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1656174943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1656174943
deleted file mode 100644
index 8eb804c2..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1656174943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1656779443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1656779443
deleted file mode 100644
index a42b189b..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1656779443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1657383943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1657383943
deleted file mode 100644
index e1327e45..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1657383943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1657988443 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1657988443
deleted file mode 100644
index d66e5e7e..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1657988443
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1658592943 b/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1658592943
deleted file mode 100644
index 71ab361d..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/crypto-rsa/coin_eur_ct_10/1658592943
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/exchange-offline/master.priv b/src/testing/test_merchant_api_home/taler/taler/exchange-offline/master.priv
deleted file mode 100644
index c20942d6..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/exchange-offline/master.priv
+++ /dev/null
@@ -1 +0,0 @@
-��k;d�_U�}�A.w�"!G��v_m�"_��
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/taler/exchange-offline/secm_tofus.pub b/src/testing/test_merchant_api_home/taler/taler/exchange-offline/secm_tofus.pub
deleted file mode 100644
index 56d1b939..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/exchange-offline/secm_tofus.pub
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/exchange-secmod-eddsa/keys/1686160442 b/src/testing/test_merchant_api_home/taler/taler/exchange-secmod-eddsa/keys/1686160442
deleted file mode 100644
index f708cb04..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/exchange-secmod-eddsa/keys/1686160442
+++ /dev/null
@@ -1 +0,0 @@
-��Ⱦƾ���H+O���H棁�����оrk
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/taler/exchange-secmod-eddsa/keys/1693417742 b/src/testing/test_merchant_api_home/taler/taler/exchange-secmod-eddsa/keys/1693417742
deleted file mode 100644
index a9f1e259..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/exchange-secmod-eddsa/keys/1693417742
+++ /dev/null
@@ -1 +0,0 @@
-�#[�ۖ��R�l�g���I����AӼ
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/taler/exchange-secmod-eddsa/keys/1700675042 b/src/testing/test_merchant_api_home/taler/taler/exchange-secmod-eddsa/keys/1700675042
deleted file mode 100644
index 435cecc9..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/exchange-secmod-eddsa/keys/1700675042
+++ /dev/null
@@ -1 +0,0 @@
-5�6`�5����}���D��O�o�z��!��r�{
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/taler/exchange-secmod-eddsa/keys/1707932342 b/src/testing/test_merchant_api_home/taler/taler/exchange-secmod-eddsa/keys/1707932342
deleted file mode 100644
index a36b9da2..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/exchange-secmod-eddsa/keys/1707932342
+++ /dev/null
@@ -1 +0,0 @@
-e��)`#���
-RR�k�bd���X����v��j�
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/taler/exchange-secmod-eddsa/keys/1715189642 b/src/testing/test_merchant_api_home/taler/taler/exchange-secmod-eddsa/keys/1715189642
deleted file mode 100644
index 774f9a84..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/exchange-secmod-eddsa/keys/1715189642
+++ /dev/null
@@ -1 +0,0 @@
-�=�Y���Բ�\��dx��w��z�^-!�U��
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/taler/exchange-secmod-eddsa/secmod-private-key b/src/testing/test_merchant_api_home/taler/taler/exchange-secmod-eddsa/secmod-private-key
deleted file mode 100644
index 72e0c852..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/exchange-secmod-eddsa/secmod-private-key
+++ /dev/null
@@ -1,2 +0,0 @@
-�����]T�L`
-�)��3���E����+�#G*	
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/taler/exchange/offline-keys/master.priv b/src/testing/test_merchant_api_home/taler/taler/exchange/offline-keys/master.priv
deleted file mode 100644
index c20942d6..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/exchange/offline-keys/master.priv
+++ /dev/null
@@ -1 +0,0 @@
-��k;d�_U�}�A.w�"!G��v_m�"_��
-\ No newline at end of file
diff --git a/src/testing/test_merchant_api_home/taler/taler/exchange/wirefees/x-taler-bank.fee b/src/testing/test_merchant_api_home/taler/taler/exchange/wirefees/x-taler-bank.fee
deleted file mode 100644
index 771ac455..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/exchange/wirefees/x-taler-bank.fee
+++ /dev/null
diff --git a/src/testing/test_merchant_api_home/taler/taler/merchant/merchant.priv b/src/testing/test_merchant_api_home/taler/taler/merchant/merchant.priv
deleted file mode 100644
index fd6e5f7f..00000000
--- a/src/testing/test_merchant_api_home/taler/taler/merchant/merchant.priv
+++ /dev/null
@@ -1 +0,0 @@
-��,�Y%�FF<��R��9ϳ5��v\���k4�6
-\ No newline at end of file
diff --git a/src/testing/test_template.conf b/src/testing/test_template.conf
index 202719d0..ce95e6b3 100644
--- a/src/testing/test_template.conf
+++ b/src/testing/test_template.conf
@@ -1,18 +1,16 @@
 [PATHS]
 TALER_TEST_HOME = test_merchant_api_home/
 
-[taler]
-CURRENCY = TESTKUDOS
-CURRENCY_ROUND_UNIT = TESTKUDOS:0.01
-
 [merchant-exchange-kudos]
 DISABLED = YES
 
 [exchange]
+CURRENCY = TESTKUDOS
+CURRENCY_ROUND_UNIT = TESTKUDOS:0.01
 AML_THRESHOLD = TESTKUDOS:1000000
 MAX_KEYS_CACHING = forever
 DB = postgres
-MASTER_PUBLIC_KEY = NKX42KSCQHDQK7CF1PC6X9DMQPXW6KHXKGD3DPQJMP32FKXSWYK0
+MASTER_PUBLIC_KEY = KHA6YSPRQV1ZFCF144SY8KJNR588XA8DA0F6510FKJW30DJFJNAG
 SERVE = tcp
 UNIXPATH = ${TALER_RUNTIME_DIR}/exchange.http
 UNIXPATH_MODE = 660
@@ -46,7 +44,7 @@ FORCE_AUDIT = YES
 
 [merchantdb-postgres]
 CONFIG = postgres:///talercheck
-SQL_DIR = $DATADIR/sql/merchant/
+SQL_DIR = ${DATADIR}sql/
 
 [bank]
 HTTP_PORT = 8082
@@ -106,7 +104,7 @@ WIRE_GATEWAY_URL = "http://localhost:8082/accounts/exchange/taler-wire-gateway/"
 [merchant-exchange-default]
 EXCHANGE_BASE_URL = http://localhost:8081/
 CURRENCY = TESTKUDOS
-MASTER_KEY = NKX42KSCQHDQK7CF1PC6X9DMQPXW6KHXKGD3DPQJMP32FKXSWYK0
+MASTER_KEY = KHA6YSPRQV1ZFCF144SY8KJNR588XA8DA0F6510FKJW30DJFJNAG
 
 [payments-generator]
 currency = TESTKUDOS
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index c06de792..269c9d00 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -7,7 +7,7 @@ if USE_COVERAGE
 endif
 
 
-pkgcfgdir = $(prefix)/share/sync/config.d/
+pkgcfgdir = $(prefix)/share/taler-merchant/config.d/
 
 pkgcfg_DATA = \
   merchant-paths.conf
diff --git a/src/util/merchant-paths.conf b/src/util/merchant-paths.conf
index b328a49f..d7f39fae 100644
--- a/src/util/merchant-paths.conf
+++ b/src/util/merchant-paths.conf
@@ -14,21 +14,16 @@ TALER_HOME = ${HOME:-${USERPROFILE}}
 # for how these should be used.
 
 # Persistent data storage
-TALER_DATA_HOME = ${XDG_DATA_HOME:-$TALER_HOME/.local/share}/sync/
+TALER_DATA_HOME = ${XDG_DATA_HOME:-$TALER_HOME/.local/share}/taler-merchant/
 
 # Configuration files
-TALER_CONFIG_HOME = ${XDG_CONFIG_HOME:-$TALER_HOME/.config}/sync/
+TALER_CONFIG_HOME = ${XDG_CONFIG_HOME:-$TALER_HOME/.config}/taler-merchant/
 
 # Cached data, no big deal if lost
-TALER_CACHE_HOME = ${XDG_CACHE_HOME:-$TALER_HOME/.cache}/sync/
+TALER_CACHE_HOME = ${XDG_CACHE_HOME:-$TALER_HOME/.cache}/taler-merchant/
 
 # Runtime data (i.e UNIX domain sockets, locks, always lost on system boot)
-TALER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/sync-runtime/
+TALER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/taler-merchant-runtime/
 
 # Directory to use for temporary files.
-TALER_TMP = ${TMPDIR:-${TMP:-/tmp}}/sync/
-
-# DEFAULTCONFIG = /etc/sync.conf
-# If 'DEFAULTCONFIG' is not defined, the current
-# configuration file is assumed to be the default,
-# which is what we want by default...
+TALER_TMP = ${TMPDIR:-${TMP:-/tmp}}/taler-merchant/
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index 322710f1..2dc5d01a 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -34,7 +34,7 @@
  */
 static const struct GNUNET_OS_ProjectData merchant_pd = {
   .libname = "libtalermerchantutil",
-  .project_dirname = "taler",
+  .project_dirname = "taler-merchant",
   .binary_name = "taler-merchant-httpd",
   .env_varname = "TALER_PREFIX",
   .base_config_varname = "TALER_BASE_CONFIG",
diff --git a/src/util/taler-merchant-config.c b/src/util/taler-merchant-config.c
index 150c9f06..8bdd27ff 100644
--- a/src/util/taler-merchant-config.c
+++ b/src/util/taler-merchant-config.c
@@ -70,4 +70,4 @@ main (int argc,
 }
 
 
-/* end of sync-config.c */
+/* end of taler-merchant-config.c */