8 files changed, 17 insertions, 11 deletions
diff --git a/src/testing/test-taler-exchange-aggregator-postgres.conf b/src/testing/test-taler-exchange-aggregator-postgres.conf
index eb641a265..7cb2fba52 100644
--- a/src/testing/test-taler-exchange-aggregator-postgres.conf
+++ b/src/testing/test-taler-exchange-aggregator-postgres.conf
@@ -17,9 +17,10 @@ DURATION = 14 days
 # Currency supported by the exchange (can only be one)
 CURRENCY = EUR
 CURRENCY_ROUND_UNIT = EUR:0.01
-AML_THRESHOLD = EUR:1000000
 
 [exchange]
+AML_THRESHOLD = EUR:1000000
+
 # The DB plugin to use
 DB = postgres
 
diff --git a/src/testing/test-taler-exchange-wirewatch-postgres.conf b/src/testing/test-taler-exchange-wirewatch-postgres.conf
index 079de5ab9..9c755c6e0 100644
--- a/src/testing/test-taler-exchange-wirewatch-postgres.conf
+++ b/src/testing/test-taler-exchange-wirewatch-postgres.conf
@@ -17,9 +17,10 @@ DURATION = 14 days
 # Currency supported by the exchange (can only be one)
 CURRENCY = EUR
 CURRENCY_ROUND_UNIT = EUR:0.01
-AML_THRESHOLD = EUR:1000000
 
 [exchange]
+AML_THRESHOLD = EUR:1000000
+
 # The DB plugin to use
 DB = postgres
 
diff --git a/src/testing/test_auditor_api-cs.conf b/src/testing/test_auditor_api-cs.conf
index 6c9a1e648..f0095e383 100644
--- a/src/testing/test_auditor_api-cs.conf
+++ b/src/testing/test_auditor_api-cs.conf
@@ -21,7 +21,6 @@ DURATION = 14 days
 # Currency supported by the exchange (can only be one)
 CURRENCY = EUR
 CURRENCY_ROUND_UNIT = EUR:0.01
-AML_THRESHOLD = EUR:1000000
 
 [auditor]
 BASE_URL = "http://localhost:8083/"
@@ -32,6 +31,7 @@ PUBLIC_KEY = XNYZPJJ6YPSQ4C6QPW120ACG9B5E5GBTTSYWXDMDB6G4X74TDBPG
 TINY_AMOUNT = EUR:0.01
 
 [exchange]
+AML_THRESHOLD = EUR:1000000
 
 # HTTP port the exchange listens to
 PORT = 8081
diff --git a/src/testing/test_auditor_api-rsa.conf b/src/testing/test_auditor_api-rsa.conf
index f3e66763b..dddbf0918 100644
--- a/src/testing/test_auditor_api-rsa.conf
+++ b/src/testing/test_auditor_api-rsa.conf
@@ -21,7 +21,6 @@ DURATION = 14 days
 # Currency supported by the exchange (can only be one)
 CURRENCY = EUR
 CURRENCY_ROUND_UNIT = EUR:0.01
-AML_THRESHOLD = EUR:1000000
 
 [auditor]
 BASE_URL = "http://localhost:8083/"
@@ -33,6 +32,7 @@ PUBLIC_KEY = XNYZPJJ6YPSQ4C6QPW120ACG9B5E5GBTTSYWXDMDB6G4X74TDBPG
 TINY_AMOUNT = EUR:0.01
 
 [exchange]
+AML_THRESHOLD = EUR:1000000
 
 # HTTP port the exchange listens to
 PORT = 8081
diff --git a/src/testing/test_exchange_api.conf b/src/testing/test_exchange_api.conf
index 2224afd91..bf73d00aa 100644
--- a/src/testing/test_exchange_api.conf
+++ b/src/testing/test_exchange_api.conf
@@ -20,7 +20,6 @@ DURATION = 14 days
 # Currency supported by the exchange (can only be one)
 CURRENCY = EUR
 CURRENCY_ROUND_UNIT = EUR:0.01
-AML_THRESHOLD = EUR:1000000
 
 [auditor]
 BASE_URL = "http://localhost:8083/"
@@ -35,8 +34,8 @@ LOGIC = oauth2
 USER_TYPE = INDIVIDUAL
 PROVIDED_CHECKS = DUMMY
 KYC_OAUTH2_VALIDITY = forever
