51 files changed, 125 insertions, 115 deletions
diff --git a/.gitignore b/.gitignore
index e1af5ca6..0cb3e84e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,14 +30,14 @@ tags
 *.swp
 src/backend/taler-merchant-httpd
 src/merchant-tools/taler-merchant-dbinit
-src/lib/test_merchant_api
-src/lib/test_merchant_api_new
-src/lib/test_merchant_api_home/.local/share/taler/exchange/live-keys/
-src/lib/test_merchant_api_home/.local/share/taler/wirefees/
-src/lib/auditor.in
-src/lib/test_merchant_api_home/.local/share/taler/auditor/
-src/lib/test_merchant_api_home/.local/share/taler/auditors/
-src/lib/test_merchant_api_twisted
+src/testing/test_merchant_api
+src/testing/test_merchant_api_new
+src/testing/test_merchant_api_home/.local/share/taler/exchange/live-keys/
+src/testing/test_merchant_api_home/.local/share/taler/wirefees/
+src/testing/auditor.in
+src/testing/test_merchant_api_home/.local/share/taler/auditor/
+src/testing/test_merchant_api_home/.local/share/taler/auditors/
+src/testing/test_merchant_api_twisted
 taler_merchant_config.h
 taler_merchant_config.h.in
 doc/*
@@ -50,15 +50,15 @@ doc/version-*.texi
 !doc/*.js
 !doc/*.dot
 !doc/examples/
-src/lib/test_merchant_api_home/.local/share/taler/exchange/wirefees/
+src/testing/test_merchant_api_home/.local/share/taler/exchange/wirefees/
 src/merchant-tools/taler-merchant-generate-payments
 src/merchant-tools/mitm/taler-merchant-mitm
 src/merchant-tools/mitm/merchant-mitm.wsgi
 doxygen-doc/
 contrib/taler-merchant.tag
 src/merchant-tools/taler-merchant-tip-enable
-src/lib/reserve_dkey.priv
-src/lib/reserve_key.priv
+src/testing/reserve_dkey.priv
+src/testing/reserve_key.priv
 doc/version.texi
 src/merchant-tools/taler-merchant-generate-payments-alt
 src/merchant-tools/taler-merchant-generate-payments
diff --git a/configure.ac b/configure.ac
index bbd95f3c..d0a28bc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -341,5 +341,6 @@ src/include/Makefile
 src/backenddb/Makefile
 src/backend/Makefile
 src/lib/Makefile
+src/testing/Makefile
 ])
 AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index e58cf01a..984c780f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,3 @@
 # This Makefile is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
-SUBDIRS = include backenddb backend lib merchant-tools
+SUBDIRS = include backenddb backend lib testing merchant-tools
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 8489432c..44698874 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -7,17 +7,12 @@ if USE_COVERAGE
 endif
 
 lib_LTLIBRARIES = \
-  libtalermerchant.la \
-  libtalermerchanttesting.la
+  libtalermerchant.la
 
 libtalermerchant_la_LDFLAGS = \
   -version-info 2:0:0 \
   -no-undefined
 
-libtalermerchanttesting_la_LDFLAGS = \
-  -version-info 2:0:0 \
-  -no-undefined
-
 libtalermerchant_la_SOURCES = \
   merchant_api_common.c \
   merchant_api_delete_instance.c \
@@ -57,43 +52,6 @@ libtalermerchant_la_LIBADD = \
   -ljansson \
   $(XLIB)
 
-libtalermerchanttesting_la_SOURCES = \
-  testing_api_cmd_check_payment.c \
-  testing_api_cmd_config.c \
-  testing_api_cmd_history.c \
-  testing_api_cmd_pay.c \
-  testing_api_cmd_pay_abort.c \
-  testing_api_cmd_pay_abort_refund.c \
-  testing_api_cmd_poll_payment.c \
-  testing_api_cmd_proposal.c \
-  testing_api_cmd_proposal_lookup.c \
-  testing_api_cmd_refund_increase.c \
-  testing_api_cmd_refund_lookup.c \
-  testing_api_cmd_rewind.c \
-  testing_api_cmd_tip_authorize.c \
-  testing_api_cmd_tip_pickup.c \
-  testing_api_cmd_tip_query.c \
-  testing_api_cmd_track_transaction.c \
-  testing_api_cmd_track_transfer.c \
-  testing_api_helpers.c \
-  testing_api_trait_merchant_sig.c \
-  testing_api_trait_string.c \
-  testing_api_trait_hash.c \
-  testing_api_trait_planchet.c \
-  testing_api_trait_refund_entry.c
-
-libtalermerchanttesting_la_LIBADD = \
-  libtalermerchant.la \
-  -ltalerexchange \
-  -ltalerjson \
-  -ltalerutil \
-  -lgnunetcurl \
-  -lgnunetjson \
-  -lgnunetutil \
-  -ljansson \
-  -ltalertesting \
-  $(XLIB)
-
 if HAVE_LIBCURL
 libtalermerchant_la_LIBADD += -lcurl
 else
@@ -101,63 +59,3 @@ if HAVE_LIBGNURL
 libtalermerchant_la_LIBADD += -lgnurl
 endif
 endif
-
-if HAVE_TALERFAKEBANK
-check_PROGRAMS = \
-  test_merchant_api
-
-if HAVE_TWISTER
-check_PROGRAMS += test_merchant_api_twisted
-endif
-
-endif
-
-TESTS = \
-  $(check_PROGRAMS)
-
-test_merchant_api_twisted_SOURCES = \
-  test_merchant_api_twisted.c
-test_merchant_api_twisted_LDADD = \
-  $(top_srcdir)/src/backenddb/libtalermerchantdb.la \
-  libtalermerchant.la \
-  $(LIBGCRYPT_LIBS) \
-  -ltalertesting \
-  -ltalermerchanttesting \
-  -ltalertwistertesting \
-  -ltalerfakebank \
-  -ltalerbank \
-  -ltalerexchange \
-  -ltalerjson \
-  -ltalerutil \
-  -lgnunetjson \
-  -lgnunetcurl \
-  -lgnunetutil \
-  -ljansson \
-  -ltalertwister
-
-test_merchant_api_SOURCES = \
-  test_merchant_api.c
-test_merchant_api_LDADD = \
-  $(top_srcdir)/src/backenddb/libtalermerchantdb.la \
-  libtalermerchant.la \
-  $(LIBGCRYPT_LIBS) \
-  -ltalertesting \
-  -ltalermerchanttesting \
-  -ltalerfakebank \
-  -ltalerbank \
-  -ltalerexchange \
-  -ltalerjson \
-  -ltalerutil \
-  -lgnunetjson \
-  -lgnunetcurl \
-  -lgnunetutil \
-  -ljansson
-
-EXTRA_DIST = \
-  test_merchant_api.conf \
-  test_merchant_api_twisted.conf \
-  test_merchant_api_proxy_merchant.conf \
-  test_merchant_api_proxy_exchange.conf \
-  test_merchant_api_home/.local/share/taler/exchange/offline-keys/master.priv \
-  test_merchant_api_home/.config/taler/exchange/account-2.json \
-  test_merchant.priv
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
new file mode 100644
index 00000000..48053c9b
--- /dev/null
+++ b/src/testing/Makefile.am
@@ -0,0 +1,111 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/backend
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+  XLIB = -lgcov
+endif
+
+lib_LTLIBRARIES = \
+  libtalermerchanttesting.la
+
+libtalermerchanttesting_la_LDFLAGS = \
+  -version-info 2:0:0 \
+  -no-undefined
+
+libtalermerchanttesting_la_SOURCES = \
+  testing_api_cmd_check_payment.c \
+  testing_api_cmd_config.c \
+  testing_api_cmd_history.c \
+  testing_api_cmd_pay.c \
+  testing_api_cmd_pay_abort.c \
+  testing_api_cmd_pay_abort_refund.c \
+  testing_api_cmd_poll_payment.c \
+  testing_api_cmd_proposal.c \
+  testing_api_cmd_proposal_lookup.c \
+  testing_api_cmd_refund_increase.c \
+  testing_api_cmd_refund_lookup.c \
+  testing_api_cmd_rewind.c \
+  testing_api_cmd_tip_authorize.c \
+  testing_api_cmd_tip_pickup.c \
+  testing_api_cmd_tip_query.c \
+  testing_api_cmd_track_transaction.c \
+  testing_api_cmd_track_transfer.c \
+  testing_api_helpers.c \
+  testing_api_trait_merchant_sig.c \
+  testing_api_trait_string.c \
+  testing_api_trait_hash.c \
+  testing_api_trait_planchet.c \
+  testing_api_trait_refund_entry.c
+
+libtalermerchanttesting_la_LIBADD = \
+  libtalermerchant.la \
+  -ltalerexchange \
+  -ltalerjson \
+  -ltalerutil \
+  -lgnunetcurl \
+  -lgnunetjson \
+  -lgnunetutil \
+  -ljansson \
+  -ltalertesting \
+  $(XLIB)
+
+
+if HAVE_TALERFAKEBANK
+check_PROGRAMS = \
+  test_merchant_api
+
+if HAVE_TWISTER
+check_PROGRAMS += test_merchant_api_twisted
+endif
+endif
+
+TESTS = \
+  $(check_PROGRAMS)
+
+test_merchant_api_twisted_SOURCES = \
+  test_merchant_api_twisted.c
+test_merchant_api_twisted_LDADD = \
+  $(top_srcdir)/src/backenddb/libtalermerchantdb.la \
+  libtalermerchant.la \
+  $(LIBGCRYPT_LIBS) \
+  -ltalertesting \
+  -ltalermerchanttesting \
+  -ltalertwistertesting \
+  -ltalerfakebank \
+  -ltalerbank \
+  -ltalerexchange \
+  -ltalerjson \
+  -ltalerutil \
+  -lgnunetjson \
+  -lgnunetcurl \
+  -lgnunetutil \
+  -ljansson \
+  -ltalertwister
+
+test_merchant_api_SOURCES = \
+  test_merchant_api.c
+test_merchant_api_LDADD = \
+  $(top_srcdir)/src/backenddb/libtalermerchantdb.la \
+  libtalermerchant.la \
+  $(LIBGCRYPT_LIBS) \
+  -ltalertesting \
+  -ltalermerchanttesting \
+  -ltalerfakebank \
+  -ltalerbank \
+  -ltalerexchange \
+  -ltalerjson \
+  -ltalerutil \
+  -lgnunetjson \
+  -lgnunetcurl \
+  -lgnunetutil \
+  -ljansson
+
+EXTRA_DIST = \
+  test_merchant_api.conf \
+  test_merchant_api_twisted.conf \
+  test_merchant_api_proxy_merchant.conf \
+  test_merchant_api_proxy_exchange.conf \
+  test_merchant_api_home/.local/share/taler/exchange/offline-keys/master.priv \
+  test_merchant_api_home/.config/taler/exchange/account-2.json \
+  test_merchant.priv
diff --git a/src/lib/reserve_dtip.priv b/src/testing/reserve_dtip.priv
index d7fae398..d7fae398 100644
--- a/src/lib/reserve_dtip.priv
+++ b/src/testing/reserve_dtip.priv
diff --git a/src/lib/reserve_tip.priv b/src/testing/reserve_tip.priv
index 3cd75052..3cd75052 100644
--- a/src/lib/reserve_tip.priv
+++ b/src/testing/reserve_tip.priv
diff --git a/src/lib/test_merchant.priv b/src/testing/test_merchant.priv
index 9c18c358..9c18c358 100644
--- a/src/lib/test_merchant.priv
+++ b/src/testing/test_merchant.priv
diff --git a/src/lib/test_merchant_api.c b/src/testing/test_merchant_api.c
index 3a203fce..3a203fce 100644
--- a/src/lib/test_merchant_api.c
+++ b/src/testing/test_merchant_api.c
diff --git a/src/lib/test_merchant_api.conf b/src/testing/test_merchant_api.conf
index 955f5c69..955f5c69 100644
--- a/src/lib/test_merchant_api.conf
+++ b/src/testing/test_merchant_api.conf
diff --git a/src/lib/test_merchant_api_home/.config/taler/exchange/account-2.json b/src/testing/test_merchant_api_home/.config/taler/exchange/account-2.json
index b84273e8..b84273e8 100644
--- a/src/lib/test_merchant_api_home/.config/taler/exchange/account-2.json
+++ b/src/testing/test_merchant_api_home/.config/taler/exchange/account-2.json
diff --git a/src/lib/test_merchant_api_home/.config/taler/merchant/account-3.json b/src/testing/test_merchant_api_home/.config/taler/merchant/account-3.json
index 70e8bbb6..70e8bbb6 100644
--- a/src/lib/test_merchant_api_home/.config/taler/merchant/account-3.json
+++ b/src/testing/test_merchant_api_home/.config/taler/merchant/account-3.json
diff --git a/src/lib/test_merchant_api_home/.config/taler/merchant/default.priv b/src/testing/test_merchant_api_home/.config/taler/merchant/default.priv
index 8299ad28..8299ad28 100644
--- a/src/lib/test_merchant_api_home/.config/taler/merchant/default.priv
+++ b/src/testing/test_merchant_api_home/.config/taler/merchant/default.priv
diff --git a/src/lib/test_merchant_api_home/.config/taler/merchant/dtip.priv b/src/testing/test_merchant_api_home/.config/taler/merchant/dtip.priv
index ff3842bb..ff3842bb 100644
--- a/src/lib/test_merchant_api_home/.config/taler/merchant/dtip.priv
+++ b/src/testing/test_merchant_api_home/.config/taler/merchant/dtip.priv
diff --git a/src/lib/test_merchant_api_home/.config/taler/merchant/nulltip.priv b/src/testing/test_merchant_api_home/.config/taler/merchant/nulltip.priv
index db695e5c..db695e5c 100644
--- a/src/lib/test_merchant_api_home/.config/taler/merchant/nulltip.priv
+++ b/src/testing/test_merchant_api_home/.config/taler/merchant/nulltip.priv
diff --git a/src/lib/test_merchant_api_home/.config/taler/merchant/reserve/dtip.priv b/src/testing/test_merchant_api_home/.config/taler/merchant/reserve/dtip.priv
index c586db18..c586db18 100644
--- a/src/lib/test_merchant_api_home/.config/taler/merchant/reserve/dtip.priv
+++ b/src/testing/test_merchant_api_home/.config/taler/merchant/reserve/dtip.priv
diff --git a/src/lib/test_merchant_api_home/.config/taler/merchant/reserve/nulltip.priv b/src/testing/test_merchant_api_home/.config/taler/merchant/reserve/nulltip.priv
index edf062ea..edf062ea 100644
--- a/src/lib/test_merchant_api_home/.config/taler/merchant/reserve/nulltip.priv
+++ b/src/testing/test_merchant_api_home/.config/taler/merchant/reserve/nulltip.priv
diff --git a/src/lib/test_merchant_api_home/.config/taler/merchant/reserve/tip.priv b/src/testing/test_merchant_api_home/.config/taler/merchant/reserve/tip.priv
index 5ee3bce0..5ee3bce0 100644
--- a/src/lib/test_merchant_api_home/.config/taler/merchant/reserve/tip.priv
+++ b/src/testing/test_merchant_api_home/.config/taler/merchant/reserve/tip.priv
diff --git a/src/lib/test_merchant_api_home/.config/taler/merchant/tip.priv b/src/testing/test_merchant_api_home/.config/taler/merchant/tip.priv
index ba920729..ba920729 100644
--- a/src/lib/test_merchant_api_home/.config/taler/merchant/tip.priv
+++ b/src/testing/test_merchant_api_home/.config/taler/merchant/tip.priv
diff --git a/src/lib/test_merchant_api_home/.config/taler/merchant/tor.priv b/src/testing/test_merchant_api_home/.config/taler/merchant/tor.priv
index 5d94c717..5d94c717 100644
--- a/src/lib/test_merchant_api_home/.config/taler/merchant/tor.priv
+++ b/src/testing/test_merchant_api_home/.config/taler/merchant/tor.priv
diff --git a/src/lib/test_merchant_api_home/.config/taler/test.json b/src/testing/test_merchant_api_home/.config/taler/test.json
index 74cdc92b..74cdc92b 100644
--- a/src/lib/test_merchant_api_home/.config/taler/test.json
+++ b/src/testing/test_merchant_api_home/.config/taler/test.json
diff --git a/src/lib/test_merchant_api_home/.local/share/taler/exchange/offline-keys/master.priv b/src/testing/test_merchant_api_home/.local/share/taler/exchange/offline-keys/master.priv
index c20942d6..c20942d6 100644
--- a/src/lib/test_merchant_api_home/.local/share/taler/exchange/offline-keys/master.priv
+++ b/src/testing/test_merchant_api_home/.local/share/taler/exchange/offline-keys/master.priv
diff --git a/src/lib/test_merchant_api_home/.local/share/taler/merchant/merchant.priv b/src/testing/test_merchant_api_home/.local/share/taler/merchant/merchant.priv
index fd6e5f7f..fd6e5f7f 100644
--- a/src/lib/test_merchant_api_home/.local/share/taler/merchant/merchant.priv
+++ b/src/testing/test_merchant_api_home/.local/share/taler/merchant/merchant.priv
diff --git a/src/lib/test_merchant_api_proxy_exchange.conf b/src/testing/test_merchant_api_proxy_exchange.conf
index fb4a67c7..fb4a67c7 100644
--- a/src/lib/test_merchant_api_proxy_exchange.conf
+++ b/src/testing/test_merchant_api_proxy_exchange.conf
diff --git a/src/lib/test_merchant_api_proxy_merchant.conf b/src/testing/test_merchant_api_proxy_merchant.conf
index 9ef38a06..9ef38a06 100644
--- a/src/lib/test_merchant_api_proxy_merchant.conf
+++ b/src/testing/test_merchant_api_proxy_merchant.conf
diff --git a/src/lib/test_merchant_api_twisted.c b/src/testing/test_merchant_api_twisted.c
index e49e2380..e49e2380 100644
--- a/src/lib/test_merchant_api_twisted.c
+++ b/src/testing/test_merchant_api_twisted.c
diff --git a/src/lib/test_merchant_api_twisted.conf b/src/testing/test_merchant_api_twisted.conf
index 5cc28b48..5cc28b48 100644
--- a/src/lib/test_merchant_api_twisted.conf
+++ b/src/testing/test_merchant_api_twisted.conf
diff --git a/src/lib/testing_api_cmd_check_payment.c b/src/testing/testing_api_cmd_check_payment.c
index 8d59129e..8d59129e 100644
--- a/src/lib/testing_api_cmd_check_payment.c
+++ b/src/testing/testing_api_cmd_check_payment.c
diff --git a/src/lib/testing_api_cmd_config.c b/src/testing/testing_api_cmd_config.c
index 3e638697..3e638697 100644
--- a/src/lib/testing_api_cmd_config.c
+++ b/src/testing/testing_api_cmd_config.c
diff --git a/src/lib/testing_api_cmd_history.c b/src/testing/testing_api_cmd_history.c
index dabbf3cc..dabbf3cc 100644
--- a/src/lib/testing_api_cmd_history.c
+++ b/src/testing/testing_api_cmd_history.c
diff --git a/src/lib/testing_api_cmd_pay.c b/src/testing/testing_api_cmd_pay.c
index 02bdf408..02bdf408 100644
--- a/src/lib/testing_api_cmd_pay.c
+++ b/src/testing/testing_api_cmd_pay.c
diff --git a/src/lib/testing_api_cmd_pay_abort.c b/src/testing/testing_api_cmd_pay_abort.c
index 5911dd1d..5911dd1d 100644
--- a/src/lib/testing_api_cmd_pay_abort.c
+++ b/src/testing/testing_api_cmd_pay_abort.c
diff --git a/src/lib/testing_api_cmd_pay_abort_refund.c b/src/testing/testing_api_cmd_pay_abort_refund.c
index 918ad758..918ad758 100644
--- a/src/lib/testing_api_cmd_pay_abort_refund.c
+++ b/src/testing/testing_api_cmd_pay_abort_refund.c
diff --git a/src/lib/testing_api_cmd_poll_payment.c b/src/testing/testing_api_cmd_poll_payment.c
index 9575e32e..9575e32e 100644
--- a/src/lib/testing_api_cmd_poll_payment.c
+++ b/src/testing/testing_api_cmd_poll_payment.c
diff --git a/src/lib/testing_api_cmd_proposal.c b/src/testing/testing_api_cmd_proposal.c
index fd53db2a..fd53db2a 100644
--- a/src/lib/testing_api_cmd_proposal.c
+++ b/src/testing/testing_api_cmd_proposal.c
diff --git a/src/lib/testing_api_cmd_proposal_lookup.c b/src/testing/testing_api_cmd_proposal_lookup.c
index 1ea0c0cb..1ea0c0cb 100644
--- a/src/lib/testing_api_cmd_proposal_lookup.c
+++ b/src/testing/testing_api_cmd_proposal_lookup.c
diff --git a/src/lib/testing_api_cmd_refund_increase.c b/src/testing/testing_api_cmd_refund_increase.c
index da2c70b2..da2c70b2 100644
--- a/src/lib/testing_api_cmd_refund_increase.c
+++ b/src/testing/testing_api_cmd_refund_increase.c
diff --git a/src/lib/testing_api_cmd_refund_lookup.c b/src/testing/testing_api_cmd_refund_lookup.c
index 7db933a4..7db933a4 100644
--- a/src/lib/testing_api_cmd_refund_lookup.c
+++ b/src/testing/testing_api_cmd_refund_lookup.c
diff --git a/src/lib/testing_api_cmd_rewind.c b/src/testing/testing_api_cmd_rewind.c
index 2e43b75f..2e43b75f 100644
--- a/src/lib/testing_api_cmd_rewind.c
+++ b/src/testing/testing_api_cmd_rewind.c
diff --git a/src/lib/testing_api_cmd_tip_authorize.c b/src/testing/testing_api_cmd_tip_authorize.c
index 928ec04d..928ec04d 100644
--- a/src/lib/testing_api_cmd_tip_authorize.c
+++ b/src/testing/testing_api_cmd_tip_authorize.c
diff --git a/src/lib/testing_api_cmd_tip_pickup.c b/src/testing/testing_api_cmd_tip_pickup.c
index dd963520..dd963520 100644
--- a/src/lib/testing_api_cmd_tip_pickup.c
+++ b/src/testing/testing_api_cmd_tip_pickup.c
diff --git a/src/lib/testing_api_cmd_tip_query.c b/src/testing/testing_api_cmd_tip_query.c
index 70e59c12..70e59c12 100644
--- a/src/lib/testing_api_cmd_tip_query.c
+++ b/src/testing/testing_api_cmd_tip_query.c
diff --git a/src/lib/testing_api_cmd_track_transaction.c b/src/testing/testing_api_cmd_track_transaction.c
index c9450500..c9450500 100644
--- a/src/lib/testing_api_cmd_track_transaction.c
+++ b/src/testing/testing_api_cmd_track_transaction.c
diff --git a/src/lib/testing_api_cmd_track_transfer.c b/src/testing/testing_api_cmd_track_transfer.c
index b0dfc478..b0dfc478 100644
--- a/src/lib/testing_api_cmd_track_transfer.c
+++ b/src/testing/testing_api_cmd_track_transfer.c
diff --git a/src/lib/testing_api_helpers.c b/src/testing/testing_api_helpers.c
index 326bfcb8..326bfcb8 100644
--- a/src/lib/testing_api_helpers.c
+++ b/src/testing/testing_api_helpers.c
diff --git a/src/lib/testing_api_trait_hash.c b/src/testing/testing_api_trait_hash.c
index 08e50274..08e50274 100644
--- a/src/lib/testing_api_trait_hash.c
+++ b/src/testing/testing_api_trait_hash.c
diff --git a/src/lib/testing_api_trait_merchant_sig.c b/src/testing/testing_api_trait_merchant_sig.c
index 5a2f5ebb..5a2f5ebb 100644
--- a/src/lib/testing_api_trait_merchant_sig.c
+++ b/src/testing/testing_api_trait_merchant_sig.c
diff --git a/src/lib/testing_api_trait_planchet.c b/src/testing/testing_api_trait_planchet.c
index 165ce818..165ce818 100644
--- a/src/lib/testing_api_trait_planchet.c
+++ b/src/testing/testing_api_trait_planchet.c
diff --git a/src/lib/testing_api_trait_refund_entry.c b/src/testing/testing_api_trait_refund_entry.c
index 6a27cfbd..6a27cfbd 100644
--- a/src/lib/testing_api_trait_refund_entry.c
+++ b/src/testing/testing_api_trait_refund_entry.c
diff --git a/src/lib/testing_api_trait_string.c b/src/testing/testing_api_trait_string.c
index 30db2f6a..30db2f6a 100644
--- a/src/lib/testing_api_trait_string.c
+++ b/src/testing/testing_api_trait_string.c
diff --git a/src/lib/tor_merchant.priv b/src/testing/tor_merchant.priv
index facd4dfa..facd4dfa 100644
--- a/src/lib/tor_merchant.priv
+++ b/src/testing/tor_merchant.priv