-KYC_OAUTH2_AUTH_URL = http://localhost:6666/oauth/v2/token
-KYC_OAUTH2_LOGIN_URL = http://localhost:6666/oauth/v2/login
+KYC_OAUTH2_TOKEN_URL = http://localhost:6666/oauth/v2/token
+KYC_OAUTH2_AUTHORIZE_URL = http://localhost:6666/oauth/v2/login
 KYC_OAUTH2_INFO_URL = http://localhost:6666/api/user/me
 KYC_OAUTH2_CLIENT_ID = taler-exchange
 KYC_OAUTH2_CLIENT_SECRET = exchange-secret
@@ -54,6 +53,8 @@ TIMEFRAME = 1d
 TERMS_ETAG = 0
 PRIVACY_ETAG = 0
 
+AML_THRESHOLD = EUR:1000000
+
 # HTTP port the exchange listens to
 PORT = 8081
 
diff --git a/src/testing/test_exchange_api_keys_cherry_picking.conf b/src/testing/test_exchange_api_keys_cherry_picking.conf
index 55e0c625f..5637bb66f 100644
--- a/src/testing/test_exchange_api_keys_cherry_picking.conf
+++ b/src/testing/test_exchange_api_keys_cherry_picking.conf
@@ -17,7 +17,6 @@ TALER_CACHE_HOME = $TALER_HOME/.cache/taler/
 [taler]
 # Currency supported by the exchange (can only be one)
 CURRENCY = EUR
-AML_THRESHOLD = EUR:1000000
 
 [taler-exchange-secmod-eddsa]
 OVERLAP_DURATION = 1 s
@@ -32,6 +31,9 @@ BASE_URL = "http://localhost:8083/"
 PORT = 8083
 
 [exchange]
+
+AML_THRESHOLD = EUR:1000000
+
 # HTTP port the exchange listens to
 PORT = 8081
 
diff --git a/src/testing/test_kyc_api.conf b/src/testing/test_kyc_api.conf
index 9c0b43635..abc7f3e4e 100644
--- a/src/testing/test_kyc_api.conf
+++ b/src/testing/test_kyc_api.conf
@@ -21,7 +21,6 @@ DURATION = 14 days
 # Currency supported by the exchange (can only be one)
 CURRENCY = EUR
 CURRENCY_ROUND_UNIT = EUR:0.01
-AML_THRESHOLD = EUR:1000000
 
 [auditor]
 BASE_URL = "http://localhost:8083/"
@@ -32,6 +31,7 @@ PORT = 8083
 TINY_AMOUNT = EUR:0.01
 
 [exchange]
+AML_THRESHOLD = EUR:1000000
 
 # HTTP port the exchange listens to
 PORT = 8081
@@ -53,8 +53,8 @@ LOGIC = oauth2
 USER_TYPE = INDIVIDUAL
 PROVIDED_CHECKS = DUMMY
 KYC_OAUTH2_VALIDITY = forever
-KYC_OAUTH2_AUTH_URL = http://localhost:6666/oauth/v2/token
-KYC_OAUTH2_LOGIN_URL = http://localhost:6666/oauth/v2/login
+KYC_OAUTH2_TOKEN_URL = http://localhost:6666/oauth/v2/token
+KYC_OAUTH2_AUTHORIZE_URL = http://localhost:6666/oauth/v2/login
 KYC_OAUTH2_INFO_URL = http://localhost:6666/api/user/me
 KYC_OAUTH2_CLIENT_ID = taler-exchange
 KYC_OAUTH2_CLIENT_SECRET = exchange-secret
diff --git a/src/testing/testing_api_cmd_nexus_fetch_transactions.c b/src/testing/testing_api_cmd_nexus_fetch_transactions.c
index ff1497f3f..fc59444de 100644
--- a/src/testing/testing_api_cmd_nexus_fetch_transactions.c
+++ b/src/testing/testing_api_cmd_nexus_fetch_transactions.c
@@ -81,6 +81,7 @@ nft_run (void *cls,
                                "--header=Content-Type:application/json",
                                "--auth-no-challenge",
                                "--output-file=/dev/null",
+                               "--output-document=/dev/null",
                                "--post-data={\"level\":\"all\",\"rangeType\":\"latest\"}",
                                user,
                                pass,