240 files changed, 12795 insertions, 15474 deletions

diff --git a/NEWS b/NEWS
index 9dad3ccab..b8b1b37f9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+v0.21.2:
+  - Reworked TESTING API
+  - Disabled many old-style tests
+
 v0.21.1:
   - Communicator and connectivity bugfixes
 
diff --git a/bootstrap b/bootstrap
index d5bf30af4..fb47649a7 100755
--- a/bootstrap
+++ b/bootstrap
@@ -136,7 +136,10 @@ main()
       check_libtool
     fi
     pogen
-    install_hooks
+    if test -d .git
+    then
+        install_hooks
+    fi
 }
 
 main "$@"
diff --git a/configure.ac b/configure.ac
index 316257f97..0e338c242 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1235,6 +1235,7 @@ src/lib/gnsrecord/Makefile
 src/lib/json/Makefile
 src/lib/pq/Makefile
 src/lib/sq/Makefile
+src/lib/testing/Makefile
 src/plugin/Makefile
 src/plugin/block/Makefile
 src/plugin/datacache/Makefile
@@ -1303,7 +1304,7 @@ src/service/setu/Makefile
 src/service/setu/setu.conf
 src/service/statistics/Makefile
 src/service/statistics/statistics.conf
-src/service/testing/Makefile
+src/service/testbed/Makefile
 src/service/topology/Makefile
 src/service/transport/Makefile
 src/service/transport/transport.conf
diff --git a/contrib/gana b/contrib/gana
-Subproject cc2d9bdb3e90af5ddebf964e3da492c04a30741
+Subproject cbe19e87d6da5f16e71573c85a717e986a43da6
diff --git a/debian/changelog b/debian/changelog
index 2a318e11b..b8b403baf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gnunet (0.21.1-2) unstable; urgency=low
+
+  * Package for GNU Taler v0.11.0 release.
+
+ -- Christian Grothoff <grothoff@gnu.org>  Wed, 15 May 2024 13:50:12 +0100
+
 gnunet (0.21.1-1) unstable; urgency=low
 
   * Package for GNU Taler v0.10.0 release.
diff --git a/meson.build b/meson.build
index 3547d9cfa..e0ed7543f 100644
--- a/meson.build
+++ b/meson.build
@@ -349,13 +349,6 @@ endif
 
 add_project_arguments('-DNEED_LIBGCRYPT_VERSION="1.6.0"', language : 'c')
 
-if cc.check_header('sys/time.h')
-  add_project_arguments('-DHAVE_SYS_TIME_H', language : 'c')
-endif
-if cc.check_header('sys/param.h')
-  add_project_arguments('-DHAVE_SYS_PARAM_H', language : 'c')
-endif
-
 # NSS
 have_nss = false
 if cc.check_header('nss.h')
@@ -390,9 +383,6 @@ if not tun_found and cc.check_header('net/tun/if_tun.h')
   endif
 endif
 
-
-
-
 # NSS
 if cc.check_header('nss.h')
   add_project_arguments('-DHAVE_GLIBCNSS', language : 'c')
@@ -422,30 +412,52 @@ endif
 if cc.has_function('getloadavg') == false
   error('getloadadv missing')
 endif
-if cc.has_function('strnlen', prefix : '#include <string.h>')
-  cdata.set('HAVE_STRNLEN', 1)
-endif
-if cc.has_function('memset_s')
-  cdata.set('HAVE_MEMSET_S', 1)
-endif
-if cc.has_function('explicit_bzero')
-  cdata.set('HAVE_EXPLICIT_BZERO', 1)
-endif
-if cc.has_function('gethostbyname')
-  cdata.set('HAVE_GETHOSTBYNAME', 1)
-endif
-if cc.has_function('gethostbyname2')
-  cdata.set('HAVE_GETHOSTBYNAME2', 1)
-endif
-if cc.has_function('getifaddrs')
-  cdata.set('HAVE_GETIFADDRS', 1)
-endif
-if cc.has_function('freeifaddrs')
-  cdata.set('HAVE_FREEIFADDRS', 1)
-endif
-if cc.check_header('ifaddrs.h')
-  add_project_arguments('-DHAVE_IFADDRS_H', language : 'c')
-endif
+
+syscalls = [
+  'memset_s', 'explicit_bzero', 'atoll', 'stat64',
+  'mremap', 'getrlimit', 'setrlimit', 'gethostbyname2',
+  'getpeerucred', 'getpeereid', 'setresuid', 'getifaddrs', 'freeifaddrs',
+  'getresgid', 'mallinfo2', 'malloc_size', 'malloc_usable_size', 'getrusage',
+  'random', 'srandom', 'stat', 'statfs', 'statvfs', 'wait4', 'timegm',
+  'getaddrinfo', 'initgroups', 'gethostbyname'
+]
+
+str_syscalls = [
+  'strnlen', 'strndup',
+]
+
+foreach f : syscalls
+  if cc.has_function(f)
+    define = 'HAVE_' + f.underscorify().to_upper()
+    cdata.set(define, 1)
+  endif
+endforeach
+
+foreach f : str_syscalls
+  if cc.has_function(f, prefix : '#include <string.h>')
+    define = 'HAVE_' + f.underscorify().to_upper()
+    cdata.set(define, 1)
+  endif
+endforeach
+
+
+headers = [
+  'stdatomic.h', 'malloc.h', 'malloc/malloc.h', 'malloc/malloc_np.h',
+  'langinfo.h', 'sys/param.h', 'sys/mount.h', 'sys/statvfs.h',
+  'sys/select.h', 'sockLib.h', 'sys/mman.h', 'sys/msg.h', 'sys/vfs.h',
+  'arpa/inet.h', 'libintl.h', 'netdb.h', 'netinet/in.h', 'sys/ioctl.h',
+  'sys/socket.h', 'sys/time.h', 'sys/sysinfo.h', 'sys/file.h', 'sys/resource.h',
+  'ifaddrs.h', 'mach/mach.h', 'sys/timeb.h', 'argz.h', 'ucred.h', 'sys/ucred.h',
+  'endian.h', 'sys/endian.h', 'execinfo.h', 'byteswap.h', 'sys/types.h'
+]
+
+foreach h : headers
+  if cc.check_header(h)
+    define = '-DHAVE_' + h.underscorify().to_upper()
+    message(define)
+    add_project_arguments(define, language : 'c')
+  endif
+endforeach
 
 configure_file(#input: 'gnunet_private_config.h.in',
   output : 'gnunet_private_config.h',
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 382232226..db8808e2f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -99,7 +99,6 @@ src/contrib/service/set/ibf_sim.c
 src/contrib/service/set/plugin_block_set_test.c
 src/contrib/service/set/set_api.c
 src/contrib/service/template/gnunet-service-template.c
-src/gana/gnunet-error-codes/gnunet_error_codes.c
 src/lib/block/bg_bf.c
 src/lib/block/block.c
 src/lib/curl/curl.c
@@ -132,6 +131,24 @@ src/lib/sq/sq_exec.c
 src/lib/sq/sq_prepare.c
 src/lib/sq/sq_query_helper.c
 src/lib/sq/sq_result_helper.c
+src/lib/testing/gnunet-cmds-helper.c
+src/lib/testing/gnunet-testing-netjail-launcher.c
+src/lib/testing/testing_api_barrier.c
+src/lib/testing/testing_api_cmd_barrier_create.c
+src/lib/testing/testing_api_cmd_barrier_reached.c
+src/lib/testing/testing_api_cmd_batch.c
+src/lib/testing/testing_api_cmd_exec.c
+src/lib/testing/testing_api_cmd_finish.c
+src/lib/testing/testing_api_cmd_get_topo.c
+src/lib/testing/testing_api_cmd_netjail_start.c
+src/lib/testing/testing_api_cmd_netjail_start_cmds_helper.c
+src/lib/testing/testing_api_cmd_signal.c
+src/lib/testing/testing_api_cmd_stat.c
+src/lib/testing/testing_api_cmds.c
+src/lib/testing/testing_api_loop.c
+src/lib/testing/testing_api_main.c
+src/lib/testing/testing_api_topology.c
+src/lib/testing/testing_api_traits.c
 src/lib/util/bandwidth.c
 src/lib/util/benchmark.c
 src/lib/util/bio.c
@@ -242,6 +259,9 @@ src/service/arm/arm_api.c
 src/service/arm/arm_monitor_api.c
 src/service/arm/gnunet-service-arm.c
 src/service/arm/mockup-service.c
+src/service/arm/testing_arm_cmd_start_peer.c
+src/service/arm/testing_arm_cmd_stop_peer.c
+src/service/arm/testing_arm_traits.c
 src/service/cadet/cadet_api.c
 src/service/cadet/cadet_api_drop_message.c
 src/service/cadet/cadet_api_get_channel.c
@@ -260,12 +280,12 @@ src/service/cadet/gnunet-service-cadet_paths.c
 src/service/cadet/gnunet-service-cadet_peer.c
 src/service/cadet/gnunet-service-cadet_tunnels.c
 src/service/core/core_api.c
-src/service/core/core_api_cmd_connecting_peers.c
 src/service/core/core_api_monitor_peers.c
 src/service/core/gnunet-service-core.c
 src/service/core/gnunet-service-core_kx.c
 src/service/core/gnunet-service-core_sessions.c
 src/service/core/gnunet-service-core_typemap.c
+src/service/core/testing_core_cmd_connecting_peers.c
 src/service/datacache/datacache.c
 src/service/datastore/datastore_api.c
 src/service/datastore/gnunet-service-datastore.c
@@ -356,11 +376,7 @@ src/service/messenger/gnunet-service-messenger_peer_store.c
 src/service/messenger/gnunet-service-messenger_room.c
 src/service/messenger/gnunet-service-messenger_service.c
 src/service/messenger/gnunet-service-messenger_tunnel.c
-src/service/messenger/messenger-testing.c
 src/service/messenger/messenger_api.c
-src/service/messenger/messenger_api_cmd_join_room.c
-src/service/messenger/messenger_api_cmd_start_service.c
-src/service/messenger/messenger_api_cmd_stop_service.c
 src/service/messenger/messenger_api_contact.c
 src/service/messenger/messenger_api_contact_store.c
 src/service/messenger/messenger_api_handle.c
@@ -370,8 +386,12 @@ src/service/messenger/messenger_api_message_control.c
 src/service/messenger/messenger_api_message_kind.c
 src/service/messenger/messenger_api_queue_messages.c
 src/service/messenger/messenger_api_room.c
-src/service/messenger/messenger_api_traits.c
 src/service/messenger/messenger_api_util.c
+src/service/messenger/testing_messenger.c
+src/service/messenger/testing_messenger_cmd_join_room.c
+src/service/messenger/testing_messenger_cmd_start_service.c
+src/service/messenger/testing_messenger_cmd_stop_service.c
+src/service/messenger/testing_messenger_traits.c
 src/service/namecache/gnunet-service-namecache.c
 src/service/namecache/namecache_api.c
 src/service/namestore/gnunet-service-namestore.c
@@ -441,26 +461,10 @@ src/service/setu/ibf_sim.c
 src/service/setu/setu_api.c
 src/service/statistics/gnunet-service-statistics.c
 src/service/statistics/statistics_api.c
-src/service/testing/gnunet-cmds-helper.c
-src/service/testing/gnunet-testing.c
-src/service/testing/list-keys.c
-src/service/testing/testing.c
-src/service/testing/testing_api_cmd_barrier.c
-src/service/testing/testing_api_cmd_barrier_reached.c
-src/service/testing/testing_api_cmd_batch.c
-src/service/testing/testing_api_cmd_block_until_external_trigger.c
-src/service/testing/testing_api_cmd_exec_bash_script.c
-src/service/testing/testing_api_cmd_finish.c
-src/service/testing/testing_api_cmd_local_test_prepared.c
-src/service/testing/testing_api_cmd_netjail_start.c
-src/service/testing/testing_api_cmd_netjail_start_cmds_helper.c
-src/service/testing/testing_api_cmd_netjail_stop.c
-src/service/testing/testing_api_cmd_netjail_stop_cmds_helper.c
-src/service/testing/testing_api_cmd_send_peer_ready.c
-src/service/testing/testing_api_cmd_system_create.c
-src/service/testing/testing_api_cmd_system_destroy.c
-src/service/testing/testing_api_loop.c
-src/service/testing/testing_api_traits.c
+src/service/testbed/gnunet-testbed.c
+src/service/testbed/testbed.c
+src/service/testbed/testbed_api_cmd_system_create.c
+src/service/testbed/testing_testbed_traits.c
 src/service/topology/gnunet-daemon-topology.c
 src/service/transport/gnunet-communicator-quic.c
 src/service/transport/gnunet-communicator-tcp.c
@@ -468,8 +472,7 @@ src/service/transport/gnunet-communicator-udp.c
 src/service/transport/gnunet-communicator-unix.c
 src/service/transport/gnunet-service-transport.c
 src/service/transport/gnunet-transport.c
-src/service/transport/testing_api_cmd_start_peer.c
-src/service/transport/testing_api_cmd_stop_peer.c
+src/service/transport/testing_transport_traits.c
 src/service/transport/transport-testing-communicator.c
 src/service/transport/transport-testing-filenames2.c
 src/service/transport/transport-testing-loggers2.c
@@ -486,7 +489,6 @@ src/service/transport/transport_api_cmd_send_simple.c
 src/service/transport/transport_api_cmd_send_simple_performance.c
 src/service/transport/transport_api_cmd_start_peer.c
 src/service/transport/transport_api_cmd_stop_peer.c
-src/service/transport/transport_api_traits.c
 src/service/util/gnunet-service-resolver.c
 src/service/vpn/gnunet-helper-vpn.c
 src/service/vpn/gnunet-service-vpn.c
diff --git a/po/de.po b/po/de.po
index bb05e6517..ee474e0e6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2024-03-15 09:19+0100\n"
+"POT-Creation-Date: 2024-05-20 20:21+0200\n"
 "PO-Revision-Date: 2015-03-08 16:16+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -348,25 +348,25 @@ msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 msgid "Failed to connect to CORE service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/cli/core/gnunet-core.c:212
+#: src/cli/core/gnunet-core.c:213
 #, fuzzy
 msgid "No argument given.\n"
 msgstr "# empfangene Ergebnisse"
 
-#: src/cli/core/gnunet-core.c:235 src/service/transport/gnunet-transport.c:1389
+#: src/cli/core/gnunet-core.c:238 src/service/transport/gnunet-transport.c:1389
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
-#: src/cli/core/gnunet-core.c:241
+#: src/cli/core/gnunet-core.c:244
 msgid "Show our current peer identity"
 msgstr ""
 
-#: src/cli/core/gnunet-core.c:248
+#: src/cli/core/gnunet-core.c:251
 #, fuzzy
 msgid "Show current connections"
 msgstr "GNUnet Konfiguration"
 
-#: src/cli/core/gnunet-core.c:259
+#: src/cli/core/gnunet-core.c:262
 msgid "Print information about connected peers."
 msgstr "Informationen über verbundene Knoten ausgeben."
 
@@ -1089,54 +1089,54 @@ msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:268
+#: src/cli/gns/gnunet-gns.c:269
 #, fuzzy, c-format
 msgid "`%s' is not a valid DNS domain name\n"
 msgstr "»%s« ist keine gültige IP-Adresse.\n"
 
-#: src/cli/gns/gnunet-gns.c:279 src/lib/util/dnsparser.c:273
+#: src/cli/gns/gnunet-gns.c:280 src/lib/util/dnsparser.c:273
 #, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:294
+#: src/cli/gns/gnunet-gns.c:295
 msgid "Cannot resolve using GNS: GNUnet peer not running\n"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:305
+#: src/cli/gns/gnunet-gns.c:306
 #: src/contrib/service/abd/gnunet-service-abd.c:1745
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/cli/gns/gnunet-gns.c:318
+#: src/cli/gns/gnunet-gns.c:325
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:358
+#: src/cli/gns/gnunet-gns.c:365
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:364
+#: src/cli/gns/gnunet-gns.c:371
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/cli/gns/gnunet-gns.c:370
+#: src/cli/gns/gnunet-gns.c:377
 #, fuzzy
 msgid "Specify a timeout for the lookup"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/cli/gns/gnunet-gns.c:374
+#: src/cli/gns/gnunet-gns.c:381
 msgid "No unneeded output"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:379
+#: src/cli/gns/gnunet-gns.c:386
 msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:393
+#: src/cli/gns/gnunet-gns.c:400
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "GNUnet Netzwerk Topologie tracen."
@@ -1657,7 +1657,11 @@ msgstr ""
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/cli/nse/gnunet-nse.c:124
+#: src/cli/nse/gnunet-nse.c:126
+msgid "Monitor and output current estimates"
+msgstr ""
+
+#: src/cli/nse/gnunet-nse.c:137
 msgid "Show network size estimates from NSE service."
 msgstr ""
 
@@ -1705,86 +1709,90 @@ msgstr ""
 msgid "The time until the DID Document is going to expire (e.g. 5d)"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:805
+#: src/cli/reclaim/gnunet-reclaim.c:813
 #, fuzzy, c-format
 msgid "Ego is required\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/cli/reclaim/gnunet-reclaim.c:812
+#: src/cli/reclaim/gnunet-reclaim.c:820
 #, c-format
 msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:819
+#: src/cli/reclaim/gnunet-reclaim.c:827
 #, fuzzy, c-format
 msgid "Requesting party key is required!\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/cli/reclaim/gnunet-reclaim.c:837
+#: src/cli/reclaim/gnunet-reclaim.c:846
 msgid "Add or update an attribute NAME"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:842
+#: src/cli/reclaim/gnunet-reclaim.c:851
 msgid "Delete the attribute with ID"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:847
+#: src/cli/reclaim/gnunet-reclaim.c:856
 msgid "The attribute VALUE"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:852
+#: src/cli/reclaim/gnunet-reclaim.c:861
 msgid "The EGO to use"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:858
+#: src/cli/reclaim/gnunet-reclaim.c:867
 msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:862
+#: src/cli/reclaim/gnunet-reclaim.c:873
+msgid "Specify the relying party URI for a ticket to consume"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:877
 msgid "List attributes for EGO"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:866
+#: src/cli/reclaim/gnunet-reclaim.c:881
 msgid "List credentials for EGO"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:872
+#: src/cli/reclaim/gnunet-reclaim.c:887
 msgid "Credential to use for attribute"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:877
+#: src/cli/reclaim/gnunet-reclaim.c:892
 msgid "Credential name"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:883
+#: src/cli/reclaim/gnunet-reclaim.c:898
 msgid "Issue a ticket for a set of attributes separated by comma"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:888
+#: src/cli/reclaim/gnunet-reclaim.c:903
 msgid "Consume a ticket"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:893
+#: src/cli/reclaim/gnunet-reclaim.c:908
 msgid "Revoke a ticket"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:898
+#: src/cli/reclaim/gnunet-reclaim.c:913
 msgid "Type of attribute"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:903
+#: src/cli/reclaim/gnunet-reclaim.c:918
 msgid "Type of credential"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:907
+#: src/cli/reclaim/gnunet-reclaim.c:922
 msgid "List tickets of ego"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:913
+#: src/cli/reclaim/gnunet-reclaim.c:928
 msgid "Expiration interval of the attribute"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:921
+#: src/cli/reclaim/gnunet-reclaim.c:936
 msgid "re:claimID command line tool"
 msgstr ""
 
@@ -2019,33 +2027,59 @@ msgstr "Statistiken der GNUnet-Aktivitäten ausgeben."
 msgid "run decoder modus, otherwise runs as encoder"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:154
+#: src/cli/util/gnunet-config.c:101
 msgid "test if the current installation supports the specified BACKEND"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:160
+#: src/cli/util/gnunet-config.c:107
 msgid ""
 "Provide an appropriate value for CFLAGS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:165
+#: src/cli/util/gnunet-config.c:112
 msgid "Is this an experimental build of GNUnet"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:171
+#: src/cli/util/gnunet-config.c:118
 msgid ""
 "Provide an appropriate value for LIBS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:177
+#: src/cli/util/gnunet-config.c:123
+#, fuzzy
+msgid "Do not parse default configuration files"
+msgstr "GNUnet-Konfigurationsdateien bearbeiten"
+
+#: src/cli/util/gnunet-config.c:129
 msgid "Provide the path under which GNUnet was installed"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:192
-msgid "Manipulate GNUnet configuration files"
-msgstr "GNUnet-Konfigurationsdateien bearbeiten"
+#: src/cli/util/gnunet-config.c:136
+msgid ""
+"Parse main configuration from this command-line argument and not from disk"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:225
+#, fuzzy
+msgid "Failed to load default configuration, exiting ...\n"
+msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
+
+#: src/cli/util/gnunet-config.c:237
+#, fuzzy
+msgid "Failed to parse configuration, exiting ...\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+
+#: src/cli/util/gnunet-config.c:249 src/lib/util/program.c:287
+#, fuzzy, c-format
+msgid "Unreadable configuration file `%s', exiting ...\n"
+msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
+
+#: src/cli/util/gnunet-config.c:263 src/lib/util/program.c:299
+#, fuzzy, c-format
+msgid "Malformed configuration file `%s', exiting ...\n"
+msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
 #: src/cli/util/gnunet-crypto-tvg.c:1588
 msgid "verify a test vector from stdin"
@@ -2096,55 +2130,54 @@ msgstr ""
 msgid "Hostkeys file `%s' not found\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/cli/util/gnunet-ecc.c:314
+#: src/cli/util/gnunet-ecc.c:318
 #, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:319 src/service/testing/list-keys.c:47
-#: src/service/testing/testing.c:308
+#: src/cli/util/gnunet-ecc.c:324
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:334
+#: src/cli/util/gnunet-ecc.c:340
 #, fuzzy, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
 
-#: src/cli/util/gnunet-ecc.c:388
+#: src/cli/util/gnunet-ecc.c:394
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:452
+#: src/cli/util/gnunet-ecc.c:458
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:458
+#: src/cli/util/gnunet-ecc.c:464
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:464
+#: src/cli/util/gnunet-ecc.c:470
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:469
+#: src/cli/util/gnunet-ecc.c:475
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:474
+#: src/cli/util/gnunet-ecc.c:480
 msgid "print the private key in ASCII format"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:479
+#: src/cli/util/gnunet-ecc.c:485
 msgid "print the public key in HEX format"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:485
+#: src/cli/util/gnunet-ecc.c:491
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:499
+#: src/cli/util/gnunet-ecc.c:505
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
@@ -3222,13 +3255,13 @@ msgstr ""
 msgid "Invalid handle type while writing `%s'"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/lib/util/client.c:531 src/lib/util/service.c:1134
+#: src/lib/util/client.c:531 src/lib/util/service.c:1139
 #: src/service/arm/gnunet-service-arm.c:452
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/lib/util/client.c:536 src/lib/util/service.c:1138
+#: src/lib/util/client.c:536 src/lib/util/service.c:1143
 #: src/service/arm/gnunet-service-arm.c:456
 #, c-format
 msgid "Using `%s' instead\n"
@@ -3360,17 +3393,17 @@ msgstr ""
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "»%s« schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/lib/util/crypto_ecc.c:554
+#: src/lib/util/crypto_ecc.c:569
 #, fuzzy, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/lib/util/crypto_ecc.c:677
+#: src/lib/util/crypto_ecc.c:692
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
-#: src/lib/util/crypto_ecc_setup.c:282 src/lib/util/crypto_ecc_setup.c:304
+#: src/lib/util/crypto_ecc_setup.c:282 src/lib/util/crypto_ecc_setup.c:305
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
@@ -3396,7 +3429,7 @@ msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/lib/util/disk.c:1222 src/lib/util/service.c:1642
+#: src/lib/util/disk.c:1222 src/lib/util/service.c:1651
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
@@ -3590,99 +3623,99 @@ msgstr "Sie müssen für die Option »%s« zusätzlich eine Zahl angeben.\n"
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:60
+#: src/lib/util/gnunet_error_codes.c:59
 msgid "No error (success)."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:66
+#: src/lib/util/gnunet_error_codes.c:65
 #, fuzzy
 msgid "Unknown and unspecified error."
 msgstr "Unbekannter Anfragestatus"
 
-#: src/lib/util/gnunet_error_codes.c:72
+#: src/lib/util/gnunet_error_codes.c:71
 #, fuzzy
 msgid "Communication with service failed."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/lib/util/gnunet_error_codes.c:78
+#: src/lib/util/gnunet_error_codes.c:77
 #, fuzzy
 msgid "Ego not found."
 msgstr "Kein Inhalt gefunden"
 
-#: src/lib/util/gnunet_error_codes.c:84
+#: src/lib/util/gnunet_error_codes.c:83
 msgid "Identifier already in use for another ego."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:90
+#: src/lib/util/gnunet_error_codes.c:89
 msgid "The given ego is invalid or malformed."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:96
+#: src/lib/util/gnunet_error_codes.c:95
 #, fuzzy
 msgid "Unknown namestore error."
 msgstr "Unbekannter Anfragestatus"
 
-#: src/lib/util/gnunet_error_codes.c:102 src/lib/util/gnunet_error_codes.c:120
+#: src/lib/util/gnunet_error_codes.c:101 src/lib/util/gnunet_error_codes.c:119
 #, fuzzy
 msgid "Zone iteration failed."
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/lib/util/gnunet_error_codes.c:108
+#: src/lib/util/gnunet_error_codes.c:107
 #, fuzzy
 msgid "Zone not found."
 msgstr "Kein Inhalt gefunden"
 
-#: src/lib/util/gnunet_error_codes.c:114
+#: src/lib/util/gnunet_error_codes.c:113
 #, fuzzy
 msgid "Record not found."
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/lib/util/gnunet_error_codes.c:126
+#: src/lib/util/gnunet_error_codes.c:125
 msgid "Zone does not contain any records."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:132
+#: src/lib/util/gnunet_error_codes.c:131
 #, fuzzy
 msgid "Failed to lookup record."
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/lib/util/gnunet_error_codes.c:138
+#: src/lib/util/gnunet_error_codes.c:137
 #, fuzzy
 msgid "No records given."
 msgstr "Kein Knoten angegeben!\n"
 
-#: src/lib/util/gnunet_error_codes.c:144
+#: src/lib/util/gnunet_error_codes.c:143
 msgid "Record data invalid."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:150
+#: src/lib/util/gnunet_error_codes.c:149
 #, fuzzy
 msgid "No label given."
 msgstr "Kein Knoten angegeben!\n"
 
-#: src/lib/util/gnunet_error_codes.c:156
+#: src/lib/util/gnunet_error_codes.c:155
 #, fuzzy
 msgid "No results given."
 msgstr "# empfangene Ergebnisse"
 
-#: src/lib/util/gnunet_error_codes.c:162
+#: src/lib/util/gnunet_error_codes.c:161
 msgid "Record already exists."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:168
+#: src/lib/util/gnunet_error_codes.c:167
 msgid "Record size exceeds maximum limit."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:174
+#: src/lib/util/gnunet_error_codes.c:173
 msgid "There was an error in the database backend."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:180
+#: src/lib/util/gnunet_error_codes.c:179
 #, fuzzy
 msgid "Failed to store the given records."
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/lib/util/gnunet_error_codes.c:186
+#: src/lib/util/gnunet_error_codes.c:185
 msgid "Label invalid or malformed."
 msgstr ""
 
@@ -3750,16 +3783,6 @@ msgstr "`%s' fehlgeschlagen für die Bibliothek `%s'. Ort: %s:%d. Fehler: %s\n"
 msgid "Could not determine plugin installation path.\n"
 msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/lib/util/program.c:287
-#, fuzzy, c-format
-msgid "Unreadable configuration file `%s', exiting ...\n"
-msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
-
-#: src/lib/util/program.c:299
-#, fuzzy, c-format
-msgid "Malformed configuration file `%s', exiting ...\n"
-msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
-
 #: src/lib/util/program.c:314
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s'. Exiting ...\n"
@@ -3811,120 +3834,120 @@ msgstr "Standarddienst »%s« ist nicht korrekt eingerichtet!\n"
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/lib/util/service.c:654
+#: src/lib/util/service.c:650
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/lib/util/service.c:838
+#: src/lib/util/service.c:841
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
 
-#: src/lib/util/service.c:951
+#: src/lib/util/service.c:956
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/lib/util/service.c:992
+#: src/lib/util/service.c:997
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/lib/util/service.c:1095 src/lib/util/service.c:1101
+#: src/lib/util/service.c:1100 src/lib/util/service.c:1106
 #: src/service/arm/gnunet-service-arm.c:412
 #: src/service/arm/gnunet-service-arm.c:418
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/lib/util/service.c:1158 src/service/arm/gnunet-service-arm.c:484
+#: src/lib/util/service.c:1163 src/service/arm/gnunet-service-arm.c:484
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/lib/util/service.c:1176 src/service/arm/gnunet-service-arm.c:505
+#: src/lib/util/service.c:1181 src/service/arm/gnunet-service-arm.c:505
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/lib/util/service.c:1207 src/service/arm/gnunet-service-arm.c:536
+#: src/lib/util/service.c:1212 src/service/arm/gnunet-service-arm.c:536
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "»%s« konnte nicht aufgelöst werden: %s\n"
 
-#: src/lib/util/service.c:1226 src/service/arm/gnunet-service-arm.c:555
+#: src/lib/util/service.c:1231 src/service/arm/gnunet-service-arm.c:555
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/lib/util/service.c:1401
+#: src/lib/util/service.c:1406
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/lib/util/service.c:1413
+#: src/lib/util/service.c:1418
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
 
-#: src/lib/util/service.c:1420
+#: src/lib/util/service.c:1425
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "%s schlug fehl, Nachrichten Typ %d ist bereits in Verwendung.\n"
 
-#: src/lib/util/service.c:1481
+#: src/lib/util/service.c:1486
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/lib/util/service.c:1505
+#: src/lib/util/service.c:1510
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/lib/util/service.c:1573
+#: src/lib/util/service.c:1583
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/lib/util/service.c:1644
+#: src/lib/util/service.c:1653
 msgid "No such user"
 msgstr ""
 
-#: src/lib/util/service.c:1658
+#: src/lib/util/service.c:1668
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Benutzer/Gruppe kann nicht zu »%s« geändert werden: %s\n"
 
-#: src/lib/util/service.c:1751
+#: src/lib/util/service.c:1767
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/lib/util/service.c:1756
+#: src/lib/util/service.c:1772
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/lib/util/service.c:1761
+#: src/lib/util/service.c:1777
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/lib/util/service.c:1960 src/lib/util/service.c:2255
+#: src/lib/util/service.c:1990 src/lib/util/service.c:2304
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/lib/util/service.c:2036 src/lib/util/service.c:2048
-#: src/lib/util/service.c:2298 src/lib/util/service.c:2310
-#: src/service/transport/transport-testing-communicator.c:1056
+#: src/lib/util/service.c:2065 src/lib/util/service.c:2080
+#: src/lib/util/service.c:2353 src/lib/util/service.c:2368
+#: src/service/transport/transport-testing-communicator.c:1059
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/lib/util/service.c:2058 src/lib/util/service.c:2321
+#: src/lib/util/service.c:2092 src/lib/util/service.c:2381
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "GNUnet Konfiguration"
@@ -4384,6 +4407,11 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
+#: src/service/arm/testing_arm_cmd_start_peer.c:197
+#, c-format
+msgid "Failed to start `%s': %s\n"
+msgstr "»%s« konnte nicht gestartet werden: %s\n"
+
 #: src/service/core/gnunet-service-core.c:329
 #, fuzzy
 msgid "# send requests dropped (disconnected)"
@@ -4565,8 +4593,8 @@ msgstr "# Bytes entschlüsselt"
 #: src/service/core/gnunet-service-core_sessions.c:337
 #: src/service/fs/gnunet-service-fs_cp.c:484
 #: src/service/fs/gnunet-service-fs_cp.c:1377
-#: src/service/topology/gnunet-daemon-topology.c:551
-#: src/service/topology/gnunet-daemon-topology.c:633
+#: src/service/topology/gnunet-daemon-topology.c:545
+#: src/service/topology/gnunet-daemon-topology.c:627
 msgid "# peers connected"
 msgstr "# verbundener Knoten"
 
@@ -5611,7 +5639,7 @@ msgstr "GNUnet Konfiguration"
 
 #: src/service/fs/gnunet-service-fs.c:1271
 #: src/service/hostlist/gnunet-daemon-hostlist.c:343
-#: src/service/topology/gnunet-daemon-topology.c:1066
+#: src/service/topology/gnunet-daemon-topology.c:1062
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
@@ -6435,7 +6463,7 @@ msgid "# hostlist advertisements send"
 msgstr "# Bekanntmachungen von anderen übertragen"
 
 #: src/service/hostlist/gnunet-daemon-hostlist_server.c:483
-#: src/service/topology/gnunet-daemon-topology.c:786
+#: src/service/topology/gnunet-daemon-topology.c:781
 #, fuzzy, c-format
 msgid "Error in communication with PEERSTORE service: %s\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -6700,12 +6728,12 @@ msgstr ""
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/service/nat/gnunet-service-nat.c:1861
+#: src/service/nat/gnunet-service-nat.c:1860
 #, fuzzy
 msgid "Connection reversal request failed\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/service/nat/gnunet-service-nat.c:1935
+#: src/service/nat/gnunet-service-nat.c:1999
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
@@ -6731,42 +6759,42 @@ msgstr "Kommando `%s' wurde nicht gefunden!\n"
 msgid "`upnpc' command not found\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1141
+#: src/service/peerstore/gnunet-service-peerstore.c:1150
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1214
+#: src/service/peerstore/gnunet-service-peerstore.c:1223
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1233
+#: src/service/peerstore/gnunet-service-peerstore.c:1242
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1244
+#: src/service/peerstore/gnunet-service-peerstore.c:1253
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/service/peerstore/peerstore_api.c:574
+#: src/service/peerstore/peerstore_api.c:579
 #, fuzzy
 msgid "Unexpected store response.\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/service/peerstore/peerstore_api.c:606
+#: src/service/peerstore/peerstore_api.c:620
 msgid "Unexpected iteration response.\n"
 msgstr ""
 
-#: src/service/peerstore/peerstore_api.c:652
+#: src/service/peerstore/peerstore_api.c:666
 msgid ""
 "Unexpected iteration response, no iterating client found, discarding "
 "message.\n"
 msgstr ""
 
-#: src/service/peerstore/peerstore_api.c:662
-#: src/service/peerstore/peerstore_api_monitor.c:164
+#: src/service/peerstore/peerstore_api.c:676
+#: src/service/peerstore/peerstore_api_monitor.c:163
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
@@ -6938,12 +6966,12 @@ msgstr ""
 msgid "Namestore REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/service/rest/openid_plugin.c:3102
+#: src/service/rest/openid_plugin.c:3121
 #, fuzzy
 msgid "OpenID Connect REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/service/rest/pabc_plugin.c:637 src/service/rest/reclaim_plugin.c:1523
+#: src/service/rest/pabc_plugin.c:637 src/service/rest/reclaim_plugin.c:1494
 #, fuzzy
 msgid "Identity Provider REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -6995,153 +7023,55 @@ msgstr "Dateien aus dem GNUnet herunterladen."
 msgid "Could not save some persistent statistics\n"
 msgstr ""
 
-#: src/service/testing/gnunet-testing.c:185
-#, c-format
-msgid "Could not extract hostkey %u (offset too large?)\n"
-msgstr ""
-
-#: src/service/testing/gnunet-testing.c:275
-#, c-format
-msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
-msgstr ""
-
-#: src/service/testing/gnunet-testing.c:386
+#: src/service/testbed/gnunet-testbed.c:196
 #, fuzzy
-msgid "create unique configuration files"
+msgid "number of unique configuration files to create"
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/service/testing/gnunet-testing.c:392
-msgid "extract hostkey file from pre-computed hostkey list"
-msgstr ""
-
-#: src/service/testing/gnunet-testing.c:400
-msgid ""
-"number of unique configuration files to create, or number of the hostkey to "
-"extract"
-msgstr ""
-
-#: src/service/testing/gnunet-testing.c:407
+#: src/service/testbed/gnunet-testbed.c:202
 msgid "configuration template"
 msgstr "Konfigurationsvorlage"
 
-#: src/service/testing/gnunet-testing.c:415
-msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
-msgstr ""
-
-#: src/service/testing/gnunet-testing.c:432
+#: src/service/testbed/gnunet-testbed.c:218
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/service/testing/list-keys.c:92
-msgid "list COUNT number of keys"
-msgstr ""
-
-#: src/service/testing/testing.c:291
-#, c-format
-msgid "Hostkeys file not found: %s\n"
-msgstr ""
-
-#: src/service/testing/testing.c:743
-#, c-format
-msgid "Key number %u does not exist\n"
-msgstr ""
-
-#: src/service/testing/testing.c:1217
-#, c-format
-msgid ""
-"You attempted to create a testbed with more than %u hosts.  Please "
-"precompute more hostkeys first.\n"
-msgstr ""
-
-#: src/service/testing/testing.c:1226
-#, fuzzy, c-format
-msgid "Failed to initialize hostkey for peer %u\n"
-msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
-
-#: src/service/testing/testing.c:1236
-msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
-msgstr ""
-
-#: src/service/testing/testing.c:1249
-msgid "Failed to create configuration for peer (not enough free ports?)\n"
-msgstr ""
-
-#: src/service/testing/testing.c:1265
-#, fuzzy, c-format
-msgid "Cannot open hostkey file `%s': %s\n"
-msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
-
-#: src/service/testing/testing.c:1279
-#, fuzzy, c-format
-msgid "Failed to write hostkey file for peer %u: %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
-
-#: src/service/testing/testing.c:1307
-#, fuzzy, c-format
-msgid "Failed to write configuration file `%s' for peer %u: %s\n"
-msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
-
-#: src/service/testing/testing.c:1413
-#, c-format
-msgid "Failed to start `%s': %s\n"
-msgstr "»%s« konnte nicht gestartet werden: %s\n"
-
-#: src/service/testing/testing.c:1664
-#, c-format
-msgid "Failed to load configuration from %s\n"
-msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
-
-#: src/service/testing/testing.c:2795
-#, c-format
-msgid "Topology file %s not found\n"
-msgstr ""
-
-#: src/service/testing/testing.c:2803
-#, c-format
-msgid "Topology file %s has no data\n"
-msgstr ""
-
-#: src/service/testing/testing.c:2811
-#, c-format
-msgid "Topology file %s cannot be read\n"
-msgstr ""
-
 #: src/service/topology/gnunet-daemon-topology.c:286
 #, fuzzy
 msgid "# connect requests issued to ATS"
 msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
 
-#: src/service/topology/gnunet-daemon-topology.c:480
+#: src/service/topology/gnunet-daemon-topology.c:475
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# ausgehender Nachrichten verworfen"
 
-#: src/service/topology/gnunet-daemon-topology.c:752
+#: src/service/topology/gnunet-daemon-topology.c:747
 #, fuzzy
 msgid "Error in communication with PEERSTORE service to monitor.\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/service/topology/gnunet-daemon-topology.c:761
+#: src/service/topology/gnunet-daemon-topology.c:756
 msgid "Finished initial PEERSTORE iteration in monitor.\n"
 msgstr ""
 
-#: src/service/topology/gnunet-daemon-topology.c:869
+#: src/service/topology/gnunet-daemon-topology.c:864
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/service/topology/gnunet-daemon-topology.c:943
+#: src/service/topology/gnunet-daemon-topology.c:938
 msgid "# HELLO messages received"
 msgstr "# HELLO-Meldungen empfangen"
 
-#: src/service/topology/gnunet-daemon-topology.c:1095
+#: src/service/topology/gnunet-daemon-topology.c:1091
 msgid "GNUnet topology control"
 msgstr ""
 
 #: src/service/transport/gnunet-communicator-quic.c:1717
 #: src/service/transport/gnunet-communicator-tcp.c:3814
-#: src/service/transport/gnunet-communicator-udp.c:3562
-#: src/service/transport/gnunet-service-transport.c:12124
+#: src/service/transport/gnunet-communicator-udp.c:3579
+#: src/service/transport/gnunet-service-transport.c:12543
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
@@ -7153,7 +7083,7 @@ msgstr ""
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/service/transport/gnunet-communicator-udp.c:3637
+#: src/service/transport/gnunet-communicator-udp.c:3654
 msgid "GNUnet UDP communicator"
 msgstr ""
 
@@ -7458,6 +7388,26 @@ msgid "Failed to connect to the namestore!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
 #, fuzzy, c-format
+#~ msgid "Failed to initialize hostkey for peer %u\n"
+#~ msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
+
+#, fuzzy, c-format
+#~ msgid "Cannot open hostkey file `%s': %s\n"
+#~ msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
+
+#, fuzzy, c-format
+#~ msgid "Failed to write hostkey file for peer %u: %s\n"
+#~ msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#, fuzzy, c-format
+#~ msgid "Failed to write configuration file `%s' for peer %u: %s\n"
+#~ msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+
+#, c-format
+#~ msgid "Failed to load configuration from %s\n"
+#~ msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
+
+#, fuzzy, c-format
 #~ msgid ""
 #~ "Local peer: %s\n"
 #~ "\n"
@@ -8309,10 +8259,6 @@ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 #~ msgstr "GNUnet Konfiguration"
 
 #, fuzzy
-#~ msgid "Unreadable or malformed default configuration file `%s', exit ...\n"
-#~ msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
-
-#, fuzzy
 #~ msgid "Unreadable or malformed configuration, exit ...\n"
 #~ msgstr "GNUnet Konfiguration"
 
diff --git a/po/es.po b/po/es.po
index 623d6337e..741d67781 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2024-03-15 09:19+0100\n"
+"POT-Creation-Date: 2024-05-20 20:21+0200\n"
 "PO-Revision-Date: 2013-02-23 17:50+0100\n"
 "Last-Translator: Miguel �ngel Arruga Vivas <rosen644835@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -360,28 +360,28 @@ msgstr "Se produjo un fallo al procesar la identidad del par «%s»\n"
 msgid "Failed to connect to CORE service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
 
-#: src/cli/core/gnunet-core.c:212
+#: src/cli/core/gnunet-core.c:213
 #, fuzzy
 msgid "No argument given.\n"
 msgstr "No se han proporcionado opciones\n"
 
 # Miguel: ¿Quizá continuamente fuese mejor?
-#: src/cli/core/gnunet-core.c:235 src/service/transport/gnunet-transport.c:1389
+#: src/cli/core/gnunet-core.c:238 src/service/transport/gnunet-transport.c:1389
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 "provee información sobre todas las conexiones actuales (de forma continua)"
 
-#: src/cli/core/gnunet-core.c:241
+#: src/cli/core/gnunet-core.c:244
 #, fuzzy
 msgid "Show our current peer identity"
 msgstr "identidad del par"
 
-#: src/cli/core/gnunet-core.c:248
+#: src/cli/core/gnunet-core.c:251
 #, fuzzy
 msgid "Show current connections"
 msgstr "# conexiones activas"
 
-#: src/cli/core/gnunet-core.c:259
+#: src/cli/core/gnunet-core.c:262
 msgid "Print information about connected peers."
 msgstr "Imprime información sobre los pares conectados."
 
@@ -1117,55 +1117,55 @@ msgstr "No se pudo empezar la operación de desindexado.\n"
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr "Desindexa un fichero previamente indexado con «gnunet-publish»."
 
-#: src/cli/gns/gnunet-gns.c:268
+#: src/cli/gns/gnunet-gns.c:269
 #, fuzzy, c-format
 msgid "`%s' is not a valid DNS domain name\n"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/cli/gns/gnunet-gns.c:279 src/lib/util/dnsparser.c:273
+#: src/cli/gns/gnunet-gns.c:280 src/lib/util/dnsparser.c:273
 #, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr ""
 "Se produjo un fallo al convertir el nombre en formato DNS IDNA «%s» a UTF-8: "
 "%s\n"
 
-#: src/cli/gns/gnunet-gns.c:294
+#: src/cli/gns/gnunet-gns.c:295
 msgid "Cannot resolve using GNS: GNUnet peer not running\n"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:305
+#: src/cli/gns/gnunet-gns.c:306
 #: src/contrib/service/abd/gnunet-service-abd.c:1745
 #, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
 
-#: src/cli/gns/gnunet-gns.c:318
+#: src/cli/gns/gnunet-gns.c:325
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:358
+#: src/cli/gns/gnunet-gns.c:365
 msgid "Lookup a record for the given name"
 msgstr "Buscar el registro para el nombre dado"
 
-#: src/cli/gns/gnunet-gns.c:364
+#: src/cli/gns/gnunet-gns.c:371
 msgid "Specify the type of the record to lookup"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/cli/gns/gnunet-gns.c:370
+#: src/cli/gns/gnunet-gns.c:377
 #, fuzzy
 msgid "Specify a timeout for the lookup"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/cli/gns/gnunet-gns.c:374
+#: src/cli/gns/gnunet-gns.c:381
 msgid "No unneeded output"
 msgstr "Sin salida innecesaria"
 
-#: src/cli/gns/gnunet-gns.c:379
+#: src/cli/gns/gnunet-gns.c:386
 msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:393
+#: src/cli/gns/gnunet-gns.c:400
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "Herramienta de acceso GNUnet GNS"
@@ -1702,7 +1702,11 @@ msgstr "# pares desconectados debido a petición externa"
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr "Demonio de ayuda en las pruebas de recorrido NAT de GNUnet"
 
-#: src/cli/nse/gnunet-nse.c:124
+#: src/cli/nse/gnunet-nse.c:126
+msgid "Monitor and output current estimates"
+msgstr ""
+
+#: src/cli/nse/gnunet-nse.c:137
 #, fuzzy
 msgid "Show network size estimates from NSE service."
 msgstr "# Estimaciones del tamaño de red recibidas"
@@ -1751,87 +1755,91 @@ msgstr ""
 msgid "The time until the DID Document is going to expire (e.g. 5d)"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:805
+#: src/cli/reclaim/gnunet-reclaim.c:813
 #, fuzzy, c-format
 msgid "Ego is required\n"
 msgstr "Las opción «%s» o «%s» es necesaria.\n"
 
-#: src/cli/reclaim/gnunet-reclaim.c:812
+#: src/cli/reclaim/gnunet-reclaim.c:820
 #, c-format
 msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:819
+#: src/cli/reclaim/gnunet-reclaim.c:827
 #, fuzzy, c-format
 msgid "Requesting party key is required!\n"
 msgstr "el parámetro --section es necesario\n"
 
-#: src/cli/reclaim/gnunet-reclaim.c:837
+#: src/cli/reclaim/gnunet-reclaim.c:846
 msgid "Add or update an attribute NAME"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:842
+#: src/cli/reclaim/gnunet-reclaim.c:851
 msgid "Delete the attribute with ID"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:847
+#: src/cli/reclaim/gnunet-reclaim.c:856
 msgid "The attribute VALUE"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:852
+#: src/cli/reclaim/gnunet-reclaim.c:861
 #, fuzzy
 msgid "The EGO to use"
 msgstr "tamaño del mensaje"
 
-#: src/cli/reclaim/gnunet-reclaim.c:858
+#: src/cli/reclaim/gnunet-reclaim.c:867
 msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:862
+#: src/cli/reclaim/gnunet-reclaim.c:873
+msgid "Specify the relying party URI for a ticket to consume"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:877
 msgid "List attributes for EGO"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:866
+#: src/cli/reclaim/gnunet-reclaim.c:881
 msgid "List credentials for EGO"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:872
+#: src/cli/reclaim/gnunet-reclaim.c:887
 msgid "Credential to use for attribute"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:877
+#: src/cli/reclaim/gnunet-reclaim.c:892
 msgid "Credential name"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:883
+#: src/cli/reclaim/gnunet-reclaim.c:898
 msgid "Issue a ticket for a set of attributes separated by comma"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:888
+#: src/cli/reclaim/gnunet-reclaim.c:903
 msgid "Consume a ticket"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:893
+#: src/cli/reclaim/gnunet-reclaim.c:908
 msgid "Revoke a ticket"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:898
+#: src/cli/reclaim/gnunet-reclaim.c:913
 msgid "Type of attribute"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:903
+#: src/cli/reclaim/gnunet-reclaim.c:918
 msgid "Type of credential"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:907
+#: src/cli/reclaim/gnunet-reclaim.c:922
 msgid "List tickets of ego"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:913
+#: src/cli/reclaim/gnunet-reclaim.c:928
 msgid "Expiration interval of the attribute"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:921
+#: src/cli/reclaim/gnunet-reclaim.c:936
 msgid "re:claimID command line tool"
 msgstr ""
 
@@ -2071,33 +2079,59 @@ msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
 msgid "run decoder modus, otherwise runs as encoder"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:154
+#: src/cli/util/gnunet-config.c:101
 msgid "test if the current installation supports the specified BACKEND"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:160
+#: src/cli/util/gnunet-config.c:107
 msgid ""
 "Provide an appropriate value for CFLAGS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:165
+#: src/cli/util/gnunet-config.c:112
 msgid "Is this an experimental build of GNUnet"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:171
+#: src/cli/util/gnunet-config.c:118
 msgid ""
 "Provide an appropriate value for LIBS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:177
+#: src/cli/util/gnunet-config.c:123
+#, fuzzy
+msgid "Do not parse default configuration files"
+msgstr "Manipular ficheros de configuración de GNUnet"
+
+#: src/cli/util/gnunet-config.c:129
 msgid "Provide the path under which GNUnet was installed"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:192
-msgid "Manipulate GNUnet configuration files"
-msgstr "Manipular ficheros de configuración de GNUnet"
+#: src/cli/util/gnunet-config.c:136
+msgid ""
+"Parse main configuration from this command-line argument and not from disk"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:225
+#, fuzzy
+msgid "Failed to load default configuration, exiting ...\n"
+msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
+
+#: src/cli/util/gnunet-config.c:237
+#, fuzzy
+msgid "Failed to parse configuration, exiting ...\n"
+msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
+
+#: src/cli/util/gnunet-config.c:249 src/lib/util/program.c:287
+#, fuzzy, c-format
+msgid "Unreadable configuration file `%s', exiting ...\n"
+msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
+
+#: src/cli/util/gnunet-config.c:263 src/lib/util/program.c:299
+#, fuzzy, c-format
+msgid "Malformed configuration file `%s', exiting ...\n"
+msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
 #: src/cli/util/gnunet-crypto-tvg.c:1588
 msgid "verify a test vector from stdin"
@@ -2146,57 +2180,56 @@ msgstr ""
 msgid "Hostkeys file `%s' not found\n"
 msgstr "El fichero de máquinas %s no fue encontrado\n"
 
-#: src/cli/util/gnunet-ecc.c:314
+#: src/cli/util/gnunet-ecc.c:318
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr "El archivo de amigos «%s» está vacío.\n"
 
-#: src/cli/util/gnunet-ecc.c:319 src/service/testing/list-keys.c:47
-#: src/service/testing/testing.c:308
+#: src/cli/util/gnunet-ecc.c:324
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr "El fichero de máquinas no tiene el formato correcto: %s\n"
 
-#: src/cli/util/gnunet-ecc.c:334
+#: src/cli/util/gnunet-ecc.c:340
 #, fuzzy, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr "¡No se puede leer el fichero de claves de máquina!\n"
 
-#: src/cli/util/gnunet-ecc.c:388
+#: src/cli/util/gnunet-ecc.c:394
 msgid "No hostkey file specified on command line\n"
 msgstr "No se ha especificado la clave de máquina en la línea de comandos\n"
 
-#: src/cli/util/gnunet-ecc.c:452
+#: src/cli/util/gnunet-ecc.c:458
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:458
+#: src/cli/util/gnunet-ecc.c:464
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:464
+#: src/cli/util/gnunet-ecc.c:470
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr "crea «COUNT» pares de claves pública-privada (para pruebas)"
 
-#: src/cli/util/gnunet-ecc.c:469
+#: src/cli/util/gnunet-ecc.c:475
 msgid "print the public key in ASCII format"
 msgstr "imprime la clave pública en formato ASCII"
 
-#: src/cli/util/gnunet-ecc.c:474
+#: src/cli/util/gnunet-ecc.c:480
 #, fuzzy
 msgid "print the private key in ASCII format"
 msgstr "imprime la clave pública en formato ASCII"
 
-#: src/cli/util/gnunet-ecc.c:479
+#: src/cli/util/gnunet-ecc.c:485
 #, fuzzy
 msgid "print the public key in HEX format"
 msgstr "imprime la clave pública en formato ASCII"
 
-#: src/cli/util/gnunet-ecc.c:485
+#: src/cli/util/gnunet-ecc.c:491
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:499
+#: src/cli/util/gnunet-ecc.c:505
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
 
@@ -3289,14 +3322,14 @@ msgstr ""
 msgid "Invalid handle type while writing `%s'"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/lib/util/client.c:531 src/lib/util/service.c:1134
+#: src/lib/util/client.c:531 src/lib/util/service.c:1139
 #: src/service/arm/gnunet-service-arm.c:452
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 "La ruta tipo UNIX «%s» es demasiado larga, la longitud máxima es %llu\n"
 
-#: src/lib/util/client.c:536 src/lib/util/service.c:1138
+#: src/lib/util/client.c:536 src/lib/util/service.c:1143
 #: src/service/arm/gnunet-service-arm.c:456
 #, c-format
 msgid "Using `%s' instead\n"
@@ -3431,17 +3464,17 @@ msgstr ""
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "«%s» falló en %s: %d con el error: %s\n"
 
-#: src/lib/util/crypto_ecc.c:554
+#: src/lib/util/crypto_ecc.c:569
 #, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "El firmado ECC falló en %s:%d: %s\n"
 
-#: src/lib/util/crypto_ecc.c:677
+#: src/lib/util/crypto_ecc.c:692
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n"
 
-#: src/lib/util/crypto_ecc_setup.c:282 src/lib/util/crypto_ecc_setup.c:304
+#: src/lib/util/crypto_ecc_setup.c:282 src/lib/util/crypto_ecc_setup.c:305
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "No se pudo acceder a la clave de máquina.\n"
@@ -3466,7 +3499,7 @@ msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n"
 msgid "Expected `%s' to be a directory!\n"
 msgstr "¡Se esperaba que «%s» fuera un directorio!\n"
 
-#: src/lib/util/disk.c:1222 src/lib/util/service.c:1642
+#: src/lib/util/disk.c:1222 src/lib/util/service.c:1651
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "No se pudo obtener información acerca del usuario «%s»: %s\n"
@@ -3661,102 +3694,102 @@ msgstr "Tienes que introducir un número en la opción «%s».\n"
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:60
+#: src/lib/util/gnunet_error_codes.c:59
 msgid "No error (success)."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:66
+#: src/lib/util/gnunet_error_codes.c:65
 #, fuzzy
 msgid "Unknown and unspecified error."
 msgstr "Error desconocido"
 
 # Miguel: ¿Conectar y conexión?
-#: src/lib/util/gnunet_error_codes.c:72
+#: src/lib/util/gnunet_error_codes.c:71
 #, fuzzy
 msgid "Communication with service failed."
 msgstr "Error al comunicar con el servicio ARM.\n"
 
-#: src/lib/util/gnunet_error_codes.c:78
+#: src/lib/util/gnunet_error_codes.c:77
 #, fuzzy
 msgid "Ego not found."
 msgstr "Contenido no encontrado"
 
-#: src/lib/util/gnunet_error_codes.c:84
+#: src/lib/util/gnunet_error_codes.c:83
 msgid "Identifier already in use for another ego."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:90
+#: src/lib/util/gnunet_error_codes.c:89
 msgid "The given ego is invalid or malformed."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:96
+#: src/lib/util/gnunet_error_codes.c:95
 #, fuzzy
 msgid "Unknown namestore error."
 msgstr "Error desconocido"
 
-#: src/lib/util/gnunet_error_codes.c:102 src/lib/util/gnunet_error_codes.c:120
+#: src/lib/util/gnunet_error_codes.c:101 src/lib/util/gnunet_error_codes.c:119
 #, fuzzy
 msgid "Zone iteration failed."
 msgstr "# sesiones wlan creadas"
 
-#: src/lib/util/gnunet_error_codes.c:108
+#: src/lib/util/gnunet_error_codes.c:107
 #, fuzzy
 msgid "Zone not found."
 msgstr "Contenido no encontrado"
 
-#: src/lib/util/gnunet_error_codes.c:114
+#: src/lib/util/gnunet_error_codes.c:113
 #, fuzzy
 msgid "Record not found."
 msgstr "«upnpc» no encontrado\n"
 
-#: src/lib/util/gnunet_error_codes.c:126
+#: src/lib/util/gnunet_error_codes.c:125
 #, fuzzy
 msgid "Zone does not contain any records."
 msgstr "El fichero '%s' no contiene un pseudónimo.\n"
 
-#: src/lib/util/gnunet_error_codes.c:132
+#: src/lib/util/gnunet_error_codes.c:131
 #, fuzzy
 msgid "Failed to lookup record."
 msgstr "El almacén de nombres no pudo añadir el registro\n"
 
-#: src/lib/util/gnunet_error_codes.c:138
+#: src/lib/util/gnunet_error_codes.c:137
 #, fuzzy
 msgid "No records given."
 msgstr "No se han proporcionado opciones\n"
 
-#: src/lib/util/gnunet_error_codes.c:144
+#: src/lib/util/gnunet_error_codes.c:143
 msgid "Record data invalid."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:150
+#: src/lib/util/gnunet_error_codes.c:149
 #, fuzzy
 msgid "No label given."
 msgstr "No se han proporcionado opciones\n"
 
-#: src/lib/util/gnunet_error_codes.c:156
+#: src/lib/util/gnunet_error_codes.c:155
 #, fuzzy
 msgid "No results given."
 msgstr "No se han proporcionado opciones\n"
 
-#: src/lib/util/gnunet_error_codes.c:162
+#: src/lib/util/gnunet_error_codes.c:161
 #, fuzzy
 msgid "Record already exists."
 msgstr "El registro ya existía en el almacén de nombres"
 
-#: src/lib/util/gnunet_error_codes.c:168
+#: src/lib/util/gnunet_error_codes.c:167
 msgid "Record size exceeds maximum limit."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:174
+#: src/lib/util/gnunet_error_codes.c:173
 msgid "There was an error in the database backend."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:180
+#: src/lib/util/gnunet_error_codes.c:179
 #, fuzzy
 msgid "Failed to store the given records."
 msgstr "El almacén de nombres no pudo añadir el registro\n"
 
-#: src/lib/util/gnunet_error_codes.c:186
+#: src/lib/util/gnunet_error_codes.c:185
 msgid "Label invalid or malformed."
 msgstr ""
 
@@ -3828,16 +3861,6 @@ msgstr "Falló «%s» para la biblioteca «%s» con error: %s\n"
 msgid "Could not determine plugin installation path.\n"
 msgstr "No se pudo determinar la ruta de instalación de los módulos.\n"
 
-#: src/lib/util/program.c:287
-#, fuzzy, c-format
-msgid "Unreadable configuration file `%s', exiting ...\n"
-msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
-
-#: src/lib/util/program.c:299
-#, fuzzy, c-format
-msgid "Malformed configuration file `%s', exiting ...\n"
-msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
-
 #: src/lib/util/program.c:314
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s'. Exiting ...\n"
@@ -3893,7 +3916,7 @@ msgid "Could not resolve our FQDN: %s\n"
 msgstr ""
 "No se pudo resolver nuestro nombre de dominio cualificado (FQDN) : %s\n"
 
-#: src/lib/util/service.c:654
+#: src/lib/util/service.c:650
 #, fuzzy, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -3902,22 +3925,22 @@ msgstr ""
 "El código de procesado para el mensaje del tipo %u no llamó a "
 "«GNUNET_SERVER_receive_done» después de %s\n"
 
-#: src/lib/util/service.c:838
+#: src/lib/util/service.c:841
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr "Familia de direcciones %d desconocida\n"
 
-#: src/lib/util/service.c:951
+#: src/lib/util/service.c:956
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr "No se pudo procesar la especificación de red IPv4 «%s» para «%s:%s»\n"
 
-#: src/lib/util/service.c:992
+#: src/lib/util/service.c:997
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr "No se pudo procesar la especificación de red IPv6 «%s» para «%s:%s»\n"
 
-#: src/lib/util/service.c:1095 src/lib/util/service.c:1101
+#: src/lib/util/service.c:1100 src/lib/util/service.c:1106
 #: src/service/arm/gnunet-service-arm.c:412
 #: src/service/arm/gnunet-service-arm.c:418
 #, c-format
@@ -3926,7 +3949,7 @@ msgstr ""
 "¡Se requiere un número de puerto válido para el servicio «%s» en la "
 "configuración!\n"
 
-#: src/lib/util/service.c:1158 src/service/arm/gnunet-service-arm.c:484
+#: src/lib/util/service.c:1163 src/service/arm/gnunet-service-arm.c:484
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -3935,89 +3958,89 @@ msgstr ""
 "Deshabilitando el soporte de dominio de «sockets» UNIX para el servicio "
 "«%s», no se pudo crear un «socket» UNIX: %s\n"
 
-#: src/lib/util/service.c:1176 src/service/arm/gnunet-service-arm.c:505
+#: src/lib/util/service.c:1181 src/service/arm/gnunet-service-arm.c:505
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 "No hay ni puerto (PORT) ni ruta unix (UNIXPATH) para el servicio «%s», pero "
 "uno es necesario\n"
 
-#: src/lib/util/service.c:1207 src/service/arm/gnunet-service-arm.c:536
+#: src/lib/util/service.c:1212 src/service/arm/gnunet-service-arm.c:536
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Se produjo un fallo al resolver «%s»: %s\n"
 
-#: src/lib/util/service.c:1226 src/service/arm/gnunet-service-arm.c:555
+#: src/lib/util/service.c:1231 src/service/arm/gnunet-service-arm.c:555
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "No se encontró la dirección %s para «%s».\n"
 
-#: src/lib/util/service.c:1401
+#: src/lib/util/service.c:1406
 #, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "«%s» falló para el puerto %d (%s).\n"
 
-#: src/lib/util/service.c:1413
+#: src/lib/util/service.c:1418
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "«%s» falló para el puerto %d (%s): dirección en uso actualmente\n"
 
-#: src/lib/util/service.c:1420
+#: src/lib/util/service.c:1425
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "«%s» falló para «%.*s»: dirección en uso actualmente\n"
 
-#: src/lib/util/service.c:1481
+#: src/lib/util/service.c:1486
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr "El valor especificado «%s» para el servicio «%s» no es válido\n"
 
-#: src/lib/util/service.c:1505
+#: src/lib/util/service.c:1510
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 "No se pudo acceder al «socket» pre-ascociado %u, lo intentaré asociar yo "
 "mismo\n"
 
-#: src/lib/util/service.c:1573
+#: src/lib/util/service.c:1583
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/lib/util/service.c:1644
+#: src/lib/util/service.c:1653
 msgid "No such user"
 msgstr "No existe tal usuario"
 
-#: src/lib/util/service.c:1658
+#: src/lib/util/service.c:1668
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Imposible cambiar el usuario/grupo a «%s»: %s\n"
 
-#: src/lib/util/service.c:1751
+#: src/lib/util/service.c:1767
 msgid "Service process failed to initialize\n"
 msgstr "No se pudo inicializar el proceso del servicio\n"
 
-#: src/lib/util/service.c:1756
+#: src/lib/util/service.c:1772
 msgid "Service process could not initialize server function\n"
 msgstr ""
 "No se pudo inicializar la función del servidor en el proceso del servicio\n"
 
-#: src/lib/util/service.c:1761
+#: src/lib/util/service.c:1777
 msgid "Service process failed to report status\n"
 msgstr "El proceso del servicio no devolvió un estado\n"
 
-#: src/lib/util/service.c:1960 src/lib/util/service.c:2255
+#: src/lib/util/service.c:1990 src/lib/util/service.c:2304
 msgid "do daemonize (detach from terminal)"
 msgstr "demonizar (desasociar del terminal)"
 
-#: src/lib/util/service.c:2036 src/lib/util/service.c:2048
-#: src/lib/util/service.c:2298 src/lib/util/service.c:2310
-#: src/service/transport/transport-testing-communicator.c:1056
+#: src/lib/util/service.c:2065 src/lib/util/service.c:2080
+#: src/lib/util/service.c:2353 src/lib/util/service.c:2368
+#: src/service/transport/transport-testing-communicator.c:1059
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/lib/util/service.c:2058 src/lib/util/service.c:2321
+#: src/lib/util/service.c:2092 src/lib/util/service.c:2381
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
@@ -4515,6 +4538,11 @@ msgstr "El servicio «%s» finalizó con estado %s/%d, se reiniciará en %llu ms
 msgid "Initiating shutdown as requested by client.\n"
 msgstr "Iniciando apagado bajo petición del cliente.\n"
 
+#: src/service/arm/testing_arm_cmd_start_peer.c:197
+#, c-format
+msgid "Failed to start `%s': %s\n"
+msgstr "Se produjo un fallo al arrancar «%s»: %s\n"
+
 #: src/service/core/gnunet-service-core.c:329
 msgid "# send requests dropped (disconnected)"
 msgstr "# peticiones de envío descartadas (desconectado)"
@@ -4688,8 +4716,8 @@ msgstr "# bytes de «payload» descifrados"
 #: src/service/core/gnunet-service-core_sessions.c:337
 #: src/service/fs/gnunet-service-fs_cp.c:484
 #: src/service/fs/gnunet-service-fs_cp.c:1377
-#: src/service/topology/gnunet-daemon-topology.c:551
-#: src/service/topology/gnunet-daemon-topology.c:633
+#: src/service/topology/gnunet-daemon-topology.c:545
+#: src/service/topology/gnunet-daemon-topology.c:627
 msgid "# peers connected"
 msgstr "# pares conectados"
 
@@ -5777,7 +5805,7 @@ msgstr ""
 
 #: src/service/fs/gnunet-service-fs.c:1271
 #: src/service/hostlist/gnunet-daemon-hostlist.c:343
-#: src/service/topology/gnunet-daemon-topology.c:1066
+#: src/service/topology/gnunet-daemon-topology.c:1062
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Se produjo un fallo al conectar con el servicio «%s».\n"
@@ -6606,7 +6634,7 @@ msgid "# hostlist advertisements send"
 msgstr "# anuncios de listas de máquinas enviados"
 
 #: src/service/hostlist/gnunet-daemon-hostlist_server.c:483
-#: src/service/topology/gnunet-daemon-topology.c:786
+#: src/service/topology/gnunet-daemon-topology.c:781
 #, fuzzy, c-format
 msgid "Error in communication with PEERSTORE service: %s\n"
 msgstr ""
@@ -6890,12 +6918,12 @@ msgstr ""
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/service/nat/gnunet-service-nat.c:1861
+#: src/service/nat/gnunet-service-nat.c:1860
 #, fuzzy
 msgid "Connection reversal request failed\n"
 msgstr "Colección detenida.\n"
 
-#: src/service/nat/gnunet-service-nat.c:1935
+#: src/service/nat/gnunet-service-nat.c:1999
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
@@ -6919,44 +6947,44 @@ msgstr "comando «external-ip» no encontrado\n"
 msgid "`upnpc' command not found\n"
 msgstr "comando «upnpc» no encontrado\n"
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1141
+#: src/service/peerstore/gnunet-service-peerstore.c:1150
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1214
+#: src/service/peerstore/gnunet-service-peerstore.c:1223
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "No se pudo leer el fichero de la lista negra «%s»\n"
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1233
+#: src/service/peerstore/gnunet-service-peerstore.c:1242
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr "Importando HELLO de «%s»\n"
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1244
+#: src/service/peerstore/gnunet-service-peerstore.c:1253
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/service/peerstore/peerstore_api.c:574
+#: src/service/peerstore/peerstore_api.c:579
 #, fuzzy
 msgid "Unexpected store response.\n"
 msgstr "Respuesta inesperada a la operación '%s'.\n"
 
-#: src/service/peerstore/peerstore_api.c:606
+#: src/service/peerstore/peerstore_api.c:620
 #, fuzzy
 msgid "Unexpected iteration response.\n"
 msgstr "El formato de salida es desconocido, ésto no debería pasar.\n"
 
-#: src/service/peerstore/peerstore_api.c:652
+#: src/service/peerstore/peerstore_api.c:666
 #, fuzzy
 msgid ""
 "Unexpected iteration response, no iterating client found, discarding "
 "message.\n"
 msgstr "El formato de salida es desconocido, ésto no debería pasar.\n"
 
-#: src/service/peerstore/peerstore_api.c:662
-#: src/service/peerstore/peerstore_api_monitor.c:164
+#: src/service/peerstore/peerstore_api.c:676
+#: src/service/peerstore/peerstore_api_monitor.c:163
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Recibida petición DNS mal formada de %s\n"
@@ -7133,12 +7161,12 @@ msgstr "Conexión fallida\n"
 msgid "Namestore REST API initialized\n"
 msgstr "Conexión fallida\n"
 
-#: src/service/rest/openid_plugin.c:3102
+#: src/service/rest/openid_plugin.c:3121
 #, fuzzy
 msgid "OpenID Connect REST API initialized\n"
 msgstr "Conexión fallida\n"
 
-#: src/service/rest/pabc_plugin.c:637 src/service/rest/reclaim_plugin.c:1523
+#: src/service/rest/pabc_plugin.c:637 src/service/rest/reclaim_plugin.c:1494
 #, fuzzy
 msgid "Identity Provider REST API initialized\n"
 msgstr "Conexión fallida\n"
@@ -7191,174 +7219,61 @@ msgstr "Cargando %llu bytes de estadísticas de «%s»\n"
 msgid "Could not save some persistent statistics\n"
 msgstr "No se pudieron guardar algunas estadísticas persistentes\n"
 
-#: src/service/testing/gnunet-testing.c:185
-#, c-format
-msgid "Could not extract hostkey %u (offset too large?)\n"
-msgstr ""
-"No se pudo extraer la clave de máquina %u (¿desplazamiento demasiado "
-"grande?)\n"
-
-#: src/service/testing/gnunet-testing.c:275
-#, c-format
-msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
-msgstr "Comando desconocido, use «q» para salir o «r» para reiniciar el par\n"
-
-#: src/service/testing/gnunet-testing.c:386
-msgid "create unique configuration files"
-msgstr "crear ficheros de configuración únicos"
-
-#: src/service/testing/gnunet-testing.c:392
-msgid "extract hostkey file from pre-computed hostkey list"
-msgstr ""
-"extraer los ficheros de claves de máquinas de una lista pre-computada de "
-"claves de máquinas"
-
-#: src/service/testing/gnunet-testing.c:400
-msgid ""
-"number of unique configuration files to create, or number of the hostkey to "
-"extract"
+#: src/service/testbed/gnunet-testbed.c:196
+#, fuzzy
+msgid "number of unique configuration files to create"
 msgstr ""
 "número de ficheros de configuración únicos o claves de máquina a crear, o el "
 "número de claves de máquina a extraer"
 
-#: src/service/testing/gnunet-testing.c:407
+#: src/service/testbed/gnunet-testbed.c:202
 msgid "configuration template"
 msgstr "plantilla de configuración"
 
-#: src/service/testing/gnunet-testing.c:415
-msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
-msgstr ""
-
-#: src/service/testing/gnunet-testing.c:432
+#: src/service/testbed/gnunet-testbed.c:218
 msgid "Command line tool to access the testing library"
 msgstr ""
 "Herramienta de línea de comandos para acceder a la biblioteca de pruebas"
 
-#: src/service/testing/list-keys.c:92
-#, fuzzy
-msgid "list COUNT number of keys"
-msgstr "crea «COUNT» número de pares"
-
-#: src/service/testing/testing.c:291
-#, c-format
-msgid "Hostkeys file not found: %s\n"
-msgstr "El fichero de máquinas no fue encontrado: %s\n"
-
-#: src/service/testing/testing.c:743
-#, c-format
-msgid "Key number %u does not exist\n"
-msgstr "El número de clave %u no existe\n"
-
-# Miguel: "testbed" lo he traducido como batería de pruebas, pero
-# no es una traducción muy literal.
-#: src/service/testing/testing.c:1217
-#, c-format
-msgid ""
-"You attempted to create a testbed with more than %u hosts.  Please "
-"precompute more hostkeys first.\n"
-msgstr ""
-"Se ha intentado crear una batería de pruebas con más de %u máquinas.  Por "
-"favor, pre-compute más claves de máquinas primero.\n"
-
-#: src/service/testing/testing.c:1226
-#, c-format
-msgid "Failed to initialize hostkey for peer %u\n"
-msgstr ""
-"Se produjo un fallo al inicializar la clave de la máquina desde el par %u\n"
-
-#: src/service/testing/testing.c:1236
-#, fuzzy
-msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
-msgstr "¡Falta la opción «%s» en la sección «%s» de la configuración!\n"
-
-#: src/service/testing/testing.c:1249
-msgid "Failed to create configuration for peer (not enough free ports?)\n"
-msgstr ""
-"Se produjo un fallo al crear la configuración para el par (¿no hay "
-"suficientes puertos libres?)\n"
-
-#: src/service/testing/testing.c:1265
-#, fuzzy, c-format
-msgid "Cannot open hostkey file `%s': %s\n"
-msgstr "No se pudo abrir el fichero de claves de máquina: %s\n"
-
-#: src/service/testing/testing.c:1279
-#, c-format
-msgid "Failed to write hostkey file for peer %u: %s\n"
-msgstr ""
-"Se produjo un fallo al escribir la clave de la máquina para el par %u: %s\n"
-
-#: src/service/testing/testing.c:1307
-#, c-format
-msgid "Failed to write configuration file `%s' for peer %u: %s\n"
-msgstr ""
-"Se produjo un fallo al escribir el fichero de configuración «%s» para el par "
-"%u: %s\n"
-
-#: src/service/testing/testing.c:1413
-#, c-format
-msgid "Failed to start `%s': %s\n"
-msgstr "Se produjo un fallo al arrancar «%s»: %s\n"
-
-#: src/service/testing/testing.c:1664
-#, c-format
-msgid "Failed to load configuration from %s\n"
-msgstr "Se produjo un fallo al cargar la configuración de %s\n"
-
-#: src/service/testing/testing.c:2795
-#, c-format
-msgid "Topology file %s not found\n"
-msgstr "El fichero de topología %s no fue encontrado\n"
-
-#: src/service/testing/testing.c:2803
-#, c-format
-msgid "Topology file %s has no data\n"
-msgstr "El fichero de topología %s no tiene datos\n"
-
-#: src/service/testing/testing.c:2811
-#, c-format
-msgid "Topology file %s cannot be read\n"
-msgstr "El fichero de topología %s no puede ser leido\n"
-
 #: src/service/topology/gnunet-daemon-topology.c:286
 #, fuzzy
 msgid "# connect requests issued to ATS"
 msgstr "# peticiones de conexión requeridas al servicio de transporte"
 
 # gossiped??
-#: src/service/topology/gnunet-daemon-topology.c:480
+#: src/service/topology/gnunet-daemon-topology.c:475
 msgid "# HELLO messages gossipped"
 msgstr "# Mensajes «HELLO» rumoreados"
 
-#: src/service/topology/gnunet-daemon-topology.c:752
+#: src/service/topology/gnunet-daemon-topology.c:747
 #, fuzzy
 msgid "Error in communication with PEERSTORE service to monitor.\n"
 msgstr ""
 "Error en la comunicación con el servicio de información de pares (PEERINFO): "
 "%s\n"
 
-#: src/service/topology/gnunet-daemon-topology.c:761
+#: src/service/topology/gnunet-daemon-topology.c:756
 msgid "Finished initial PEERSTORE iteration in monitor.\n"
 msgstr ""
 
-#: src/service/topology/gnunet-daemon-topology.c:869
+#: src/service/topology/gnunet-daemon-topology.c:864
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 "¡Se produjo un fallo al conectar con el servicio principal, no se puede "
 "gestionar la topología!\n"
 
-#: src/service/topology/gnunet-daemon-topology.c:943
+#: src/service/topology/gnunet-daemon-topology.c:938
 msgid "# HELLO messages received"
 msgstr "# mensajes «HELLO» recibidos"
 
-#: src/service/topology/gnunet-daemon-topology.c:1095
+#: src/service/topology/gnunet-daemon-topology.c:1091
 msgid "GNUnet topology control"
 msgstr ""
 
 #: src/service/transport/gnunet-communicator-quic.c:1717
 #: src/service/transport/gnunet-communicator-tcp.c:3814
-#: src/service/transport/gnunet-communicator-udp.c:3562
-#: src/service/transport/gnunet-service-transport.c:12124
+#: src/service/transport/gnunet-communicator-udp.c:3579
+#: src/service/transport/gnunet-service-transport.c:12543
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
@@ -7375,7 +7290,7 @@ msgstr "Configurador Gtk de GNUnet"
 msgid "GNUnet TCP communicator"
 msgstr "Configurador Gtk de GNUnet"
 
-#: src/service/transport/gnunet-communicator-udp.c:3637
+#: src/service/transport/gnunet-communicator-udp.c:3654
 #, fuzzy
 msgid "GNUnet UDP communicator"
 msgstr "Configurador Gtk de GNUnet"
@@ -7695,6 +7610,94 @@ msgstr "Se produjo un fallo al crear el espacio de nombres «%s»\n"
 msgid "Failed to connect to the namestore!\n"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
+#, c-format
+#~ msgid "Could not extract hostkey %u (offset too large?)\n"
+#~ msgstr ""
+#~ "No se pudo extraer la clave de máquina %u (¿desplazamiento demasiado "
+#~ "grande?)\n"
+
+#, c-format
+#~ msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
+#~ msgstr ""
+#~ "Comando desconocido, use «q» para salir o «r» para reiniciar el par\n"
+
+#~ msgid "create unique configuration files"
+#~ msgstr "crear ficheros de configuración únicos"
+
+#~ msgid "extract hostkey file from pre-computed hostkey list"
+#~ msgstr ""
+#~ "extraer los ficheros de claves de máquinas de una lista pre-computada de "
+#~ "claves de máquinas"
+
+#, fuzzy
+#~ msgid "list COUNT number of keys"
+#~ msgstr "crea «COUNT» número de pares"
+
+#, c-format
+#~ msgid "Hostkeys file not found: %s\n"
+#~ msgstr "El fichero de máquinas no fue encontrado: %s\n"
+
+#, c-format
+#~ msgid "Key number %u does not exist\n"
+#~ msgstr "El número de clave %u no existe\n"
+
+# Miguel: "testbed" lo he traducido como batería de pruebas, pero
+# no es una traducción muy literal.
+#, c-format
+#~ msgid ""
+#~ "You attempted to create a testbed with more than %u hosts.  Please "
+#~ "precompute more hostkeys first.\n"
+#~ msgstr ""
+#~ "Se ha intentado crear una batería de pruebas con más de %u máquinas.  Por "
+#~ "favor, pre-compute más claves de máquinas primero.\n"
+
+#, c-format
+#~ msgid "Failed to initialize hostkey for peer %u\n"
+#~ msgstr ""
+#~ "Se produjo un fallo al inicializar la clave de la máquina desde el par "
+#~ "%u\n"
+
+#, fuzzy
+#~ msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
+#~ msgstr "¡Falta la opción «%s» en la sección «%s» de la configuración!\n"
+
+#~ msgid "Failed to create configuration for peer (not enough free ports?)\n"
+#~ msgstr ""
+#~ "Se produjo un fallo al crear la configuración para el par (¿no hay "
+#~ "suficientes puertos libres?)\n"
+
+#, fuzzy, c-format
+#~ msgid "Cannot open hostkey file `%s': %s\n"
+#~ msgstr "No se pudo abrir el fichero de claves de máquina: %s\n"
+
+#, c-format
+#~ msgid "Failed to write hostkey file for peer %u: %s\n"
+#~ msgstr ""
+#~ "Se produjo un fallo al escribir la clave de la máquina para el par %u: "
+#~ "%s\n"
+
+#, c-format
+#~ msgid "Failed to write configuration file `%s' for peer %u: %s\n"
+#~ msgstr ""
+#~ "Se produjo un fallo al escribir el fichero de configuración «%s» para el "
+#~ "par %u: %s\n"
+
+#, c-format
+#~ msgid "Failed to load configuration from %s\n"
+#~ msgstr "Se produjo un fallo al cargar la configuración de %s\n"
+
+#, c-format
+#~ msgid "Topology file %s not found\n"
+#~ msgstr "El fichero de topología %s no fue encontrado\n"
+
+#, c-format
+#~ msgid "Topology file %s has no data\n"
+#~ msgstr "El fichero de topología %s no tiene datos\n"
+
+#, c-format
+#~ msgid "Topology file %s cannot be read\n"
+#~ msgstr "El fichero de topología %s no puede ser leido\n"
+
 #, fuzzy, c-format
 #~ msgid ""
 #~ "Local peer: %s\n"
@@ -9371,10 +9374,6 @@ msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 #~ msgstr "valor a establecer"
 
 #, fuzzy
-#~ msgid "Unreadable or malformed default configuration file `%s', exit ...\n"
-#~ msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
-
-#, fuzzy
 #~ msgid "Unreadable or malformed configuration, exit ...\n"
 #~ msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
diff --git a/po/fr.po b/po/fr.po
index 642891c1b..7023d7ef6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2024-03-15 09:19+0100\n"
+"POT-Creation-Date: 2024-05-20 20:21+0200\n"
 "PO-Revision-Date: 2021-11-21 00:53+0100\n"
 "Last-Translator: Stéphane  Aulery <lkppo@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -334,25 +334,25 @@ msgstr ""
 msgid "Failed to connect to CORE service!\n"
 msgstr ""
 
-#: src/cli/core/gnunet-core.c:212
+#: src/cli/core/gnunet-core.c:213
 #, fuzzy
 msgid "No argument given.\n"
 msgstr "# résultats introuvables"
 
-#: src/cli/core/gnunet-core.c:235 src/service/transport/gnunet-transport.c:1389
+#: src/cli/core/gnunet-core.c:238 src/service/transport/gnunet-transport.c:1389
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
-#: src/cli/core/gnunet-core.c:241
+#: src/cli/core/gnunet-core.c:244
 msgid "Show our current peer identity"
 msgstr ""
 
-#: src/cli/core/gnunet-core.c:248
+#: src/cli/core/gnunet-core.c:251
 #, fuzzy
 msgid "Show current connections"
 msgstr "# Session TCP active"
 
-#: src/cli/core/gnunet-core.c:259
+#: src/cli/core/gnunet-core.c:262
 msgid "Print information about connected peers."
 msgstr ""
 
@@ -1045,52 +1045,52 @@ msgstr ""
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:268
+#: src/cli/gns/gnunet-gns.c:269
 #, c-format
 msgid "`%s' is not a valid DNS domain name\n"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:279 src/lib/util/dnsparser.c:273
+#: src/cli/gns/gnunet-gns.c:280 src/lib/util/dnsparser.c:273
 #, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:294
+#: src/cli/gns/gnunet-gns.c:295
 msgid "Cannot resolve using GNS: GNUnet peer not running\n"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:305
+#: src/cli/gns/gnunet-gns.c:306
 #: src/contrib/service/abd/gnunet-service-abd.c:1745
 #, c-format
 msgid "Failed to connect to GNS\n"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:318
+#: src/cli/gns/gnunet-gns.c:325
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:358
+#: src/cli/gns/gnunet-gns.c:365
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:364
+#: src/cli/gns/gnunet-gns.c:371
 msgid "Specify the type of the record to lookup"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:370
+#: src/cli/gns/gnunet-gns.c:377
 msgid "Specify a timeout for the lookup"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:374
+#: src/cli/gns/gnunet-gns.c:381
 msgid "No unneeded output"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:379
+#: src/cli/gns/gnunet-gns.c:386
 msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:393
+#: src/cli/gns/gnunet-gns.c:400
 msgid "GNUnet GNS resolver tool"
 msgstr ""
 
@@ -1605,7 +1605,11 @@ msgstr ""
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/cli/nse/gnunet-nse.c:124
+#: src/cli/nse/gnunet-nse.c:126
+msgid "Monitor and output current estimates"
+msgstr ""
+
+#: src/cli/nse/gnunet-nse.c:137
 msgid "Show network size estimates from NSE service."
 msgstr ""
 
@@ -1653,86 +1657,90 @@ msgstr ""
 msgid "The time until the DID Document is going to expire (e.g. 5d)"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:805
+#: src/cli/reclaim/gnunet-reclaim.c:813
 #, c-format
 msgid "Ego is required\n"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:812
+#: src/cli/reclaim/gnunet-reclaim.c:820
 #, c-format
 msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:819
+#: src/cli/reclaim/gnunet-reclaim.c:827
 #, c-format
 msgid "Requesting party key is required!\n"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:837
+#: src/cli/reclaim/gnunet-reclaim.c:846
 msgid "Add or update an attribute NAME"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:842
+#: src/cli/reclaim/gnunet-reclaim.c:851
 msgid "Delete the attribute with ID"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:847
+#: src/cli/reclaim/gnunet-reclaim.c:856
 msgid "The attribute VALUE"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:852
+#: src/cli/reclaim/gnunet-reclaim.c:861
 msgid "The EGO to use"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:858
+#: src/cli/reclaim/gnunet-reclaim.c:867
 msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:862
+#: src/cli/reclaim/gnunet-reclaim.c:873
+msgid "Specify the relying party URI for a ticket to consume"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:877
 msgid "List attributes for EGO"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:866
+#: src/cli/reclaim/gnunet-reclaim.c:881
 msgid "List credentials for EGO"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:872
+#: src/cli/reclaim/gnunet-reclaim.c:887
 msgid "Credential to use for attribute"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:877
+#: src/cli/reclaim/gnunet-reclaim.c:892
 msgid "Credential name"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:883
+#: src/cli/reclaim/gnunet-reclaim.c:898
 msgid "Issue a ticket for a set of attributes separated by comma"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:888
+#: src/cli/reclaim/gnunet-reclaim.c:903
 msgid "Consume a ticket"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:893
+#: src/cli/reclaim/gnunet-reclaim.c:908
 msgid "Revoke a ticket"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:898
+#: src/cli/reclaim/gnunet-reclaim.c:913
 msgid "Type of attribute"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:903
+#: src/cli/reclaim/gnunet-reclaim.c:918
 msgid "Type of credential"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:907
+#: src/cli/reclaim/gnunet-reclaim.c:922
 msgid "List tickets of ego"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:913
+#: src/cli/reclaim/gnunet-reclaim.c:928
 msgid "Expiration interval of the attribute"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:921
+#: src/cli/reclaim/gnunet-reclaim.c:936
 msgid "re:claimID command line tool"
 msgstr ""
 
@@ -1964,32 +1972,58 @@ msgstr ""
 msgid "run decoder modus, otherwise runs as encoder"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:154
+#: src/cli/util/gnunet-config.c:101
 msgid "test if the current installation supports the specified BACKEND"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:160
+#: src/cli/util/gnunet-config.c:107
 msgid ""
 "Provide an appropriate value for CFLAGS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:165
+#: src/cli/util/gnunet-config.c:112
 msgid "Is this an experimental build of GNUnet"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:171
+#: src/cli/util/gnunet-config.c:118
 msgid ""
 "Provide an appropriate value for LIBS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:177
+#: src/cli/util/gnunet-config.c:123
+#, fuzzy
+msgid "Do not parse default configuration files"
+msgstr "Résolution de « %s » échouée\n"
+
+#: src/cli/util/gnunet-config.c:129
 msgid "Provide the path under which GNUnet was installed"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:192
-msgid "Manipulate GNUnet configuration files"
+#: src/cli/util/gnunet-config.c:136
+msgid ""
+"Parse main configuration from this command-line argument and not from disk"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:225
+#, fuzzy
+msgid "Failed to load default configuration, exiting ...\n"
+msgstr "Résolution de « %s » échouée\n"
+
+#: src/cli/util/gnunet-config.c:237
+#, fuzzy
+msgid "Failed to parse configuration, exiting ...\n"
+msgstr "Résolution de « %s » échouée\n"
+
+#: src/cli/util/gnunet-config.c:249 src/lib/util/program.c:287
+#, c-format
+msgid "Unreadable configuration file `%s', exiting ...\n"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:263 src/lib/util/program.c:299
+#, c-format
+msgid "Malformed configuration file `%s', exiting ...\n"
 msgstr ""
 
 #: src/cli/util/gnunet-crypto-tvg.c:1588
@@ -2039,55 +2073,54 @@ msgstr ""
 msgid "Hostkeys file `%s' not found\n"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:314
+#: src/cli/util/gnunet-ecc.c:318
 #, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:319 src/service/testing/list-keys.c:47
-#: src/service/testing/testing.c:308
+#: src/cli/util/gnunet-ecc.c:324
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:334
+#: src/cli/util/gnunet-ecc.c:340
 #, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:388
+#: src/cli/util/gnunet-ecc.c:394
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:452
+#: src/cli/util/gnunet-ecc.c:458
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:458
+#: src/cli/util/gnunet-ecc.c:464
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:464
+#: src/cli/util/gnunet-ecc.c:470
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:469
+#: src/cli/util/gnunet-ecc.c:475
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:474
+#: src/cli/util/gnunet-ecc.c:480
 msgid "print the private key in ASCII format"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:479
+#: src/cli/util/gnunet-ecc.c:485
 msgid "print the public key in HEX format"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:485
+#: src/cli/util/gnunet-ecc.c:491
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:499
+#: src/cli/util/gnunet-ecc.c:505
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
@@ -3149,13 +3182,13 @@ msgstr ""
 msgid "Invalid handle type while writing `%s'"
 msgstr ""
 
-#: src/lib/util/client.c:531 src/lib/util/service.c:1134
+#: src/lib/util/client.c:531 src/lib/util/service.c:1139
 #: src/service/arm/gnunet-service-arm.c:452
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/lib/util/client.c:536 src/lib/util/service.c:1138
+#: src/lib/util/client.c:536 src/lib/util/service.c:1143
 #: src/service/arm/gnunet-service-arm.c:456
 #, c-format
 msgid "Using `%s' instead\n"
@@ -3283,17 +3316,17 @@ msgstr ""
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/lib/util/crypto_ecc.c:554
+#: src/lib/util/crypto_ecc.c:569
 #, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/lib/util/crypto_ecc.c:677
+#: src/lib/util/crypto_ecc.c:692
 #, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/lib/util/crypto_ecc_setup.c:282 src/lib/util/crypto_ecc_setup.c:304
+#: src/lib/util/crypto_ecc_setup.c:282 src/lib/util/crypto_ecc_setup.c:305
 msgid "Could not load peer's private key\n"
 msgstr ""
 
@@ -3317,7 +3350,7 @@ msgstr ""
 msgid "Expected `%s' to be a directory!\n"
 msgstr ""
 
-#: src/lib/util/disk.c:1222 src/lib/util/service.c:1642
+#: src/lib/util/disk.c:1222 src/lib/util/service.c:1651
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr ""
@@ -3507,96 +3540,96 @@ msgstr ""
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:60
+#: src/lib/util/gnunet_error_codes.c:59
 msgid "No error (success)."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:66
+#: src/lib/util/gnunet_error_codes.c:65
 #, fuzzy
 msgid "Unknown and unspecified error."
 msgstr "%.s Code d'erreur inconnu"
 
-#: src/lib/util/gnunet_error_codes.c:72
+#: src/lib/util/gnunet_error_codes.c:71
 msgid "Communication with service failed."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:78
+#: src/lib/util/gnunet_error_codes.c:77
 #, fuzzy
 msgid "Ego not found."
 msgstr "upnpc introuvable\n"
 
-#: src/lib/util/gnunet_error_codes.c:84
+#: src/lib/util/gnunet_error_codes.c:83
 msgid "Identifier already in use for another ego."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:90
+#: src/lib/util/gnunet_error_codes.c:89
 msgid "The given ego is invalid or malformed."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:96
+#: src/lib/util/gnunet_error_codes.c:95
 #, fuzzy
 msgid "Unknown namestore error."
 msgstr "%.s Code d'erreur inconnu"
 
-#: src/lib/util/gnunet_error_codes.c:102 src/lib/util/gnunet_error_codes.c:120
+#: src/lib/util/gnunet_error_codes.c:101 src/lib/util/gnunet_error_codes.c:119
 #, fuzzy
 msgid "Zone iteration failed."
 msgstr "# Session TCP active"
 
-#: src/lib/util/gnunet_error_codes.c:108
+#: src/lib/util/gnunet_error_codes.c:107
 #, fuzzy
 msgid "Zone not found."
 msgstr "upnpc introuvable\n"
 
-#: src/lib/util/gnunet_error_codes.c:114
+#: src/lib/util/gnunet_error_codes.c:113
 #, fuzzy
 msgid "Record not found."
 msgstr "upnpc introuvable\n"
 
-#: src/lib/util/gnunet_error_codes.c:126
+#: src/lib/util/gnunet_error_codes.c:125
 msgid "Zone does not contain any records."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:132
+#: src/lib/util/gnunet_error_codes.c:131
 #, fuzzy
 msgid "Failed to lookup record."
 msgstr "Échec du démarrage de %s\n"
 
-#: src/lib/util/gnunet_error_codes.c:138
+#: src/lib/util/gnunet_error_codes.c:137
 msgid "No records given."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:144
+#: src/lib/util/gnunet_error_codes.c:143
 msgid "Record data invalid."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:150
+#: src/lib/util/gnunet_error_codes.c:149
 msgid "No label given."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:156
+#: src/lib/util/gnunet_error_codes.c:155
 #, fuzzy
 msgid "No results given."
 msgstr "# résultats introuvables"
 
-#: src/lib/util/gnunet_error_codes.c:162
+#: src/lib/util/gnunet_error_codes.c:161
 msgid "Record already exists."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:168
+#: src/lib/util/gnunet_error_codes.c:167
 msgid "Record size exceeds maximum limit."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:174
+#: src/lib/util/gnunet_error_codes.c:173
 msgid "There was an error in the database backend."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:180
+#: src/lib/util/gnunet_error_codes.c:179
 #, fuzzy
 msgid "Failed to store the given records."
 msgstr "Échec du démarrage de %s\n"
 
-#: src/lib/util/gnunet_error_codes.c:186
+#: src/lib/util/gnunet_error_codes.c:185
 msgid "Label invalid or malformed."
 msgstr ""
 
@@ -3662,16 +3695,6 @@ msgstr ""
 msgid "Could not determine plugin installation path.\n"
 msgstr ""
 
-#: src/lib/util/program.c:287
-#, c-format
-msgid "Unreadable configuration file `%s', exiting ...\n"
-msgstr ""
-
-#: src/lib/util/program.c:299
-#, c-format
-msgid "Malformed configuration file `%s', exiting ...\n"
-msgstr ""
-
 #: src/lib/util/program.c:314
 #, c-format
 msgid "Unreadable configuration file `%s'. Exiting ...\n"
@@ -3719,120 +3742,120 @@ msgstr ""
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/lib/util/service.c:654
+#: src/lib/util/service.c:650
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/lib/util/service.c:838
+#: src/lib/util/service.c:841
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
 
-#: src/lib/util/service.c:951
+#: src/lib/util/service.c:956
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/lib/util/service.c:992
+#: src/lib/util/service.c:997
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/lib/util/service.c:1095 src/lib/util/service.c:1101
+#: src/lib/util/service.c:1100 src/lib/util/service.c:1106
 #: src/service/arm/gnunet-service-arm.c:412
 #: src/service/arm/gnunet-service-arm.c:418
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/lib/util/service.c:1158 src/service/arm/gnunet-service-arm.c:484
+#: src/lib/util/service.c:1163 src/service/arm/gnunet-service-arm.c:484
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/lib/util/service.c:1176 src/service/arm/gnunet-service-arm.c:505
+#: src/lib/util/service.c:1181 src/service/arm/gnunet-service-arm.c:505
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/lib/util/service.c:1207 src/service/arm/gnunet-service-arm.c:536
+#: src/lib/util/service.c:1212 src/service/arm/gnunet-service-arm.c:536
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/lib/util/service.c:1226 src/service/arm/gnunet-service-arm.c:555
+#: src/lib/util/service.c:1231 src/service/arm/gnunet-service-arm.c:555
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr ""
 
-#: src/lib/util/service.c:1401
+#: src/lib/util/service.c:1406
 #, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr ""
 
-#: src/lib/util/service.c:1413
+#: src/lib/util/service.c:1418
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/lib/util/service.c:1420
+#: src/lib/util/service.c:1425
 #, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr ""
 
-#: src/lib/util/service.c:1481
+#: src/lib/util/service.c:1486
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/lib/util/service.c:1505
+#: src/lib/util/service.c:1510
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/lib/util/service.c:1573
+#: src/lib/util/service.c:1583
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/lib/util/service.c:1644
+#: src/lib/util/service.c:1653
 msgid "No such user"
 msgstr "Aucun utilisateur trouvé"
 
-#: src/lib/util/service.c:1658
+#: src/lib/util/service.c:1668
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr ""
 
-#: src/lib/util/service.c:1751
+#: src/lib/util/service.c:1767
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/lib/util/service.c:1756
+#: src/lib/util/service.c:1772
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/lib/util/service.c:1761
+#: src/lib/util/service.c:1777
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/lib/util/service.c:1960 src/lib/util/service.c:2255
+#: src/lib/util/service.c:1990 src/lib/util/service.c:2304
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/lib/util/service.c:2036 src/lib/util/service.c:2048
-#: src/lib/util/service.c:2298 src/lib/util/service.c:2310
-#: src/service/transport/transport-testing-communicator.c:1056
+#: src/lib/util/service.c:2065 src/lib/util/service.c:2080
+#: src/lib/util/service.c:2353 src/lib/util/service.c:2368
+#: src/service/transport/transport-testing-communicator.c:1059
 #, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr ""
 
-#: src/lib/util/service.c:2058 src/lib/util/service.c:2321
+#: src/lib/util/service.c:2092 src/lib/util/service.c:2381
 msgid "Malformed configuration, exit ...\n"
 msgstr ""
 
@@ -4285,6 +4308,11 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
+#: src/service/arm/testing_arm_cmd_start_peer.c:197
+#, c-format
+msgid "Failed to start `%s': %s\n"
+msgstr ""
+
 #: src/service/core/gnunet-service-core.c:329
 msgid "# send requests dropped (disconnected)"
 msgstr ""
@@ -4446,8 +4474,8 @@ msgstr ""
 #: src/service/core/gnunet-service-core_sessions.c:337
 #: src/service/fs/gnunet-service-fs_cp.c:484
 #: src/service/fs/gnunet-service-fs_cp.c:1377
-#: src/service/topology/gnunet-daemon-topology.c:551
-#: src/service/topology/gnunet-daemon-topology.c:633
+#: src/service/topology/gnunet-daemon-topology.c:545
+#: src/service/topology/gnunet-daemon-topology.c:627
 msgid "# peers connected"
 msgstr ""
 
@@ -5437,7 +5465,7 @@ msgstr ""
 
 #: src/service/fs/gnunet-service-fs.c:1271
 #: src/service/hostlist/gnunet-daemon-hostlist.c:343
-#: src/service/topology/gnunet-daemon-topology.c:1066
+#: src/service/topology/gnunet-daemon-topology.c:1062
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr ""
@@ -6222,7 +6250,7 @@ msgid "# hostlist advertisements send"
 msgstr ""
 
 #: src/service/hostlist/gnunet-daemon-hostlist_server.c:483
-#: src/service/topology/gnunet-daemon-topology.c:786
+#: src/service/topology/gnunet-daemon-topology.c:781
 #, c-format
 msgid "Error in communication with PEERSTORE service: %s\n"
 msgstr ""
@@ -6476,11 +6504,11 @@ msgstr ""
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/service/nat/gnunet-service-nat.c:1861
+#: src/service/nat/gnunet-service-nat.c:1860
 msgid "Connection reversal request failed\n"
 msgstr ""
 
-#: src/service/nat/gnunet-service-nat.c:1935
+#: src/service/nat/gnunet-service-nat.c:1999
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
@@ -6504,41 +6532,41 @@ msgstr ""
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1141
+#: src/service/peerstore/gnunet-service-peerstore.c:1150
 #, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr ""
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1214
+#: src/service/peerstore/gnunet-service-peerstore.c:1223
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "Impossible d’ouvrir « %s ».\n"
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1233
+#: src/service/peerstore/gnunet-service-peerstore.c:1242
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1244
+#: src/service/peerstore/gnunet-service-peerstore.c:1253
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/service/peerstore/peerstore_api.c:574
+#: src/service/peerstore/peerstore_api.c:579
 msgid "Unexpected store response.\n"
 msgstr ""
 
-#: src/service/peerstore/peerstore_api.c:606
+#: src/service/peerstore/peerstore_api.c:620
 msgid "Unexpected iteration response.\n"
 msgstr ""
 
-#: src/service/peerstore/peerstore_api.c:652
+#: src/service/peerstore/peerstore_api.c:666
 msgid ""
 "Unexpected iteration response, no iterating client found, discarding "
 "message.\n"
 msgstr ""
 
-#: src/service/peerstore/peerstore_api.c:662
-#: src/service/peerstore/peerstore_api_monitor.c:164
+#: src/service/peerstore/peerstore_api.c:676
+#: src/service/peerstore/peerstore_api_monitor.c:163
 msgid "Received a malformed response from service."
 msgstr ""
 
@@ -6696,11 +6724,11 @@ msgstr ""
 msgid "Namestore REST API initialized\n"
 msgstr ""
 
-#: src/service/rest/openid_plugin.c:3102
+#: src/service/rest/openid_plugin.c:3121
 msgid "OpenID Connect REST API initialized\n"
 msgstr ""
 
-#: src/service/rest/pabc_plugin.c:637 src/service/rest/reclaim_plugin.c:1523
+#: src/service/rest/pabc_plugin.c:637 src/service/rest/reclaim_plugin.c:1494
 msgid "Identity Provider REST API initialized\n"
 msgstr ""
 
@@ -6747,148 +6775,50 @@ msgstr ""
 msgid "Could not save some persistent statistics\n"
 msgstr ""
 
-#: src/service/testing/gnunet-testing.c:185
-#, c-format
-msgid "Could not extract hostkey %u (offset too large?)\n"
-msgstr ""
-
-#: src/service/testing/gnunet-testing.c:275
-#, c-format
-msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
+#: src/service/testbed/gnunet-testbed.c:196
+msgid "number of unique configuration files to create"
 msgstr ""
 
-#: src/service/testing/gnunet-testing.c:386
-msgid "create unique configuration files"
-msgstr ""
-
-#: src/service/testing/gnunet-testing.c:392
-msgid "extract hostkey file from pre-computed hostkey list"
-msgstr ""
-
-#: src/service/testing/gnunet-testing.c:400
-msgid ""
-"number of unique configuration files to create, or number of the hostkey to "
-"extract"
-msgstr ""
-
-#: src/service/testing/gnunet-testing.c:407
+#: src/service/testbed/gnunet-testbed.c:202
 msgid "configuration template"
 msgstr ""
 
-#: src/service/testing/gnunet-testing.c:415
-msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
-msgstr ""
-
-#: src/service/testing/gnunet-testing.c:432
+#: src/service/testbed/gnunet-testbed.c:218
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/service/testing/list-keys.c:92
-msgid "list COUNT number of keys"
-msgstr ""
-
-#: src/service/testing/testing.c:291
-#, c-format
-msgid "Hostkeys file not found: %s\n"
-msgstr ""
-
-#: src/service/testing/testing.c:743
-#, c-format
-msgid "Key number %u does not exist\n"
-msgstr ""
-
-#: src/service/testing/testing.c:1217
-#, c-format
-msgid ""
-"You attempted to create a testbed with more than %u hosts.  Please "
-"precompute more hostkeys first.\n"
-msgstr ""
-
-#: src/service/testing/testing.c:1226
-#, c-format
-msgid "Failed to initialize hostkey for peer %u\n"
-msgstr ""
-
-#: src/service/testing/testing.c:1236
-msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
-msgstr ""
-
-#: src/service/testing/testing.c:1249
-msgid "Failed to create configuration for peer (not enough free ports?)\n"
-msgstr ""
-
-#: src/service/testing/testing.c:1265
-#, c-format
-msgid "Cannot open hostkey file `%s': %s\n"
-msgstr ""
-
-#: src/service/testing/testing.c:1279
-#, c-format
-msgid "Failed to write hostkey file for peer %u: %s\n"
-msgstr ""
-
-#: src/service/testing/testing.c:1307
-#, c-format
-msgid "Failed to write configuration file `%s' for peer %u: %s\n"
-msgstr ""
-
-#: src/service/testing/testing.c:1413
-#, c-format
-msgid "Failed to start `%s': %s\n"
-msgstr ""
-
-#: src/service/testing/testing.c:1664
-#, c-format
-msgid "Failed to load configuration from %s\n"
-msgstr ""
-
-#: src/service/testing/testing.c:2795
-#, c-format
-msgid "Topology file %s not found\n"
-msgstr ""
-
-#: src/service/testing/testing.c:2803
-#, c-format
-msgid "Topology file %s has no data\n"
-msgstr ""
-
-#: src/service/testing/testing.c:2811
-#, c-format
-msgid "Topology file %s cannot be read\n"
-msgstr ""
-
 #: src/service/topology/gnunet-daemon-topology.c:286
 msgid "# connect requests issued to ATS"
 msgstr ""
 
-#: src/service/topology/gnunet-daemon-topology.c:480
+#: src/service/topology/gnunet-daemon-topology.c:475
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/service/topology/gnunet-daemon-topology.c:752
+#: src/service/topology/gnunet-daemon-topology.c:747
 msgid "Error in communication with PEERSTORE service to monitor.\n"
 msgstr ""
 
-#: src/service/topology/gnunet-daemon-topology.c:761
+#: src/service/topology/gnunet-daemon-topology.c:756
 msgid "Finished initial PEERSTORE iteration in monitor.\n"
 msgstr ""
 
-#: src/service/topology/gnunet-daemon-topology.c:869
+#: src/service/topology/gnunet-daemon-topology.c:864
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/service/topology/gnunet-daemon-topology.c:943
+#: src/service/topology/gnunet-daemon-topology.c:938
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/service/topology/gnunet-daemon-topology.c:1095
+#: src/service/topology/gnunet-daemon-topology.c:1091
 msgid "GNUnet topology control"
 msgstr ""
 
 #: src/service/transport/gnunet-communicator-quic.c:1717
 #: src/service/transport/gnunet-communicator-tcp.c:3814
-#: src/service/transport/gnunet-communicator-udp.c:3562
-#: src/service/transport/gnunet-service-transport.c:12124
+#: src/service/transport/gnunet-communicator-udp.c:3579
+#: src/service/transport/gnunet-service-transport.c:12543
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
@@ -6900,7 +6830,7 @@ msgstr ""
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/service/transport/gnunet-communicator-udp.c:3637
+#: src/service/transport/gnunet-communicator-udp.c:3654
 msgid "GNUnet UDP communicator"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 81031a764..3f56d09af 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2024-03-15 09:19+0100\n"
+"POT-Creation-Date: 2024-05-20 20:21+0200\n"
 "PO-Revision-Date: 2019-10-16 11:00+0200\n"
 "Last-Translator: Sebastiano Pistore <sebastianopistore.info@protonmail.ch>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -335,24 +335,24 @@ msgstr ""
 msgid "Failed to connect to CORE service!\n"
 msgstr ""
 
-#: src/cli/core/gnunet-core.c:212
+#: src/cli/core/gnunet-core.c:213
 msgid "No argument given.\n"
 msgstr ""
 
-#: src/cli/core/gnunet-core.c:235 src/service/transport/gnunet-transport.c:1389
+#: src/cli/core/gnunet-core.c:238 src/service/transport/gnunet-transport.c:1389
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
-#: src/cli/core/gnunet-core.c:241
+#: src/cli/core/gnunet-core.c:244
 msgid "Show our current peer identity"
 msgstr ""
 
-#: src/cli/core/gnunet-core.c:248
+#: src/cli/core/gnunet-core.c:251
 #, fuzzy
 msgid "Show current connections"
 msgstr "# connessioni attive"
 
-#: src/cli/core/gnunet-core.c:259
+#: src/cli/core/gnunet-core.c:262
 msgid "Print information about connected peers."
 msgstr ""
 
@@ -1047,52 +1047,52 @@ msgstr ""
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:268
+#: src/cli/gns/gnunet-gns.c:269
 #, fuzzy, c-format
 msgid "`%s' is not a valid DNS domain name\n"
 msgstr "`%s' non è un indirizzo IP valido.\n"
 
-#: src/cli/gns/gnunet-gns.c:279 src/lib/util/dnsparser.c:273
+#: src/cli/gns/gnunet-gns.c:280 src/lib/util/dnsparser.c:273
 #, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:294
+#: src/cli/gns/gnunet-gns.c:295
 msgid "Cannot resolve using GNS: GNUnet peer not running\n"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:305
+#: src/cli/gns/gnunet-gns.c:306
 #: src/contrib/service/abd/gnunet-service-abd.c:1745
 #, c-format
 msgid "Failed to connect to GNS\n"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:318
+#: src/cli/gns/gnunet-gns.c:325
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:358
+#: src/cli/gns/gnunet-gns.c:365
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:364
+#: src/cli/gns/gnunet-gns.c:371
 msgid "Specify the type of the record to lookup"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:370
+#: src/cli/gns/gnunet-gns.c:377
 msgid "Specify a timeout for the lookup"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:374
+#: src/cli/gns/gnunet-gns.c:381
 msgid "No unneeded output"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:379
+#: src/cli/gns/gnunet-gns.c:386
 msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:393
+#: src/cli/gns/gnunet-gns.c:400
 msgid "GNUnet GNS resolver tool"
 msgstr ""
 
@@ -1605,7 +1605,11 @@ msgstr ""
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/cli/nse/gnunet-nse.c:124
+#: src/cli/nse/gnunet-nse.c:126
+msgid "Monitor and output current estimates"
+msgstr ""
+
+#: src/cli/nse/gnunet-nse.c:137
 msgid "Show network size estimates from NSE service."
 msgstr ""
 
@@ -1653,86 +1657,90 @@ msgstr ""
 msgid "The time until the DID Document is going to expire (e.g. 5d)"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:805
+#: src/cli/reclaim/gnunet-reclaim.c:813
 #, c-format
 msgid "Ego is required\n"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:812
+#: src/cli/reclaim/gnunet-reclaim.c:820
 #, c-format
 msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:819
+#: src/cli/reclaim/gnunet-reclaim.c:827
 #, c-format
 msgid "Requesting party key is required!\n"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:837
+#: src/cli/reclaim/gnunet-reclaim.c:846
 msgid "Add or update an attribute NAME"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:842
+#: src/cli/reclaim/gnunet-reclaim.c:851
 msgid "Delete the attribute with ID"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:847
+#: src/cli/reclaim/gnunet-reclaim.c:856
 msgid "The attribute VALUE"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:852
+#: src/cli/reclaim/gnunet-reclaim.c:861
 msgid "The EGO to use"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:858
+#: src/cli/reclaim/gnunet-reclaim.c:867
 msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:862
+#: src/cli/reclaim/gnunet-reclaim.c:873
+msgid "Specify the relying party URI for a ticket to consume"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:877
 msgid "List attributes for EGO"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:866
+#: src/cli/reclaim/gnunet-reclaim.c:881
 msgid "List credentials for EGO"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:872
+#: src/cli/reclaim/gnunet-reclaim.c:887
 msgid "Credential to use for attribute"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:877
+#: src/cli/reclaim/gnunet-reclaim.c:892
 msgid "Credential name"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:883
+#: src/cli/reclaim/gnunet-reclaim.c:898
 msgid "Issue a ticket for a set of attributes separated by comma"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:888
+#: src/cli/reclaim/gnunet-reclaim.c:903
 msgid "Consume a ticket"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:893
+#: src/cli/reclaim/gnunet-reclaim.c:908
 msgid "Revoke a ticket"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:898
+#: src/cli/reclaim/gnunet-reclaim.c:913
 msgid "Type of attribute"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:903
+#: src/cli/reclaim/gnunet-reclaim.c:918
 msgid "Type of credential"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:907
+#: src/cli/reclaim/gnunet-reclaim.c:922
 msgid "List tickets of ego"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:913
+#: src/cli/reclaim/gnunet-reclaim.c:928
 msgid "Expiration interval of the attribute"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:921
+#: src/cli/reclaim/gnunet-reclaim.c:936
 msgid "re:claimID command line tool"
 msgstr ""
 
@@ -1964,34 +1972,60 @@ msgstr ""
 msgid "run decoder modus, otherwise runs as encoder"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:154
+#: src/cli/util/gnunet-config.c:101
 msgid "test if the current installation supports the specified BACKEND"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:160
+#: src/cli/util/gnunet-config.c:107
 msgid ""
 "Provide an appropriate value for CFLAGS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:165
+#: src/cli/util/gnunet-config.c:112
 msgid "Is this an experimental build of GNUnet"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:171
+#: src/cli/util/gnunet-config.c:118
 msgid ""
 "Provide an appropriate value for LIBS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:177
+#: src/cli/util/gnunet-config.c:123
+#, fuzzy
+msgid "Do not parse default configuration files"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
+#: src/cli/util/gnunet-config.c:129
 msgid "Provide the path under which GNUnet was installed"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:192
-msgid "Manipulate GNUnet configuration files"
+#: src/cli/util/gnunet-config.c:136
+msgid ""
+"Parse main configuration from this command-line argument and not from disk"
 msgstr ""
 
+#: src/cli/util/gnunet-config.c:225
+#, fuzzy
+msgid "Failed to load default configuration, exiting ...\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
+#: src/cli/util/gnunet-config.c:237
+#, fuzzy
+msgid "Failed to parse configuration, exiting ...\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
+#: src/cli/util/gnunet-config.c:249 src/lib/util/program.c:287
+#, fuzzy, c-format
+msgid "Unreadable configuration file `%s', exiting ...\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
+#: src/cli/util/gnunet-config.c:263 src/lib/util/program.c:299
+#, fuzzy, c-format
+msgid "Malformed configuration file `%s', exiting ...\n"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
 #: src/cli/util/gnunet-crypto-tvg.c:1588
 msgid "verify a test vector from stdin"
 msgstr ""
@@ -2039,55 +2073,54 @@ msgstr ""
 msgid "Hostkeys file `%s' not found\n"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:314
+#: src/cli/util/gnunet-ecc.c:318
 #, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:319 src/service/testing/list-keys.c:47
-#: src/service/testing/testing.c:308
+#: src/cli/util/gnunet-ecc.c:324
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:334
+#: src/cli/util/gnunet-ecc.c:340
 #, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:388
+#: src/cli/util/gnunet-ecc.c:394
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:452
+#: src/cli/util/gnunet-ecc.c:458
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:458
+#: src/cli/util/gnunet-ecc.c:464
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:464
+#: src/cli/util/gnunet-ecc.c:470
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:469
+#: src/cli/util/gnunet-ecc.c:475
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:474
+#: src/cli/util/gnunet-ecc.c:480
 msgid "print the private key in ASCII format"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:479
+#: src/cli/util/gnunet-ecc.c:485
 msgid "print the public key in HEX format"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:485
+#: src/cli/util/gnunet-ecc.c:491
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:499
+#: src/cli/util/gnunet-ecc.c:505
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
@@ -3150,13 +3183,13 @@ msgstr ""
 msgid "Invalid handle type while writing `%s'"
 msgstr ""
 
-#: src/lib/util/client.c:531 src/lib/util/service.c:1134
+#: src/lib/util/client.c:531 src/lib/util/service.c:1139
 #: src/service/arm/gnunet-service-arm.c:452
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/lib/util/client.c:536 src/lib/util/service.c:1138
+#: src/lib/util/client.c:536 src/lib/util/service.c:1143
 #: src/service/arm/gnunet-service-arm.c:456
 #, c-format
 msgid "Using `%s' instead\n"
@@ -3284,17 +3317,17 @@ msgstr ""
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/lib/util/crypto_ecc.c:554
+#: src/lib/util/crypto_ecc.c:569
 #, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/lib/util/crypto_ecc.c:677
+#: src/lib/util/crypto_ecc.c:692
 #, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/lib/util/crypto_ecc_setup.c:282 src/lib/util/crypto_ecc_setup.c:304
+#: src/lib/util/crypto_ecc_setup.c:282 src/lib/util/crypto_ecc_setup.c:305
 msgid "Could not load peer's private key\n"
 msgstr ""
 
@@ -3318,7 +3351,7 @@ msgstr ""
 msgid "Expected `%s' to be a directory!\n"
 msgstr ""
 
-#: src/lib/util/disk.c:1222 src/lib/util/service.c:1642
+#: src/lib/util/disk.c:1222 src/lib/util/service.c:1651
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr ""
@@ -3508,95 +3541,95 @@ msgstr ""
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:60
+#: src/lib/util/gnunet_error_codes.c:59
 msgid "No error (success)."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:66
+#: src/lib/util/gnunet_error_codes.c:65
 #, fuzzy
 msgid "Unknown and unspecified error."
 msgstr "Comando `%s' sconosciuto.\n"
 
-#: src/lib/util/gnunet_error_codes.c:72
+#: src/lib/util/gnunet_error_codes.c:71
 msgid "Communication with service failed."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:78
+#: src/lib/util/gnunet_error_codes.c:77
 #, fuzzy
 msgid "Ego not found."
 msgstr "Contenuto non trovato"
 
-#: src/lib/util/gnunet_error_codes.c:84
+#: src/lib/util/gnunet_error_codes.c:83
 msgid "Identifier already in use for another ego."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:90
+#: src/lib/util/gnunet_error_codes.c:89
 msgid "The given ego is invalid or malformed."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:96
+#: src/lib/util/gnunet_error_codes.c:95
 #, fuzzy
 msgid "Unknown namestore error."
 msgstr "Comando `%s' sconosciuto.\n"
 
-#: src/lib/util/gnunet_error_codes.c:102 src/lib/util/gnunet_error_codes.c:120
+#: src/lib/util/gnunet_error_codes.c:101 src/lib/util/gnunet_error_codes.c:119
 #, fuzzy
 msgid "Zone iteration failed."
 msgstr "# connessioni attive"
 
-#: src/lib/util/gnunet_error_codes.c:108
+#: src/lib/util/gnunet_error_codes.c:107
 #, fuzzy
 msgid "Zone not found."
 msgstr "Contenuto non trovato"
 
-#: src/lib/util/gnunet_error_codes.c:114
+#: src/lib/util/gnunet_error_codes.c:113
 #, fuzzy
 msgid "Record not found."
 msgstr "upnpc non trovato\n"
 
-#: src/lib/util/gnunet_error_codes.c:126
+#: src/lib/util/gnunet_error_codes.c:125
 msgid "Zone does not contain any records."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:132
+#: src/lib/util/gnunet_error_codes.c:131
 #, fuzzy
 msgid "Failed to lookup record."
 msgstr "Impossibile avviare il servizio.\n"
 
-#: src/lib/util/gnunet_error_codes.c:138
+#: src/lib/util/gnunet_error_codes.c:137
 msgid "No records given."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:144
+#: src/lib/util/gnunet_error_codes.c:143
 msgid "Record data invalid."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:150
+#: src/lib/util/gnunet_error_codes.c:149
 msgid "No label given."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:156
+#: src/lib/util/gnunet_error_codes.c:155
 msgid "No results given."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:162
+#: src/lib/util/gnunet_error_codes.c:161
 msgid "Record already exists."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:168
+#: src/lib/util/gnunet_error_codes.c:167
 msgid "Record size exceeds maximum limit."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:174
+#: src/lib/util/gnunet_error_codes.c:173
 msgid "There was an error in the database backend."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:180
+#: src/lib/util/gnunet_error_codes.c:179
 #, fuzzy
 msgid "Failed to store the given records."
 msgstr "Impossibile avviare il servizio.\n"
 
-#: src/lib/util/gnunet_error_codes.c:186
+#: src/lib/util/gnunet_error_codes.c:185
 msgid "Label invalid or malformed."
 msgstr ""
 
@@ -3662,16 +3695,6 @@ msgstr ""
 msgid "Could not determine plugin installation path.\n"
 msgstr ""
 
-#: src/lib/util/program.c:287
-#, fuzzy, c-format
-msgid "Unreadable configuration file `%s', exiting ...\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
-
-#: src/lib/util/program.c:299
-#, fuzzy, c-format
-msgid "Malformed configuration file `%s', exiting ...\n"
-msgstr "Impossibile avviare il servizio ' %s'\n"
-
 #: src/lib/util/program.c:314
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s'. Exiting ...\n"
@@ -3720,120 +3743,120 @@ msgstr ""
 msgid "Could not resolve our FQDN: %s\n"
 msgstr ""
 
-#: src/lib/util/service.c:654
+#: src/lib/util/service.c:650
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/lib/util/service.c:838
+#: src/lib/util/service.c:841
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
 
-#: src/lib/util/service.c:951
+#: src/lib/util/service.c:956
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/lib/util/service.c:992
+#: src/lib/util/service.c:997
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/lib/util/service.c:1095 src/lib/util/service.c:1101
+#: src/lib/util/service.c:1100 src/lib/util/service.c:1106
 #: src/service/arm/gnunet-service-arm.c:412
 #: src/service/arm/gnunet-service-arm.c:418
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/lib/util/service.c:1158 src/service/arm/gnunet-service-arm.c:484
+#: src/lib/util/service.c:1163 src/service/arm/gnunet-service-arm.c:484
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/lib/util/service.c:1176 src/service/arm/gnunet-service-arm.c:505
+#: src/lib/util/service.c:1181 src/service/arm/gnunet-service-arm.c:505
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/lib/util/service.c:1207 src/service/arm/gnunet-service-arm.c:536
+#: src/lib/util/service.c:1212 src/service/arm/gnunet-service-arm.c:536
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr ""
 
-#: src/lib/util/service.c:1226 src/service/arm/gnunet-service-arm.c:555
+#: src/lib/util/service.c:1231 src/service/arm/gnunet-service-arm.c:555
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr ""
 
-#: src/lib/util/service.c:1401
+#: src/lib/util/service.c:1406
 #, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr ""
 
-#: src/lib/util/service.c:1413
+#: src/lib/util/service.c:1418
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/lib/util/service.c:1420
+#: src/lib/util/service.c:1425
 #, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr ""
 
-#: src/lib/util/service.c:1481
+#: src/lib/util/service.c:1486
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/lib/util/service.c:1505
+#: src/lib/util/service.c:1510
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/lib/util/service.c:1573
+#: src/lib/util/service.c:1583
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/lib/util/service.c:1644
+#: src/lib/util/service.c:1653
 msgid "No such user"
 msgstr ""
 
-#: src/lib/util/service.c:1658
+#: src/lib/util/service.c:1668
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr ""
 
-#: src/lib/util/service.c:1751
+#: src/lib/util/service.c:1767
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/lib/util/service.c:1756
+#: src/lib/util/service.c:1772
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/lib/util/service.c:1761
+#: src/lib/util/service.c:1777
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/lib/util/service.c:1960 src/lib/util/service.c:2255
+#: src/lib/util/service.c:1990 src/lib/util/service.c:2304
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/lib/util/service.c:2036 src/lib/util/service.c:2048
-#: src/lib/util/service.c:2298 src/lib/util/service.c:2310
-#: src/service/transport/transport-testing-communicator.c:1056
+#: src/lib/util/service.c:2065 src/lib/util/service.c:2080
+#: src/lib/util/service.c:2353 src/lib/util/service.c:2368
+#: src/service/transport/transport-testing-communicator.c:1059
 #, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr ""
 
-#: src/lib/util/service.c:2058 src/lib/util/service.c:2321
+#: src/lib/util/service.c:2092 src/lib/util/service.c:2381
 msgid "Malformed configuration, exit ...\n"
 msgstr ""
 
@@ -4286,6 +4309,11 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
+#: src/service/arm/testing_arm_cmd_start_peer.c:197
+#, c-format
+msgid "Failed to start `%s': %s\n"
+msgstr ""
+
 #: src/service/core/gnunet-service-core.c:329
 msgid "# send requests dropped (disconnected)"
 msgstr ""
@@ -4451,8 +4479,8 @@ msgstr ""
 #: src/service/core/gnunet-service-core_sessions.c:337
 #: src/service/fs/gnunet-service-fs_cp.c:484
 #: src/service/fs/gnunet-service-fs_cp.c:1377
-#: src/service/topology/gnunet-daemon-topology.c:551
-#: src/service/topology/gnunet-daemon-topology.c:633
+#: src/service/topology/gnunet-daemon-topology.c:545
+#: src/service/topology/gnunet-daemon-topology.c:627
 msgid "# peers connected"
 msgstr "# nodi connessi"
 
@@ -5452,7 +5480,7 @@ msgstr ""
 
 #: src/service/fs/gnunet-service-fs.c:1271
 #: src/service/hostlist/gnunet-daemon-hostlist.c:343
-#: src/service/topology/gnunet-daemon-topology.c:1066
+#: src/service/topology/gnunet-daemon-topology.c:1062
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr ""
@@ -6243,7 +6271,7 @@ msgid "# hostlist advertisements send"
 msgstr ""
 
 #: src/service/hostlist/gnunet-daemon-hostlist_server.c:483
-#: src/service/topology/gnunet-daemon-topology.c:786
+#: src/service/topology/gnunet-daemon-topology.c:781
 #, c-format
 msgid "Error in communication with PEERSTORE service: %s\n"
 msgstr ""
@@ -6500,11 +6528,11 @@ msgstr ""
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/service/nat/gnunet-service-nat.c:1861
+#: src/service/nat/gnunet-service-nat.c:1860
 msgid "Connection reversal request failed\n"
 msgstr ""
 
-#: src/service/nat/gnunet-service-nat.c:1935
+#: src/service/nat/gnunet-service-nat.c:1999
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
@@ -6528,41 +6556,41 @@ msgstr ""
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1141
+#: src/service/peerstore/gnunet-service-peerstore.c:1150
 #, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr ""
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1214
+#: src/service/peerstore/gnunet-service-peerstore.c:1223
 #, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr ""
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1233
+#: src/service/peerstore/gnunet-service-peerstore.c:1242
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1244
+#: src/service/peerstore/gnunet-service-peerstore.c:1253
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/service/peerstore/peerstore_api.c:574
+#: src/service/peerstore/peerstore_api.c:579
 msgid "Unexpected store response.\n"
 msgstr ""
 
-#: src/service/peerstore/peerstore_api.c:606
+#: src/service/peerstore/peerstore_api.c:620
 msgid "Unexpected iteration response.\n"
 msgstr ""
 
-#: src/service/peerstore/peerstore_api.c:652
+#: src/service/peerstore/peerstore_api.c:666
 msgid ""
 "Unexpected iteration response, no iterating client found, discarding "
 "message.\n"
 msgstr ""
 
-#: src/service/peerstore/peerstore_api.c:662
-#: src/service/peerstore/peerstore_api_monitor.c:164
+#: src/service/peerstore/peerstore_api.c:676
+#: src/service/peerstore/peerstore_api_monitor.c:163
 msgid "Received a malformed response from service."
 msgstr ""
 
@@ -6721,11 +6749,11 @@ msgstr ""
 msgid "Namestore REST API initialized\n"
 msgstr ""
 
-#: src/service/rest/openid_plugin.c:3102
+#: src/service/rest/openid_plugin.c:3121
 msgid "OpenID Connect REST API initialized\n"
 msgstr ""
 
-#: src/service/rest/pabc_plugin.c:637 src/service/rest/reclaim_plugin.c:1523
+#: src/service/rest/pabc_plugin.c:637 src/service/rest/reclaim_plugin.c:1494
 msgid "Identity Provider REST API initialized\n"
 msgstr ""
 
@@ -6773,148 +6801,50 @@ msgstr ""
 msgid "Could not save some persistent statistics\n"
 msgstr ""
 
-#: src/service/testing/gnunet-testing.c:185
-#, c-format
-msgid "Could not extract hostkey %u (offset too large?)\n"
-msgstr ""
-
-#: src/service/testing/gnunet-testing.c:275
-#, c-format
-msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
+#: src/service/testbed/gnunet-testbed.c:196
+msgid "number of unique configuration files to create"
 msgstr ""
 
-#: src/service/testing/gnunet-testing.c:386
-msgid "create unique configuration files"
-msgstr ""
-
-#: src/service/testing/gnunet-testing.c:392
-msgid "extract hostkey file from pre-computed hostkey list"
-msgstr ""
-
-#: src/service/testing/gnunet-testing.c:400
-msgid ""
-"number of unique configuration files to create, or number of the hostkey to "
-"extract"
-msgstr ""
-
-#: src/service/testing/gnunet-testing.c:407
+#: src/service/testbed/gnunet-testbed.c:202
 msgid "configuration template"
 msgstr ""
 
-#: src/service/testing/gnunet-testing.c:415
-msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
-msgstr ""
-
-#: src/service/testing/gnunet-testing.c:432
+#: src/service/testbed/gnunet-testbed.c:218
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/service/testing/list-keys.c:92
-msgid "list COUNT number of keys"
-msgstr ""
-
-#: src/service/testing/testing.c:291
-#, c-format
-msgid "Hostkeys file not found: %s\n"
-msgstr ""
-
-#: src/service/testing/testing.c:743
-#, c-format
-msgid "Key number %u does not exist\n"
-msgstr ""
-
-#: src/service/testing/testing.c:1217
-#, c-format
-msgid ""
-"You attempted to create a testbed with more than %u hosts.  Please "
-"precompute more hostkeys first.\n"
-msgstr ""
-
-#: src/service/testing/testing.c:1226
-#, c-format
-msgid "Failed to initialize hostkey for peer %u\n"
-msgstr ""
-
-#: src/service/testing/testing.c:1236
-msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
-msgstr ""
-
-#: src/service/testing/testing.c:1249
-msgid "Failed to create configuration for peer (not enough free ports?)\n"
-msgstr ""
-
-#: src/service/testing/testing.c:1265
-#, c-format
-msgid "Cannot open hostkey file `%s': %s\n"
-msgstr ""
-
-#: src/service/testing/testing.c:1279
-#, c-format
-msgid "Failed to write hostkey file for peer %u: %s\n"
-msgstr ""
-
-#: src/service/testing/testing.c:1307
-#, c-format
-msgid "Failed to write configuration file `%s' for peer %u: %s\n"
-msgstr ""
-
-#: src/service/testing/testing.c:1413
-#, c-format
-msgid "Failed to start `%s': %s\n"
-msgstr ""
-
-#: src/service/testing/testing.c:1664
-#, c-format
-msgid "Failed to load configuration from %s\n"
-msgstr ""
-
-#: src/service/testing/testing.c:2795
-#, c-format
-msgid "Topology file %s not found\n"
-msgstr ""
-
-#: src/service/testing/testing.c:2803
-#, c-format
-msgid "Topology file %s has no data\n"
-msgstr ""
-
-#: src/service/testing/testing.c:2811
-#, c-format
-msgid "Topology file %s cannot be read\n"
-msgstr ""
-
 #: src/service/topology/gnunet-daemon-topology.c:286
 msgid "# connect requests issued to ATS"
 msgstr ""
 
-#: src/service/topology/gnunet-daemon-topology.c:480
+#: src/service/topology/gnunet-daemon-topology.c:475
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/service/topology/gnunet-daemon-topology.c:752
+#: src/service/topology/gnunet-daemon-topology.c:747
 msgid "Error in communication with PEERSTORE service to monitor.\n"
 msgstr ""
 
-#: src/service/topology/gnunet-daemon-topology.c:761
+#: src/service/topology/gnunet-daemon-topology.c:756
 msgid "Finished initial PEERSTORE iteration in monitor.\n"
 msgstr ""
 
-#: src/service/topology/gnunet-daemon-topology.c:869
+#: src/service/topology/gnunet-daemon-topology.c:864
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/service/topology/gnunet-daemon-topology.c:943
+#: src/service/topology/gnunet-daemon-topology.c:938
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/service/topology/gnunet-daemon-topology.c:1095
+#: src/service/topology/gnunet-daemon-topology.c:1091
 msgid "GNUnet topology control"
 msgstr ""
 
 #: src/service/transport/gnunet-communicator-quic.c:1717
 #: src/service/transport/gnunet-communicator-tcp.c:3814
-#: src/service/transport/gnunet-communicator-udp.c:3562
-#: src/service/transport/gnunet-service-transport.c:12124
+#: src/service/transport/gnunet-communicator-udp.c:3579
+#: src/service/transport/gnunet-service-transport.c:12543
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
@@ -6926,7 +6856,7 @@ msgstr ""
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/service/transport/gnunet-communicator-udp.c:3637
+#: src/service/transport/gnunet-communicator-udp.c:3654
 msgid "GNUnet UDP communicator"
 msgstr ""
 
diff --git a/po/sr.po b/po/sr.po
index da403fa6b..9b4e07ef6 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2024-03-15 09:19+0100\n"
+"POT-Creation-Date: 2024-05-20 20:21+0200\n"
 "PO-Revision-Date: 2020-10-23 18:39+0200\n"
 "Last-Translator: Миро�лав �иколић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
@@ -349,26 +349,26 @@ msgstr "Ð�иÑ�ам уÑ�пео да обрадим идентитет парњаÐ
 msgid "Failed to connect to CORE service!\n"
 msgstr "�и�ам у�пео да �е повежем �а ЈЕЗГРЕ�ОМ у�лугом!\n"
 
-#: src/cli/core/gnunet-core.c:212
+#: src/cli/core/gnunet-core.c:213
 #, fuzzy
 msgid "No argument given.\n"
 msgstr "�и�у дате опције\n"
 
-#: src/cli/core/gnunet-core.c:235 src/service/transport/gnunet-transport.c:1389
+#: src/cli/core/gnunet-core.c:238 src/service/transport/gnunet-transport.c:1389
 msgid "provide information about all current connections (continuously)"
 msgstr "обезбеђује податке о �вим тренутним везама (непрекидно)"
 
-#: src/cli/core/gnunet-core.c:241
+#: src/cli/core/gnunet-core.c:244
 #, fuzzy
 msgid "Show our current peer identity"
 msgstr "идентитет парњака"
 
-#: src/cli/core/gnunet-core.c:248
+#: src/cli/core/gnunet-core.c:251
 #, fuzzy
 msgid "Show current connections"
 msgstr "# активних веза"
 
-#: src/cli/core/gnunet-core.c:259
+#: src/cli/core/gnunet-core.c:262
 msgid "Print information about connected peers."
 msgstr "И�пи�ује податке о повезаним парњацима."
 
@@ -1098,53 +1098,53 @@ msgstr ""
 "Поништава индек�ирање датотеке која је претходно била индек�ирана �а „gnunet-"
 "publish“."
 
-#: src/cli/gns/gnunet-gns.c:268
+#: src/cli/gns/gnunet-gns.c:269
 #, fuzzy, c-format
 msgid "`%s' is not a valid DNS domain name\n"
 msgstr "„%s“ није и�правна ИП адре�а.\n"
 
-#: src/cli/gns/gnunet-gns.c:279 src/lib/util/dnsparser.c:273
+#: src/cli/gns/gnunet-gns.c:280 src/lib/util/dnsparser.c:273
 #, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "�и�ам у�пео да претворим Д�С ИД�� „%s“ у УТФ-8: %s\n"
 
-#: src/cli/gns/gnunet-gns.c:294
+#: src/cli/gns/gnunet-gns.c:295
 msgid "Cannot resolve using GNS: GNUnet peer not running\n"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:305
+#: src/cli/gns/gnunet-gns.c:306
 #: src/contrib/service/abd/gnunet-service-abd.c:1745
 #, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "�и�ам у�пео да �е повежем �а Г�С-ом\n"
 
-#: src/cli/gns/gnunet-gns.c:318
+#: src/cli/gns/gnunet-gns.c:325
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:358
+#: src/cli/gns/gnunet-gns.c:365
 msgid "Lookup a record for the given name"
 msgstr "Претражује запи� за датим називом"
 
-#: src/cli/gns/gnunet-gns.c:364
+#: src/cli/gns/gnunet-gns.c:371
 msgid "Specify the type of the record to lookup"
 msgstr "�аводи вр�ту запи�а за претраживање"
 
-#: src/cli/gns/gnunet-gns.c:370
+#: src/cli/gns/gnunet-gns.c:377
 #, fuzzy
 msgid "Specify a timeout for the lookup"
 msgstr "�аводи време и�тека за претраживање"
 
-#: src/cli/gns/gnunet-gns.c:374
+#: src/cli/gns/gnunet-gns.c:381
 msgid "No unneeded output"
 msgstr "�ема непотребног излаза"
 
-#: src/cli/gns/gnunet-gns.c:379
+#: src/cli/gns/gnunet-gns.c:386
 msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:393
+#: src/cli/gns/gnunet-gns.c:400
 msgid "GNUnet GNS resolver tool"
 msgstr "�лат Г�Унет Г�С решавача"
 
@@ -1673,7 +1673,11 @@ msgstr ""
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr "Демон помоћника те�та Г�Унет ��Т попречника"
 
-#: src/cli/nse/gnunet-nse.c:124
+#: src/cli/nse/gnunet-nse.c:126
+msgid "Monitor and output current estimates"
+msgstr ""
+
+#: src/cli/nse/gnunet-nse.c:137
 msgid "Show network size estimates from NSE service."
 msgstr "Показује процене величине мреже из �СЕ у�луге."
 
@@ -1721,86 +1725,90 @@ msgstr ""
 msgid "The time until the DID Document is going to expire (e.g. 5d)"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:805
+#: src/cli/reclaim/gnunet-reclaim.c:813
 #, fuzzy, c-format
 msgid "Ego is required\n"
 msgstr "Потребна је и�правна вр�та\n"
 
-#: src/cli/reclaim/gnunet-reclaim.c:812
+#: src/cli/reclaim/gnunet-reclaim.c:820
 #, c-format
 msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:819
+#: src/cli/reclaim/gnunet-reclaim.c:827
 #, fuzzy, c-format
 msgid "Requesting party key is required!\n"
 msgstr "аргумент „--section“ је потребан\n"
 
-#: src/cli/reclaim/gnunet-reclaim.c:837
+#: src/cli/reclaim/gnunet-reclaim.c:846
 msgid "Add or update an attribute NAME"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:842
+#: src/cli/reclaim/gnunet-reclaim.c:851
 msgid "Delete the attribute with ID"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:847
+#: src/cli/reclaim/gnunet-reclaim.c:856
 msgid "The attribute VALUE"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:852
+#: src/cli/reclaim/gnunet-reclaim.c:861
 msgid "The EGO to use"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:858
+#: src/cli/reclaim/gnunet-reclaim.c:867
 msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:862
+#: src/cli/reclaim/gnunet-reclaim.c:873
+msgid "Specify the relying party URI for a ticket to consume"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:877
 msgid "List attributes for EGO"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:866
+#: src/cli/reclaim/gnunet-reclaim.c:881
 msgid "List credentials for EGO"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:872
+#: src/cli/reclaim/gnunet-reclaim.c:887
 msgid "Credential to use for attribute"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:877
+#: src/cli/reclaim/gnunet-reclaim.c:892
 msgid "Credential name"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:883
+#: src/cli/reclaim/gnunet-reclaim.c:898
 msgid "Issue a ticket for a set of attributes separated by comma"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:888
+#: src/cli/reclaim/gnunet-reclaim.c:903
 msgid "Consume a ticket"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:893
+#: src/cli/reclaim/gnunet-reclaim.c:908
 msgid "Revoke a ticket"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:898
+#: src/cli/reclaim/gnunet-reclaim.c:913
 msgid "Type of attribute"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:903
+#: src/cli/reclaim/gnunet-reclaim.c:918
 msgid "Type of credential"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:907
+#: src/cli/reclaim/gnunet-reclaim.c:922
 msgid "List tickets of ego"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:913
+#: src/cli/reclaim/gnunet-reclaim.c:928
 msgid "Expiration interval of the attribute"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:921
+#: src/cli/reclaim/gnunet-reclaim.c:936
 msgid "re:claimID command line tool"
 msgstr ""
 
@@ -2035,33 +2043,59 @@ msgstr "И�пи�ује �тати�тику о Г�Унет радњама."
 msgid "run decoder modus, otherwise runs as encoder"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:154
+#: src/cli/util/gnunet-config.c:101
 msgid "test if the current installation supports the specified BACKEND"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:160
+#: src/cli/util/gnunet-config.c:107
 msgid ""
 "Provide an appropriate value for CFLAGS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:165
+#: src/cli/util/gnunet-config.c:112
 msgid "Is this an experimental build of GNUnet"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:171
+#: src/cli/util/gnunet-config.c:118
 msgid ""
 "Provide an appropriate value for LIBS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:177
+#: src/cli/util/gnunet-config.c:123
+#, fuzzy
+msgid "Do not parse default configuration files"
+msgstr "Управља Г�Унет датотекама подешавања"
+
+#: src/cli/util/gnunet-config.c:129
 msgid "Provide the path under which GNUnet was installed"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:192
-msgid "Manipulate GNUnet configuration files"
-msgstr "Управља Г�Унет датотекама подешавања"
+#: src/cli/util/gnunet-config.c:136
+msgid ""
+"Parse main configuration from this command-line argument and not from disk"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:225
+#, fuzzy
+msgid "Failed to load default configuration, exiting ...\n"
+msgstr "Лоша датотека подешавања „%s“, излазим ...\n"
+
+#: src/cli/util/gnunet-config.c:237
+#, fuzzy
+msgid "Failed to parse configuration, exiting ...\n"
+msgstr "�и�ам у�пео да уклоним датотеку подешавања „%s“\n"
+
+#: src/cli/util/gnunet-config.c:249 src/lib/util/program.c:287
+#, fuzzy, c-format
+msgid "Unreadable configuration file `%s', exiting ...\n"
+msgstr "Лоша датотека подешавања „%s“, излазим ...\n"
+
+#: src/cli/util/gnunet-config.c:263 src/lib/util/program.c:299
+#, fuzzy, c-format
+msgid "Malformed configuration file `%s', exiting ...\n"
+msgstr "Лоша датотека подешавања „%s“, излазим ...\n"
 
 #: src/cli/util/gnunet-crypto-tvg.c:1588
 msgid "verify a test vector from stdin"
@@ -2114,57 +2148,56 @@ msgstr ""
 msgid "Hostkeys file `%s' not found\n"
 msgstr "�и�ам нашао датотеку кључа домаћина „%s“\n"
 
-#: src/cli/util/gnunet-ecc.c:314
+#: src/cli/util/gnunet-ecc.c:318
 #, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr "Датотека кључа домаћина „%s“ је празна\n"
 
-#: src/cli/util/gnunet-ecc.c:319 src/service/testing/list-keys.c:47
-#: src/service/testing/testing.c:308
+#: src/cli/util/gnunet-ecc.c:324
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr "�етачан формат датотеке кључа домаћина: %s\n"
 
-#: src/cli/util/gnunet-ecc.c:334
+#: src/cli/util/gnunet-ecc.c:340
 #, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr "�е могу да прочитам датотеку кључа домаћина: %s\n"
 
-#: src/cli/util/gnunet-ecc.c:388
+#: src/cli/util/gnunet-ecc.c:394
 msgid "No hostkey file specified on command line\n"
 msgstr "�ије наведена датотека кључа домаћина на линији наредби\n"
 
-#: src/cli/util/gnunet-ecc.c:452
+#: src/cli/util/gnunet-ecc.c:458
 msgid "list keys included in a file (for testing)"
 msgstr "и�пи�ује кључеве укључене у датотеци (за те�тирање)"
 
-#: src/cli/util/gnunet-ecc.c:458
+#: src/cli/util/gnunet-ecc.c:464
 msgid "number of keys to list included in a file (for testing)"
 msgstr "број кључева за и�пи� укључених у датотеци (за те�тирање)"
 
-#: src/cli/util/gnunet-ecc.c:464
+#: src/cli/util/gnunet-ecc.c:470
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr "�твара БРОЈ пара јавног-личног кључа (за те�тирање)"
 
-#: src/cli/util/gnunet-ecc.c:469
+#: src/cli/util/gnunet-ecc.c:475
 msgid "print the public key in ASCII format"
 msgstr "и�пи�ује јавни кључ у �СКРИ формату"
 
-#: src/cli/util/gnunet-ecc.c:474
+#: src/cli/util/gnunet-ecc.c:480
 #, fuzzy
 msgid "print the private key in ASCII format"
 msgstr "и�пи�ује јавни кључ у �СКРИ формату"
 
-#: src/cli/util/gnunet-ecc.c:479
+#: src/cli/util/gnunet-ecc.c:485
 #, fuzzy
 msgid "print the public key in HEX format"
 msgstr "и�пи�ује јавни кључ у �СКРИ формату"
 
-#: src/cli/util/gnunet-ecc.c:485
+#: src/cli/util/gnunet-ecc.c:491
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr "и�пи�ује примере ЕЦЦ операција (кори�ти �е за те�тирање �агла�но�ти)"
 
-#: src/cli/util/gnunet-ecc.c:499
+#: src/cli/util/gnunet-ecc.c:505
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "Управља Г�Унет датотекама личног ЕЦЦ кључа"
 
@@ -3260,13 +3293,13 @@ msgstr ""
 msgid "Invalid handle type while writing `%s'"
 msgstr "�еи�праван формат времена „%s“\n"
 
-#: src/lib/util/client.c:531 src/lib/util/service.c:1134
+#: src/lib/util/client.c:531 src/lib/util/service.c:1139
 #: src/service/arm/gnunet-service-arm.c:452
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr "ЈУ�ИКС_ПУТ�Њ� „%s“ је предуга, највећа дужина је %llu\n"
 
-#: src/lib/util/client.c:536 src/lib/util/service.c:1138
+#: src/lib/util/client.c:536 src/lib/util/service.c:1143
 #: src/service/arm/gnunet-service-arm.c:456
 #, c-format
 msgid "Using `%s' instead\n"
@@ -3399,17 +3432,17 @@ msgstr ""
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "„%s“ није у�пело на %s:%d �а грешком: %s\n"
 
-#: src/lib/util/crypto_ecc.c:554
+#: src/lib/util/crypto_ecc.c:569
 #, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "„ECC“ потпи�ивање није у�пело на %s:%d: %s\n"
 
-#: src/lib/util/crypto_ecc.c:677
+#: src/lib/util/crypto_ecc.c:692
 #, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "Провера „ECDSA“ потпи�а није у�пела на %s:%d: %s\n"
 
-#: src/lib/util/crypto_ecc_setup.c:282 src/lib/util/crypto_ecc_setup.c:304
+#: src/lib/util/crypto_ecc_setup.c:282 src/lib/util/crypto_ecc_setup.c:305
 msgid "Could not load peer's private key\n"
 msgstr "�е могу да учитам лични кључ парњака\n"
 
@@ -3433,7 +3466,7 @@ msgstr "Провера „ECDSA“ потпи�а није у�пела на %s:
 msgid "Expected `%s' to be a directory!\n"
 msgstr "Очекивах да „%s“ буде директоријум!\n"
 
-#: src/lib/util/disk.c:1222 src/lib/util/service.c:1642
+#: src/lib/util/disk.c:1222 src/lib/util/service.c:1651
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "�е могу да добијем податке о кори�нику „%s“: %s\n"
@@ -3625,101 +3658,101 @@ msgstr "Морате да про�ледите број опцији „%s“.\n
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:60
+#: src/lib/util/gnunet_error_codes.c:59
 msgid "No error (success)."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:66
+#: src/lib/util/gnunet_error_codes.c:65
 #, fuzzy
 msgid "Unknown and unspecified error."
 msgstr "%.s �епознат код резултата."
 
-#: src/lib/util/gnunet_error_codes.c:72
+#: src/lib/util/gnunet_error_codes.c:71
 #, fuzzy
 msgid "Communication with service failed."
 msgstr "Грешка у комуникацији �а у�лугом ПОД�ЦИ_П�РЊ�К�: %s\n"
 
-#: src/lib/util/gnunet_error_codes.c:78
+#: src/lib/util/gnunet_error_codes.c:77
 #, fuzzy
 msgid "Ego not found."
 msgstr "�и�ам нашао �адржај"
 
-#: src/lib/util/gnunet_error_codes.c:84
+#: src/lib/util/gnunet_error_codes.c:83
 #, fuzzy
 msgid "Identifier already in use for another ego."
 msgstr "одредник �е већ кори�ти за други его"
 
-#: src/lib/util/gnunet_error_codes.c:90
+#: src/lib/util/gnunet_error_codes.c:89
 msgid "The given ego is invalid or malformed."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:96
+#: src/lib/util/gnunet_error_codes.c:95
 #, fuzzy
 msgid "Unknown namestore error."
 msgstr "%.s �епознат код резултата."
 
-#: src/lib/util/gnunet_error_codes.c:102 src/lib/util/gnunet_error_codes.c:120
+#: src/lib/util/gnunet_error_codes.c:101 src/lib/util/gnunet_error_codes.c:119
 #, fuzzy
 msgid "Zone iteration failed."
 msgstr "# Бирање парњака није у�пело"
 
-#: src/lib/util/gnunet_error_codes.c:108
+#: src/lib/util/gnunet_error_codes.c:107
 #, fuzzy
 msgid "Zone not found."
 msgstr "�и�ам нашао �адржај"
 
-#: src/lib/util/gnunet_error_codes.c:114
+#: src/lib/util/gnunet_error_codes.c:113
 #, fuzzy
 msgid "Record not found."
 msgstr "ни�ам нашао „upnpc“\n"
 
-#: src/lib/util/gnunet_error_codes.c:126
+#: src/lib/util/gnunet_error_codes.c:125
 msgid "Zone does not contain any records."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:132
+#: src/lib/util/gnunet_error_codes.c:131
 #, fuzzy
 msgid "Failed to lookup record."
 msgstr "Смештај назива није у�пео да �ме�ти запи�\n"
 
-#: src/lib/util/gnunet_error_codes.c:138
+#: src/lib/util/gnunet_error_codes.c:137
 #, fuzzy
 msgid "No records given."
 msgstr "�ије дат парњак!\n"
 
-#: src/lib/util/gnunet_error_codes.c:144
+#: src/lib/util/gnunet_error_codes.c:143
 msgid "Record data invalid."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:150
+#: src/lib/util/gnunet_error_codes.c:149
 #, fuzzy
 msgid "No label given."
 msgstr "�ије дат парњак!\n"
 
-#: src/lib/util/gnunet_error_codes.c:156
+#: src/lib/util/gnunet_error_codes.c:155
 #, fuzzy
 msgid "No results given."
 msgstr "�и�у дате опције\n"
 
-#: src/lib/util/gnunet_error_codes.c:162
+#: src/lib/util/gnunet_error_codes.c:161
 #, fuzzy
 msgid "Record already exists."
 msgstr "назив мете већ по�тоји"
 
-#: src/lib/util/gnunet_error_codes.c:168
+#: src/lib/util/gnunet_error_codes.c:167
 msgid "Record size exceeds maximum limit."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:174
+#: src/lib/util/gnunet_error_codes.c:173
 msgid "There was an error in the database backend."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:180
+#: src/lib/util/gnunet_error_codes.c:179
 #, fuzzy
 msgid "Failed to store the given records."
 msgstr "Смештај назива није у�пео да �ме�ти запи�\n"
 
-#: src/lib/util/gnunet_error_codes.c:186
+#: src/lib/util/gnunet_error_codes.c:185
 msgid "Label invalid or malformed."
 msgstr ""
 
@@ -3790,16 +3823,6 @@ msgstr "„%s“ није уÑ�пело за библиотеку '%s' Ñ�а грÐ
 msgid "Could not determine plugin installation path.\n"
 msgstr "�е могу да одредим путању ин�талирања прикључка.\n"
 
-#: src/lib/util/program.c:287
-#, fuzzy, c-format
-msgid "Unreadable configuration file `%s', exiting ...\n"
-msgstr "Лоша датотека подешавања „%s“, излазим ...\n"
-
-#: src/lib/util/program.c:299
-#, fuzzy, c-format
-msgid "Malformed configuration file `%s', exiting ...\n"
-msgstr "Лоша датотека подешавања „%s“, излазим ...\n"
-
 #: src/lib/util/program.c:314
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s'. Exiting ...\n"
@@ -3850,7 +3873,7 @@ msgstr "ОÑ�новна уÑ�луга „%s“ није подешена иÑ�прÐ
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "�е могу да решим наш „FQDN“ : %s\n"
 
-#: src/lib/util/service.c:654
+#: src/lib/util/service.c:650
 #, fuzzy, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -3859,29 +3882,29 @@ msgstr ""
 "Обрађивачки код за поруку вр�те %u није позвао „GNUNET_SERVER_receive_done“ "
 "након „%s“\n"
 
-#: src/lib/util/service.c:838
+#: src/lib/util/service.c:841
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr "�епозната породица адре�е „%d“\n"
 
-#: src/lib/util/service.c:951
+#: src/lib/util/service.c:956
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr "�е могу да обрадим �пецификацију ИПв4 мреже „%s“ за `%s:%s'\n"
 
-#: src/lib/util/service.c:992
+#: src/lib/util/service.c:997
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr "�е могу да обрадим �пецификацију ИПв6 мреже „%s“ за `%s:%s'\n"
 
-#: src/lib/util/service.c:1095 src/lib/util/service.c:1101
+#: src/lib/util/service.c:1100 src/lib/util/service.c:1106
 #: src/service/arm/gnunet-service-arm.c:412
 #: src/service/arm/gnunet-service-arm.c:418
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr "Захтева и�праван број прикључника за у�лугу „%s“ у подешавањима!\n"
 
-#: src/lib/util/service.c:1158 src/service/arm/gnunet-service-arm.c:484
+#: src/lib/util/service.c:1163 src/service/arm/gnunet-service-arm.c:484
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -3890,87 +3913,87 @@ msgstr ""
 "И�кључујем подршку прикључнице ЈУ�ИКС домена за у�лугу „%s“, ни�м у�пео да "
 "направим прикључницу ЈУ�ИКС домена: %s\n"
 
-#: src/lib/util/service.c:1176 src/service/arm/gnunet-service-arm.c:505
+#: src/lib/util/service.c:1181 src/service/arm/gnunet-service-arm.c:505
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 "�емам ни ПРИКЉУЧ�ИК ни ЈУ�ИКС_ПУТ�ЊУ за у�лугу „%s“, али је једно потребно\n"
 
-#: src/lib/util/service.c:1207 src/service/arm/gnunet-service-arm.c:536
+#: src/lib/util/service.c:1212 src/service/arm/gnunet-service-arm.c:536
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "�и�ам у�пео да решим „%s“: %s\n"
 
-#: src/lib/util/service.c:1226 src/service/arm/gnunet-service-arm.c:555
+#: src/lib/util/service.c:1231 src/service/arm/gnunet-service-arm.c:555
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "�и�ам у�пео да нађем %s адре�у за „%s“.\n"
 
-#: src/lib/util/service.c:1401
+#: src/lib/util/service.c:1406
 #, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "„%s“ није у�пело за прикључник %d (%s).\n"
 
-#: src/lib/util/service.c:1413
+#: src/lib/util/service.c:1418
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "„%s“ није у�пело за прикључник %d (%s): адре�а је већ у употреби\n"
 
-#: src/lib/util/service.c:1420
+#: src/lib/util/service.c:1425
 #, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "„%s“ није у�пело за „%s“: адре�а је већ у употреби\n"
 
-#: src/lib/util/service.c:1481
+#: src/lib/util/service.c:1486
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr "�аведена вредно�т за „%s“ у�луге „%s“ је неи�правна\n"
 
-#: src/lib/util/service.c:1505
+#: src/lib/util/service.c:1510
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 "�е могу да при�тупим унапред �везаној прикључници %u, покушаћу да �вежем "
 "�ебе �амог\n"
 
-#: src/lib/util/service.c:1573
+#: src/lib/util/service.c:1583
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/lib/util/service.c:1644
+#: src/lib/util/service.c:1653
 msgid "No such user"
 msgstr "�ема таквог кори�ника"
 
-#: src/lib/util/service.c:1658
+#: src/lib/util/service.c:1668
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "�е могу да променим вла�ника/групу на „%s“: %s\n"
 
-#: src/lib/util/service.c:1751
+#: src/lib/util/service.c:1767
 msgid "Service process failed to initialize\n"
 msgstr "Проце� у�луге није у�пео да �е покрене\n"
 
-#: src/lib/util/service.c:1756
+#: src/lib/util/service.c:1772
 msgid "Service process could not initialize server function\n"
 msgstr "Проце� у�луге не може да покрене функцију �ервера\n"
 
-#: src/lib/util/service.c:1761
+#: src/lib/util/service.c:1777
 msgid "Service process failed to report status\n"
 msgstr "Проце� у�луге није у�пео да изве�ти о �тању\n"
 
-#: src/lib/util/service.c:1960 src/lib/util/service.c:2255
+#: src/lib/util/service.c:1990 src/lib/util/service.c:2304
 msgid "do daemonize (detach from terminal)"
 msgstr "ради демонизацију (откачиње од терминала)"
 
-#: src/lib/util/service.c:2036 src/lib/util/service.c:2048
-#: src/lib/util/service.c:2298 src/lib/util/service.c:2310
-#: src/service/transport/transport-testing-communicator.c:1056
+#: src/lib/util/service.c:2065 src/lib/util/service.c:2080
+#: src/lib/util/service.c:2353 src/lib/util/service.c:2368
+#: src/service/transport/transport-testing-communicator.c:1059
 #, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Лоша датотека подешавања „%s“, излазим ...\n"
 
-#: src/lib/util/service.c:2058 src/lib/util/service.c:2321
+#: src/lib/util/service.c:2092 src/lib/util/service.c:2381
 msgid "Malformed configuration, exit ...\n"
 msgstr "Лоше подешавање, излазим ...\n"
 
@@ -4440,6 +4463,11 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr "Започињем гашење као што је затражио клијент.\n"
 
+#: src/service/arm/testing_arm_cmd_start_peer.c:197
+#, c-format
+msgid "Failed to start `%s': %s\n"
+msgstr "�и�ам у�пео да покренем „%s“: %s\n"
+
 #: src/service/core/gnunet-service-core.c:329
 msgid "# send requests dropped (disconnected)"
 msgstr "# захтеви �лања �у одбачени (веза је прекинута)"
@@ -4609,8 +4637,8 @@ msgstr "# бајтови утовара �у дешифровани"
 #: src/service/core/gnunet-service-core_sessions.c:337
 #: src/service/fs/gnunet-service-fs_cp.c:484
 #: src/service/fs/gnunet-service-fs_cp.c:1377
-#: src/service/topology/gnunet-daemon-topology.c:551
-#: src/service/topology/gnunet-daemon-topology.c:633
+#: src/service/topology/gnunet-daemon-topology.c:545
+#: src/service/topology/gnunet-daemon-topology.c:627
 msgid "# peers connected"
 msgstr "# парњаци �у повезани"
 
@@ -5662,7 +5690,7 @@ msgstr ""
 
 #: src/service/fs/gnunet-service-fs.c:1271
 #: src/service/hostlist/gnunet-daemon-hostlist.c:343
-#: src/service/topology/gnunet-daemon-topology.c:1066
+#: src/service/topology/gnunet-daemon-topology.c:1062
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "�и�ам у�пео да �е повежем �а „%s“ у�лугом.\n"
@@ -6474,7 +6502,7 @@ msgid "# hostlist advertisements send"
 msgstr "# рекламе �пи�ка домаћина �у по�лате"
 
 #: src/service/hostlist/gnunet-daemon-hostlist_server.c:483
-#: src/service/topology/gnunet-daemon-topology.c:786
+#: src/service/topology/gnunet-daemon-topology.c:781
 #, fuzzy, c-format
 msgid "Error in communication with PEERSTORE service: %s\n"
 msgstr "Грешка у комуникацији �а у�лугом ПОД�ЦИ_П�РЊ�К�: %s\n"
@@ -6745,12 +6773,12 @@ msgstr ""
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/service/nat/gnunet-service-nat.c:1861
+#: src/service/nat/gnunet-service-nat.c:1860
 #, fuzzy
 msgid "Connection reversal request failed\n"
 msgstr "Веза је у�по�тављена.\n"
 
-#: src/service/nat/gnunet-service-nat.c:1935
+#: src/service/nat/gnunet-service-nat.c:1999
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
@@ -6774,43 +6802,43 @@ msgstr "ни�ам нашао наредбу „external-ip“\n"
 msgid "`upnpc' command not found\n"
 msgstr "ни�ам нашао „upnpc“ наредбу\n"
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1141
+#: src/service/peerstore/gnunet-service-peerstore.c:1150
 #, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "�и�ам у�пео да обрадим „HELLO“ у датотеци „%s“: %s\n"
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1214
+#: src/service/peerstore/gnunet-service-peerstore.c:1223
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "�е могу да отворим „%s“.\n"
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1233
+#: src/service/peerstore/gnunet-service-peerstore.c:1242
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr "Увозим „HELLO“-е из „%s“\n"
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1244
+#: src/service/peerstore/gnunet-service-peerstore.c:1253
 msgid "Skipping import of included HELLOs\n"
 msgstr "Пре�качем увоз укључених „HELLO“-а\n"
 
-#: src/service/peerstore/peerstore_api.c:574
+#: src/service/peerstore/peerstore_api.c:579
 #, fuzzy
 msgid "Unexpected store response.\n"
 msgstr "�еочекивано време за одговор �а „fs“ у�луге."
 
-#: src/service/peerstore/peerstore_api.c:606
+#: src/service/peerstore/peerstore_api.c:620
 #, fuzzy
 msgid "Unexpected iteration response.\n"
 msgstr "�еочекивано време за одговор �а „fs“ у�луге."
 
-#: src/service/peerstore/peerstore_api.c:652
+#: src/service/peerstore/peerstore_api.c:666
 msgid ""
 "Unexpected iteration response, no iterating client found, discarding "
 "message.\n"
 msgstr ""
 
-#: src/service/peerstore/peerstore_api.c:662
-#: src/service/peerstore/peerstore_api_monitor.c:164
+#: src/service/peerstore/peerstore_api.c:676
+#: src/service/peerstore/peerstore_api_monitor.c:163
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Примих лош Д�С захтев од „%s“\n"
@@ -6974,11 +7002,11 @@ msgstr ""
 msgid "Namestore REST API initialized\n"
 msgstr "Меш је покренут\n"
 
-#: src/service/rest/openid_plugin.c:3102
+#: src/service/rest/openid_plugin.c:3121
 msgid "OpenID Connect REST API initialized\n"
 msgstr ""
 
-#: src/service/rest/pabc_plugin.c:637 src/service/rest/reclaim_plugin.c:1523
+#: src/service/rest/pabc_plugin.c:637 src/service/rest/reclaim_plugin.c:1494
 msgid "Identity Provider REST API initialized\n"
 msgstr ""
 
@@ -7029,162 +7057,56 @@ msgstr "Учитавам %llu бајта �тати�тике из „%s“\n"
 msgid "Could not save some persistent statistics\n"
 msgstr "�е могу да �ачувам нешто од трајне �тати�тике\n"
 
-#: src/service/testing/gnunet-testing.c:185
-#, c-format
-msgid "Could not extract hostkey %u (offset too large?)\n"
-msgstr "�е могу да извучем кључ домаћина %u (померај је превелик?)\n"
-
-#: src/service/testing/gnunet-testing.c:275
-#, c-format
-msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
-msgstr ""
-"�епозната наредба, кори�тите „q“ да прекинете или „r“ да поново покренете "
-"парњака\n"
-
-#: src/service/testing/gnunet-testing.c:386
-msgid "create unique configuration files"
-msgstr "�твара једин�твене датотеке подешавања"
-
-#: src/service/testing/gnunet-testing.c:392
-msgid "extract hostkey file from pre-computed hostkey list"
-msgstr ""
-"извлачи датотеку кључа доамћина из унапред прорачунатог �пи�ка кључа домаћина"
-
-#: src/service/testing/gnunet-testing.c:400
-msgid ""
-"number of unique configuration files to create, or number of the hostkey to "
-"extract"
+#: src/service/testbed/gnunet-testbed.c:196
+#, fuzzy
+msgid "number of unique configuration files to create"
 msgstr ""
 "број једин�твених датотека подешавања за �тварање, или број кључа домаћина "
 "за извлачење"
 
-#: src/service/testing/gnunet-testing.c:407
+#: src/service/testbed/gnunet-testbed.c:202
 msgid "configuration template"
 msgstr "шаблон подешавања"
 
-#: src/service/testing/gnunet-testing.c:415
-msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
-msgstr ""
-"покреће дату у�лугу, чека на �тандардном улазу за „r“ (поновно покретање) "
-"или „q“ (излази)"
-
-#: src/service/testing/gnunet-testing.c:432
+#: src/service/testbed/gnunet-testbed.c:218
 msgid "Command line tool to access the testing library"
 msgstr "�лат линије наредби за приезуп библиотеци те�тирања"
 
-#: src/service/testing/list-keys.c:92
-msgid "list COUNT number of keys"
-msgstr "и�пи�ује УКУП�ОСТ број парњака"
-
-#: src/service/testing/testing.c:291
-#, c-format
-msgid "Hostkeys file not found: %s\n"
-msgstr "�и�ам нашао датотеку кључева домаћина: %s\n"
-
-#: src/service/testing/testing.c:743
-#, c-format
-msgid "Key number %u does not exist\n"
-msgstr "Број кључа %u не по�тоји\n"
-
-#: src/service/testing/testing.c:1217
-#, c-format
-msgid ""
-"You attempted to create a testbed with more than %u hosts.  Please "
-"precompute more hostkeys first.\n"
-msgstr ""
-"Покушали �те да направите пробно ме�то �а више од %u домаћина.  Прво пре "
-"�вега израчунајте више кључева домаћина.\n"
-
-#: src/service/testing/testing.c:1226
-#, c-format
-msgid "Failed to initialize hostkey for peer %u\n"
-msgstr "�и�ам у�пео да покренем кључ домаћина за парњака %u\n"
-
-#: src/service/testing/testing.c:1236
-msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
-msgstr "опција „PRIVATE_KEY“ у одељку „PEER“ недо�таје у подешавањима\n"
-
-#: src/service/testing/testing.c:1249
-msgid "Failed to create configuration for peer (not enough free ports?)\n"
-msgstr ""
-"�и�ам у�пео да направим подешавање за парњака (нема довољно �лободних "
-"прикључника?)\n"
-
-#: src/service/testing/testing.c:1265
-#, c-format
-msgid "Cannot open hostkey file `%s': %s\n"
-msgstr "�е могу да отворим датотеку кључа домаћина „%s“: %s\n"
-
-#: src/service/testing/testing.c:1279
-#, c-format
-msgid "Failed to write hostkey file for peer %u: %s\n"
-msgstr "�и�ам у�пео да запишем датотеку кључа домаћина за парњака %u: %s\n"
-
-#: src/service/testing/testing.c:1307
-#, c-format
-msgid "Failed to write configuration file `%s' for peer %u: %s\n"
-msgstr "�и�ам у�пео да запишем датотеку подешавања „%s“ за парњака %u: %s\n"
-
-#: src/service/testing/testing.c:1413
-#, c-format
-msgid "Failed to start `%s': %s\n"
-msgstr "�и�ам у�пео да покренем „%s“: %s\n"
-
-#: src/service/testing/testing.c:1664
-#, c-format
-msgid "Failed to load configuration from %s\n"
-msgstr "�и�ам у�пео да учитам подешавање за „%s“\n"
-
-#: src/service/testing/testing.c:2795
-#, c-format
-msgid "Topology file %s not found\n"
-msgstr "�и�ам нашао датотеку размештаја „%s“\n"
-
-#: src/service/testing/testing.c:2803
-#, c-format
-msgid "Topology file %s has no data\n"
-msgstr "Датотека размештаја „%s“ нема података\n"
-
-#: src/service/testing/testing.c:2811
-#, c-format
-msgid "Topology file %s cannot be read\n"
-msgstr "�е могу да прочитам датотеку размештаја „%s“\n"
-
 #: src/service/topology/gnunet-daemon-topology.c:286
 #, fuzzy
 msgid "# connect requests issued to ATS"
 msgstr "# захтеви везе �у издати прено�у"
 
-#: src/service/topology/gnunet-daemon-topology.c:480
+#: src/service/topology/gnunet-daemon-topology.c:475
 msgid "# HELLO messages gossipped"
 msgstr "# „HELLO“ поруке �у наклопљене"
 
-#: src/service/topology/gnunet-daemon-topology.c:752
+#: src/service/topology/gnunet-daemon-topology.c:747
 #, fuzzy
 msgid "Error in communication with PEERSTORE service to monitor.\n"
 msgstr "Грешка у комуникацији �а у�лугом ПОД�ЦИ_П�РЊ�К�: %s\n"
 
-#: src/service/topology/gnunet-daemon-topology.c:761
+#: src/service/topology/gnunet-daemon-topology.c:756
 msgid "Finished initial PEERSTORE iteration in monitor.\n"
 msgstr ""
 
-#: src/service/topology/gnunet-daemon-topology.c:869
+#: src/service/topology/gnunet-daemon-topology.c:864
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 "�и�ам у�пео да �е повежем �а у�лугом језгра, не могу да радим размештајем!\n"
 
-#: src/service/topology/gnunet-daemon-topology.c:943
+#: src/service/topology/gnunet-daemon-topology.c:938
 msgid "# HELLO messages received"
 msgstr "# „HELLO“ поруке �у примљене"
 
-#: src/service/topology/gnunet-daemon-topology.c:1095
+#: src/service/topology/gnunet-daemon-topology.c:1091
 msgid "GNUnet topology control"
 msgstr ""
 
 #: src/service/transport/gnunet-communicator-quic.c:1717
 #: src/service/transport/gnunet-communicator-tcp.c:3814
-#: src/service/transport/gnunet-communicator-udp.c:3562
-#: src/service/transport/gnunet-service-transport.c:12124
+#: src/service/transport/gnunet-communicator-udp.c:3579
+#: src/service/transport/gnunet-service-transport.c:12543
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "У�лузи прено�а недо�тају по�тавке подешавања кључа. Излазим.\n"
 
@@ -7196,7 +7118,7 @@ msgstr ""
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/service/transport/gnunet-communicator-udp.c:3637
+#: src/service/transport/gnunet-communicator-udp.c:3654
 msgid "GNUnet UDP communicator"
 msgstr ""
 
@@ -7500,6 +7422,88 @@ msgstr "�и�ам у�пео да реплицирам блок у о�тави
 msgid "Failed to connect to the namestore!\n"
 msgstr "�и�ам у�пео да �е повежем �а �мештајем назива!\n"
 
+#, c-format
+#~ msgid "Could not extract hostkey %u (offset too large?)\n"
+#~ msgstr "�е могу да извучем кључ домаћина %u (померај је превелик?)\n"
+
+#, c-format
+#~ msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
+#~ msgstr ""
+#~ "�епозната наредба, кори�тите „q“ да прекинете или „r“ да поново покренете "
+#~ "парњака\n"
+
+#~ msgid "create unique configuration files"
+#~ msgstr "�твара једин�твене датотеке подешавања"
+
+#~ msgid "extract hostkey file from pre-computed hostkey list"
+#~ msgstr ""
+#~ "извлачи датотеку кључа доамћина из унапред прорачунатог �пи�ка кључа "
+#~ "домаћина"
+
+#~ msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
+#~ msgstr ""
+#~ "покреће дату у�лугу, чека на �тандардном улазу за „r“ (поновно покретање) "
+#~ "или „q“ (излази)"
+
+#~ msgid "list COUNT number of keys"
+#~ msgstr "и�пи�ује УКУП�ОСТ број парњака"
+
+#, c-format
+#~ msgid "Hostkeys file not found: %s\n"
+#~ msgstr "�и�ам нашао датотеку кључева домаћина: %s\n"
+
+#, c-format
+#~ msgid "Key number %u does not exist\n"
+#~ msgstr "Број кључа %u не по�тоји\n"
+
+#, c-format
+#~ msgid ""
+#~ "You attempted to create a testbed with more than %u hosts.  Please "
+#~ "precompute more hostkeys first.\n"
+#~ msgstr ""
+#~ "Покушали �те да направите пробно ме�то �а више од %u домаћина.  Прво пре "
+#~ "�вега израчунајте више кључева домаћина.\n"
+
+#, c-format
+#~ msgid "Failed to initialize hostkey for peer %u\n"
+#~ msgstr "�и�ам у�пео да покренем кључ домаћина за парњака %u\n"
+
+#~ msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
+#~ msgstr "опција „PRIVATE_KEY“ у одељку „PEER“ недо�таје у подешавањима\n"
+
+#~ msgid "Failed to create configuration for peer (not enough free ports?)\n"
+#~ msgstr ""
+#~ "�и�ам у�пео да направим подешавање за парњака (нема довољно �лободних "
+#~ "прикључника?)\n"
+
+#, c-format
+#~ msgid "Cannot open hostkey file `%s': %s\n"
+#~ msgstr "�е могу да отворим датотеку кључа домаћина „%s“: %s\n"
+
+#, c-format
+#~ msgid "Failed to write hostkey file for peer %u: %s\n"
+#~ msgstr "�и�ам у�пео да запишем датотеку кључа домаћина за парњака %u: %s\n"
+
+#, c-format
+#~ msgid "Failed to write configuration file `%s' for peer %u: %s\n"
+#~ msgstr "�и�ам у�пео да запишем датотеку подешавања „%s“ за парњака %u: %s\n"
+
+#, c-format
+#~ msgid "Failed to load configuration from %s\n"
+#~ msgstr "�и�ам у�пео да учитам подешавање за „%s“\n"
+
+#, c-format
+#~ msgid "Topology file %s not found\n"
+#~ msgstr "�и�ам нашао датотеку размештаја „%s“\n"
+
+#, c-format
+#~ msgid "Topology file %s has no data\n"
+#~ msgstr "Датотека размештаја „%s“ нема података\n"
+
+#, c-format
+#~ msgid "Topology file %s cannot be read\n"
+#~ msgstr "�е могу да прочитам датотеку размештаја „%s“\n"
+
 #, fuzzy, c-format
 #~ msgid ""
 #~ "Local peer: %s\n"
@@ -9280,10 +9284,6 @@ msgstr "Ð�иÑ�ам уÑ�пео да Ñ�е повежем Ñ�а Ñ�мештајем Ð
 #~ msgstr "вредно�т за по�тављање"
 
 #, fuzzy
-#~ msgid "Unreadable or malformed default configuration file `%s', exit ...\n"
-#~ msgstr "Лоша датотека подешавања „%s“, излазим ...\n"
-
-#, fuzzy
 #~ msgid "Unreadable or malformed configuration, exit ...\n"
 #~ msgstr "Лоше подешавање, излазим ...\n"
 
diff --git a/po/sv.po b/po/sv.po
index 0cd0edcec..46ebace36 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2024-03-15 09:19+0100\n"
+"POT-Creation-Date: 2024-05-20 20:21+0200\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -349,26 +349,26 @@ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 msgid "Failed to connect to CORE service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/cli/core/gnunet-core.c:212
+#: src/cli/core/gnunet-core.c:213
 #, fuzzy
 msgid "No argument given.\n"
 msgstr "# byte mottogs via TCP"
 
-#: src/cli/core/gnunet-core.c:235 src/service/transport/gnunet-transport.c:1389
+#: src/cli/core/gnunet-core.c:238 src/service/transport/gnunet-transport.c:1389
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cli/core/gnunet-core.c:241
+#: src/cli/core/gnunet-core.c:244
 msgid "Show our current peer identity"
 msgstr ""
 
-#: src/cli/core/gnunet-core.c:248
+#: src/cli/core/gnunet-core.c:251
 #, fuzzy
 msgid "Show current connections"
 msgstr "Nätverksanslutning"
 
-#: src/cli/core/gnunet-core.c:259
+#: src/cli/core/gnunet-core.c:262
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "Skriv ut information om GNUnets motparter."
@@ -1081,54 +1081,54 @@ msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:268
+#: src/cli/gns/gnunet-gns.c:269
 #, fuzzy, c-format
 msgid "`%s' is not a valid DNS domain name\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/cli/gns/gnunet-gns.c:279 src/lib/util/dnsparser.c:273
+#: src/cli/gns/gnunet-gns.c:280 src/lib/util/dnsparser.c:273
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/cli/gns/gnunet-gns.c:294
+#: src/cli/gns/gnunet-gns.c:295
 msgid "Cannot resolve using GNS: GNUnet peer not running\n"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:305
+#: src/cli/gns/gnunet-gns.c:306
 #: src/contrib/service/abd/gnunet-service-abd.c:1745
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/cli/gns/gnunet-gns.c:318
+#: src/cli/gns/gnunet-gns.c:325
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:358
+#: src/cli/gns/gnunet-gns.c:365
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:364
+#: src/cli/gns/gnunet-gns.c:371
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "ange prioritet för innehållet"
 
-#: src/cli/gns/gnunet-gns.c:370
+#: src/cli/gns/gnunet-gns.c:377
 #, fuzzy
 msgid "Specify a timeout for the lookup"
 msgstr "ange prioritet för innehållet"
 
-#: src/cli/gns/gnunet-gns.c:374
+#: src/cli/gns/gnunet-gns.c:381
 msgid "No unneeded output"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:379
+#: src/cli/gns/gnunet-gns.c:386
 msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:393
+#: src/cli/gns/gnunet-gns.c:400
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "Spåra GNUnets nätverkstopologi."
@@ -1659,7 +1659,11 @@ msgstr ""
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/cli/nse/gnunet-nse.c:124
+#: src/cli/nse/gnunet-nse.c:126
+msgid "Monitor and output current estimates"
+msgstr ""
+
+#: src/cli/nse/gnunet-nse.c:137
 #, fuzzy
 msgid "Show network size estimates from NSE service."
 msgstr "# byte mottogs via TCP"
@@ -1708,87 +1712,91 @@ msgstr ""
 msgid "The time until the DID Document is going to expire (e.g. 5d)"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:805
+#: src/cli/reclaim/gnunet-reclaim.c:813
 #, fuzzy, c-format
 msgid "Ego is required\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/cli/reclaim/gnunet-reclaim.c:812
+#: src/cli/reclaim/gnunet-reclaim.c:820
 #, c-format
 msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:819
+#: src/cli/reclaim/gnunet-reclaim.c:827
 #, fuzzy, c-format
 msgid "Requesting party key is required!\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/cli/reclaim/gnunet-reclaim.c:837
+#: src/cli/reclaim/gnunet-reclaim.c:846
 msgid "Add or update an attribute NAME"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:842
+#: src/cli/reclaim/gnunet-reclaim.c:851
 msgid "Delete the attribute with ID"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:847
+#: src/cli/reclaim/gnunet-reclaim.c:856
 msgid "The attribute VALUE"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:852
+#: src/cli/reclaim/gnunet-reclaim.c:861
 #, fuzzy
 msgid "The EGO to use"
 msgstr "meddelandestorlek"
 
-#: src/cli/reclaim/gnunet-reclaim.c:858
+#: src/cli/reclaim/gnunet-reclaim.c:867
 msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:862
+#: src/cli/reclaim/gnunet-reclaim.c:873
+msgid "Specify the relying party URI for a ticket to consume"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:877
 msgid "List attributes for EGO"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:866
+#: src/cli/reclaim/gnunet-reclaim.c:881
 msgid "List credentials for EGO"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:872
+#: src/cli/reclaim/gnunet-reclaim.c:887
 msgid "Credential to use for attribute"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:877
+#: src/cli/reclaim/gnunet-reclaim.c:892
 msgid "Credential name"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:883
+#: src/cli/reclaim/gnunet-reclaim.c:898
 msgid "Issue a ticket for a set of attributes separated by comma"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:888
+#: src/cli/reclaim/gnunet-reclaim.c:903
 msgid "Consume a ticket"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:893
+#: src/cli/reclaim/gnunet-reclaim.c:908
 msgid "Revoke a ticket"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:898
+#: src/cli/reclaim/gnunet-reclaim.c:913
 msgid "Type of attribute"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:903
+#: src/cli/reclaim/gnunet-reclaim.c:918
 msgid "Type of credential"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:907
+#: src/cli/reclaim/gnunet-reclaim.c:922
 msgid "List tickets of ego"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:913
+#: src/cli/reclaim/gnunet-reclaim.c:928
 msgid "Expiration interval of the attribute"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:921
+#: src/cli/reclaim/gnunet-reclaim.c:936
 msgid "re:claimID command line tool"
 msgstr ""
 
@@ -2027,34 +2035,59 @@ msgstr "Skriv ut statistik om GNUnet-operationer."
 msgid "run decoder modus, otherwise runs as encoder"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:154
+#: src/cli/util/gnunet-config.c:101
 msgid "test if the current installation supports the specified BACKEND"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:160
+#: src/cli/util/gnunet-config.c:107
 msgid ""
 "Provide an appropriate value for CFLAGS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:165
+#: src/cli/util/gnunet-config.c:112
 msgid "Is this an experimental build of GNUnet"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:171
+#: src/cli/util/gnunet-config.c:118
 msgid ""
 "Provide an appropriate value for LIBS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:177
+#: src/cli/util/gnunet-config.c:123
+#, fuzzy
+msgid "Do not parse default configuration files"
+msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
+
+#: src/cli/util/gnunet-config.c:129
 msgid "Provide the path under which GNUnet was installed"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:192
+#: src/cli/util/gnunet-config.c:136
+msgid ""
+"Parse main configuration from this command-line argument and not from disk"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:225
 #, fuzzy
-msgid "Manipulate GNUnet configuration files"
-msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
+msgid "Failed to load default configuration, exiting ...\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/cli/util/gnunet-config.c:237
+#, fuzzy
+msgid "Failed to parse configuration, exiting ...\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/cli/util/gnunet-config.c:249 src/lib/util/program.c:287
+#, fuzzy, c-format
+msgid "Unreadable configuration file `%s', exiting ...\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/cli/util/gnunet-config.c:263 src/lib/util/program.c:299
+#, fuzzy, c-format
+msgid "Malformed configuration file `%s', exiting ...\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
 #: src/cli/util/gnunet-crypto-tvg.c:1588
 msgid "verify a test vector from stdin"
@@ -2101,55 +2134,54 @@ msgstr ""
 msgid "Hostkeys file `%s' not found\n"
 msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
 
-#: src/cli/util/gnunet-ecc.c:314
+#: src/cli/util/gnunet-ecc.c:318
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/cli/util/gnunet-ecc.c:319 src/service/testing/list-keys.c:47
-#: src/service/testing/testing.c:308
+#: src/cli/util/gnunet-ecc.c:324
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:334
+#: src/cli/util/gnunet-ecc.c:340
 #, fuzzy, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/cli/util/gnunet-ecc.c:388
+#: src/cli/util/gnunet-ecc.c:394
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:452
+#: src/cli/util/gnunet-ecc.c:458
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:458
+#: src/cli/util/gnunet-ecc.c:464
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:464
+#: src/cli/util/gnunet-ecc.c:470
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:469
+#: src/cli/util/gnunet-ecc.c:475
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:474
+#: src/cli/util/gnunet-ecc.c:480
 msgid "print the private key in ASCII format"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:479
+#: src/cli/util/gnunet-ecc.c:485
 msgid "print the public key in HEX format"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:485
+#: src/cli/util/gnunet-ecc.c:491
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:499
+#: src/cli/util/gnunet-ecc.c:505
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
@@ -3241,13 +3273,13 @@ msgstr ""
 msgid "Invalid handle type while writing `%s'"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/lib/util/client.c:531 src/lib/util/service.c:1134
+#: src/lib/util/client.c:531 src/lib/util/service.c:1139
 #: src/service/arm/gnunet-service-arm.c:452
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/lib/util/client.c:536 src/lib/util/service.c:1138
+#: src/lib/util/client.c:536 src/lib/util/service.c:1143
 #: src/service/arm/gnunet-service-arm.c:456
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
@@ -3376,17 +3408,17 @@ msgstr ""
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/lib/util/crypto_ecc.c:554
+#: src/lib/util/crypto_ecc.c:569
 #, fuzzy, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/lib/util/crypto_ecc.c:677
+#: src/lib/util/crypto_ecc.c:692
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/lib/util/crypto_ecc_setup.c:282 src/lib/util/crypto_ecc_setup.c:304
+#: src/lib/util/crypto_ecc_setup.c:282 src/lib/util/crypto_ecc_setup.c:305
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
@@ -3411,7 +3443,7 @@ msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 msgid "Expected `%s' to be a directory!\n"
 msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
 
-#: src/lib/util/disk.c:1222 src/lib/util/service.c:1642
+#: src/lib/util/disk.c:1222 src/lib/util/service.c:1651
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
@@ -3604,98 +3636,98 @@ msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:60
+#: src/lib/util/gnunet_error_codes.c:59
 msgid "No error (success)."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:66
+#: src/lib/util/gnunet_error_codes.c:65
 #, fuzzy
 msgid "Unknown and unspecified error."
 msgstr "Okänt fel"
 
-#: src/lib/util/gnunet_error_codes.c:72
+#: src/lib/util/gnunet_error_codes.c:71
 #, fuzzy
 msgid "Communication with service failed."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/lib/util/gnunet_error_codes.c:78
+#: src/lib/util/gnunet_error_codes.c:77
 #, fuzzy
 msgid "Ego not found."
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/lib/util/gnunet_error_codes.c:84
+#: src/lib/util/gnunet_error_codes.c:83
 msgid "Identifier already in use for another ego."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:90
+#: src/lib/util/gnunet_error_codes.c:89
 msgid "The given ego is invalid or malformed."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:96
+#: src/lib/util/gnunet_error_codes.c:95
 #, fuzzy
 msgid "Unknown namestore error."
 msgstr "Okänt fel"
 
-#: src/lib/util/gnunet_error_codes.c:102 src/lib/util/gnunet_error_codes.c:120
+#: src/lib/util/gnunet_error_codes.c:101 src/lib/util/gnunet_error_codes.c:119
 #, fuzzy
 msgid "Zone iteration failed."
 msgstr "# sessionsnycklar accepterade"
 
-#: src/lib/util/gnunet_error_codes.c:108
+#: src/lib/util/gnunet_error_codes.c:107
 #, fuzzy
 msgid "Zone not found."
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/lib/util/gnunet_error_codes.c:114
+#: src/lib/util/gnunet_error_codes.c:113
 #, fuzzy
 msgid "Record not found."
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/lib/util/gnunet_error_codes.c:126
+#: src/lib/util/gnunet_error_codes.c:125
 msgid "Zone does not contain any records."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:132
+#: src/lib/util/gnunet_error_codes.c:131
 #, fuzzy
 msgid "Failed to lookup record."
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/lib/util/gnunet_error_codes.c:138
+#: src/lib/util/gnunet_error_codes.c:137
 #, fuzzy
 msgid "No records given."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/lib/util/gnunet_error_codes.c:144
+#: src/lib/util/gnunet_error_codes.c:143
 msgid "Record data invalid."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:150
+#: src/lib/util/gnunet_error_codes.c:149
 msgid "No label given."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:156
+#: src/lib/util/gnunet_error_codes.c:155
 #, fuzzy
 msgid "No results given."
 msgstr "# byte mottogs via TCP"
 
-#: src/lib/util/gnunet_error_codes.c:162
+#: src/lib/util/gnunet_error_codes.c:161
 msgid "Record already exists."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:168
+#: src/lib/util/gnunet_error_codes.c:167
 msgid "Record size exceeds maximum limit."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:174
+#: src/lib/util/gnunet_error_codes.c:173
 msgid "There was an error in the database backend."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:180
+#: src/lib/util/gnunet_error_codes.c:179
 #, fuzzy
 msgid "Failed to store the given records."
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/lib/util/gnunet_error_codes.c:186
+#: src/lib/util/gnunet_error_codes.c:185
 msgid "Label invalid or malformed."
 msgstr ""
 
@@ -3762,16 +3794,6 @@ msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 msgid "Could not determine plugin installation path.\n"
 msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
 
-#: src/lib/util/program.c:287
-#, fuzzy, c-format
-msgid "Unreadable configuration file `%s', exiting ...\n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-
-#: src/lib/util/program.c:299
-#, fuzzy, c-format
-msgid "Malformed configuration file `%s', exiting ...\n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-
 #: src/lib/util/program.c:314
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s'. Exiting ...\n"
@@ -3822,121 +3844,121 @@ msgstr ""
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/lib/util/service.c:654
+#: src/lib/util/service.c:650
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/lib/util/service.c:838
+#: src/lib/util/service.c:841
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/lib/util/service.c:951
+#: src/lib/util/service.c:956
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/lib/util/service.c:992
+#: src/lib/util/service.c:997
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/lib/util/service.c:1095 src/lib/util/service.c:1101
+#: src/lib/util/service.c:1100 src/lib/util/service.c:1106
 #: src/service/arm/gnunet-service-arm.c:412
 #: src/service/arm/gnunet-service-arm.c:418
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/lib/util/service.c:1158 src/service/arm/gnunet-service-arm.c:484
+#: src/lib/util/service.c:1163 src/service/arm/gnunet-service-arm.c:484
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/lib/util/service.c:1176 src/service/arm/gnunet-service-arm.c:505
+#: src/lib/util/service.c:1181 src/service/arm/gnunet-service-arm.c:505
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/lib/util/service.c:1207 src/service/arm/gnunet-service-arm.c:536
+#: src/lib/util/service.c:1212 src/service/arm/gnunet-service-arm.c:536
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/lib/util/service.c:1226 src/service/arm/gnunet-service-arm.c:555
+#: src/lib/util/service.c:1231 src/service/arm/gnunet-service-arm.c:555
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
 # drive = hard drive ?
-#: src/lib/util/service.c:1401
+#: src/lib/util/service.c:1406
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/lib/util/service.c:1413
+#: src/lib/util/service.c:1418
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
 
-#: src/lib/util/service.c:1420
+#: src/lib/util/service.c:1425
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
 
-#: src/lib/util/service.c:1481
+#: src/lib/util/service.c:1486
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/lib/util/service.c:1505
+#: src/lib/util/service.c:1510
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/lib/util/service.c:1573
+#: src/lib/util/service.c:1583
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/lib/util/service.c:1644
+#: src/lib/util/service.c:1653
 msgid "No such user"
 msgstr ""
 
-#: src/lib/util/service.c:1658
+#: src/lib/util/service.c:1668
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
 
-#: src/lib/util/service.c:1751
+#: src/lib/util/service.c:1767
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/lib/util/service.c:1756
+#: src/lib/util/service.c:1772
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/lib/util/service.c:1761
+#: src/lib/util/service.c:1777
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/lib/util/service.c:1960 src/lib/util/service.c:2255
+#: src/lib/util/service.c:1990 src/lib/util/service.c:2304
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/lib/util/service.c:2036 src/lib/util/service.c:2048
-#: src/lib/util/service.c:2298 src/lib/util/service.c:2310
-#: src/service/transport/transport-testing-communicator.c:1056
+#: src/lib/util/service.c:2065 src/lib/util/service.c:2080
+#: src/lib/util/service.c:2353 src/lib/util/service.c:2368
+#: src/service/transport/transport-testing-communicator.c:1059
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/lib/util/service.c:2058 src/lib/util/service.c:2321
+#: src/lib/util/service.c:2092 src/lib/util/service.c:2381
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
@@ -4394,6 +4416,11 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
+#: src/service/arm/testing_arm_cmd_start_peer.c:197
+#, fuzzy, c-format
+msgid "Failed to start `%s': %s\n"
+msgstr "Fel vid %s:%d.\n"
+
 #: src/service/core/gnunet-service-core.c:329
 msgid "# send requests dropped (disconnected)"
 msgstr ""
@@ -4580,8 +4607,8 @@ msgstr "# byte dekrypterade"
 #: src/service/core/gnunet-service-core_sessions.c:337
 #: src/service/fs/gnunet-service-fs_cp.c:484
 #: src/service/fs/gnunet-service-fs_cp.c:1377
-#: src/service/topology/gnunet-daemon-topology.c:551
-#: src/service/topology/gnunet-daemon-topology.c:633
+#: src/service/topology/gnunet-daemon-topology.c:545
+#: src/service/topology/gnunet-daemon-topology.c:627
 #, fuzzy
 msgid "# peers connected"
 msgstr "# av anslutna parter"
@@ -5631,7 +5658,7 @@ msgstr "GNUnet-konfiguration"
 
 #: src/service/fs/gnunet-service-fs.c:1271
 #: src/service/hostlist/gnunet-daemon-hostlist.c:343
-#: src/service/topology/gnunet-daemon-topology.c:1066
+#: src/service/topology/gnunet-daemon-topology.c:1062
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
@@ -6450,7 +6477,7 @@ msgid "# hostlist advertisements send"
 msgstr ""
 
 #: src/service/hostlist/gnunet-daemon-hostlist_server.c:483
-#: src/service/topology/gnunet-daemon-topology.c:786
+#: src/service/topology/gnunet-daemon-topology.c:781
 #, fuzzy, c-format
 msgid "Error in communication with PEERSTORE service: %s\n"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -6719,12 +6746,12 @@ msgstr ""
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/service/nat/gnunet-service-nat.c:1861
+#: src/service/nat/gnunet-service-nat.c:1860
 #, fuzzy
 msgid "Connection reversal request failed\n"
 msgstr "Samling stoppad.\n"
 
-#: src/service/nat/gnunet-service-nat.c:1935
+#: src/service/nat/gnunet-service-nat.c:1999
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
@@ -6748,44 +6775,44 @@ msgstr ""
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1141
+#: src/service/peerstore/gnunet-service-peerstore.c:1150
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1214
+#: src/service/peerstore/gnunet-service-peerstore.c:1223
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1233
+#: src/service/peerstore/gnunet-service-peerstore.c:1242
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1244
+#: src/service/peerstore/gnunet-service-peerstore.c:1253
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/service/peerstore/peerstore_api.c:574
+#: src/service/peerstore/peerstore_api.c:579
 #, fuzzy
 msgid "Unexpected store response.\n"
 msgstr "Oväntat svar till \"%s\" operation.\n"
 
-#: src/service/peerstore/peerstore_api.c:606
+#: src/service/peerstore/peerstore_api.c:620
 #, fuzzy
 msgid "Unexpected iteration response.\n"
 msgstr "Utdataformat är inte känt, detta bör inte hända.\n"
 
-#: src/service/peerstore/peerstore_api.c:652
+#: src/service/peerstore/peerstore_api.c:666
 #, fuzzy
 msgid ""
 "Unexpected iteration response, no iterating client found, discarding "
 "message.\n"
 msgstr "Utdataformat är inte känt, detta bör inte hända.\n"
 
-#: src/service/peerstore/peerstore_api.c:662
-#: src/service/peerstore/peerstore_api_monitor.c:164
+#: src/service/peerstore/peerstore_api.c:676
+#: src/service/peerstore/peerstore_api_monitor.c:163
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
@@ -6964,12 +6991,12 @@ msgstr " Anslutning misslyckades\n"
 msgid "Namestore REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
 
-#: src/service/rest/openid_plugin.c:3102
+#: src/service/rest/openid_plugin.c:3121
 #, fuzzy
 msgid "OpenID Connect REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
 
-#: src/service/rest/pabc_plugin.c:637 src/service/rest/reclaim_plugin.c:1523
+#: src/service/rest/pabc_plugin.c:637 src/service/rest/reclaim_plugin.c:1494
 #, fuzzy
 msgid "Identity Provider REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
@@ -7023,156 +7050,55 @@ msgstr "Ladda ner filer från GNUnet."
 msgid "Could not save some persistent statistics\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/service/testing/gnunet-testing.c:185
-#, fuzzy, c-format
-msgid "Could not extract hostkey %u (offset too large?)\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
-
-#: src/service/testing/gnunet-testing.c:275
-#, c-format
-msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
-msgstr ""
-
-#: src/service/testing/gnunet-testing.c:386
+#: src/service/testbed/gnunet-testbed.c:196
 #, fuzzy
-msgid "create unique configuration files"
+msgid "number of unique configuration files to create"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/service/testing/gnunet-testing.c:392
-msgid "extract hostkey file from pre-computed hostkey list"
-msgstr ""
-
-#: src/service/testing/gnunet-testing.c:400
-#, fuzzy
-msgid ""
-"number of unique configuration files to create, or number of the hostkey to "
-"extract"
-msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
-
-#: src/service/testing/gnunet-testing.c:407
+#: src/service/testbed/gnunet-testbed.c:202
 #, fuzzy
 msgid "configuration template"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/service/testing/gnunet-testing.c:415
-msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
-msgstr ""
-
-#: src/service/testing/gnunet-testing.c:432
+#: src/service/testbed/gnunet-testbed.c:218
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/service/testing/list-keys.c:92
-msgid "list COUNT number of keys"
-msgstr ""
-
-#: src/service/testing/testing.c:291
-#, c-format
-msgid "Hostkeys file not found: %s\n"
-msgstr ""
-
-#: src/service/testing/testing.c:743
-#, fuzzy, c-format
-msgid "Key number %u does not exist\n"
-msgstr "antal meddelanden att använda per iteration"
-
-#: src/service/testing/testing.c:1217
-#, c-format
-msgid ""
-"You attempted to create a testbed with more than %u hosts.  Please "
-"precompute more hostkeys first.\n"
-msgstr ""
-
-#: src/service/testing/testing.c:1226
-#, fuzzy, c-format
-msgid "Failed to initialize hostkey for peer %u\n"
-msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
-
-#: src/service/testing/testing.c:1236
-#, fuzzy
-msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
-msgstr "Inga applikationer definierade i konfiguration!\n"
-
-#: src/service/testing/testing.c:1249
-#, fuzzy
-msgid "Failed to create configuration for peer (not enough free ports?)\n"
-msgstr "Kunde inte komma åt namnrymdsinformation.\n"
-
-#: src/service/testing/testing.c:1265
-#, fuzzy, c-format
-msgid "Cannot open hostkey file `%s': %s\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
-
-#: src/service/testing/testing.c:1279
-#, fuzzy, c-format
-msgid "Failed to write hostkey file for peer %u: %s\n"
-msgstr "Kunde inte skapa användarkonto:"
-
-#: src/service/testing/testing.c:1307
-#, fuzzy, c-format
-msgid "Failed to write configuration file `%s' for peer %u: %s\n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-
-#: src/service/testing/testing.c:1413
-#, fuzzy, c-format
-msgid "Failed to start `%s': %s\n"
-msgstr "Fel vid %s:%d.\n"
-
-#: src/service/testing/testing.c:1664
-#, fuzzy, c-format
-msgid "Failed to load configuration from %s\n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-
-#: src/service/testing/testing.c:2795
-#, fuzzy, c-format
-msgid "Topology file %s not found\n"
-msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
-
-#: src/service/testing/testing.c:2803
-#, c-format
-msgid "Topology file %s has no data\n"
-msgstr ""
-
-#: src/service/testing/testing.c:2811
-#, c-format
-msgid "Topology file %s cannot be read\n"
-msgstr ""
-
 #: src/service/topology/gnunet-daemon-topology.c:286
 #, fuzzy
 msgid "# connect requests issued to ATS"
 msgstr "# byte mottogs via TCP"
 
-#: src/service/topology/gnunet-daemon-topology.c:480
+#: src/service/topology/gnunet-daemon-topology.c:475
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/service/topology/gnunet-daemon-topology.c:752
+#: src/service/topology/gnunet-daemon-topology.c:747
 #, fuzzy
 msgid "Error in communication with PEERSTORE service to monitor.\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/service/topology/gnunet-daemon-topology.c:761
+#: src/service/topology/gnunet-daemon-topology.c:756
 msgid "Finished initial PEERSTORE iteration in monitor.\n"
 msgstr ""
 
-#: src/service/topology/gnunet-daemon-topology.c:869
+#: src/service/topology/gnunet-daemon-topology.c:864
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/service/topology/gnunet-daemon-topology.c:943
+#: src/service/topology/gnunet-daemon-topology.c:938
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/service/topology/gnunet-daemon-topology.c:1095
+#: src/service/topology/gnunet-daemon-topology.c:1091
 msgid "GNUnet topology control"
 msgstr ""
 
 #: src/service/transport/gnunet-communicator-quic.c:1717
 #: src/service/transport/gnunet-communicator-tcp.c:3814
-#: src/service/transport/gnunet-communicator-udp.c:3562
-#: src/service/transport/gnunet-service-transport.c:12124
+#: src/service/transport/gnunet-communicator-udp.c:3579
+#: src/service/transport/gnunet-service-transport.c:12543
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "GNUnet-konfiguration"
@@ -7185,7 +7111,7 @@ msgstr ""
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/service/transport/gnunet-communicator-udp.c:3637
+#: src/service/transport/gnunet-communicator-udp.c:3654
 msgid "GNUnet UDP communicator"
 msgstr ""
 
@@ -7499,6 +7425,50 @@ msgid "Failed to connect to the namestore!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
 #, fuzzy, c-format
+#~ msgid "Could not extract hostkey %u (offset too large?)\n"
+#~ msgstr "Kunde inte skapa värdnyckel!\n"
+
+#, fuzzy
+#~ msgid "create unique configuration files"
+#~ msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
+
+#, fuzzy, c-format
+#~ msgid "Key number %u does not exist\n"
+#~ msgstr "antal meddelanden att använda per iteration"
+
+#, fuzzy, c-format
+#~ msgid "Failed to initialize hostkey for peer %u\n"
+#~ msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+
+#, fuzzy
+#~ msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
+#~ msgstr "Inga applikationer definierade i konfiguration!\n"
+
+#, fuzzy
+#~ msgid "Failed to create configuration for peer (not enough free ports?)\n"
+#~ msgstr "Kunde inte komma åt namnrymdsinformation.\n"
+
+#, fuzzy, c-format
+#~ msgid "Cannot open hostkey file `%s': %s\n"
+#~ msgstr "Kunde inte skapa värdnyckel!\n"
+
+#, fuzzy, c-format
+#~ msgid "Failed to write hostkey file for peer %u: %s\n"
+#~ msgstr "Kunde inte skapa användarkonto:"
+
+#, fuzzy, c-format
+#~ msgid "Failed to write configuration file `%s' for peer %u: %s\n"
+#~ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#, fuzzy, c-format
+#~ msgid "Failed to load configuration from %s\n"
+#~ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#, fuzzy, c-format
+#~ msgid "Topology file %s not found\n"
+#~ msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
+
+#, fuzzy, c-format
 #~ msgid ""
 #~ "Local peer: %s\n"
 #~ "\n"
@@ -8465,10 +8435,6 @@ msgstr "Misslyckades att ansluta till gnunetd.\n"
 #~ msgstr "GNUnet-konfiguration"
 
 #, fuzzy
-#~ msgid "Unreadable or malformed default configuration file `%s', exit ...\n"
-#~ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-
-#, fuzzy
 #~ msgid "Unreadable or malformed configuration, exit ...\n"
 #~ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
diff --git a/po/vi.po b/po/vi.po
index 57e6802a0..1d23f55d9 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2024-03-15 09:19+0100\n"
+"POT-Creation-Date: 2024-05-20 20:21+0200\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -356,26 +356,26 @@ msgstr "Lỗi đ�c danh sách bạn bè từ « %s »\n"
 msgid "Failed to connect to CORE service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/cli/core/gnunet-core.c:212
+#: src/cli/core/gnunet-core.c:213
 #, fuzzy
 msgid "No argument given.\n"
 msgstr "chưa đưa ra tên"
 
-#: src/cli/core/gnunet-core.c:235 src/service/transport/gnunet-transport.c:1389
+#: src/cli/core/gnunet-core.c:238 src/service/transport/gnunet-transport.c:1389
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "In ra thông tin v� các đồng đẳng GNUnet."
 
-#: src/cli/core/gnunet-core.c:241
+#: src/cli/core/gnunet-core.c:244
 msgid "Show our current peer identity"
 msgstr ""
 
-#: src/cli/core/gnunet-core.c:248
+#: src/cli/core/gnunet-core.c:251
 #, fuzzy
 msgid "Show current connections"
 msgstr "# các kết nối dht"
 
-#: src/cli/core/gnunet-core.c:259
+#: src/cli/core/gnunet-core.c:262
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "In ra thông tin v� các đồng đẳng GNUnet."
@@ -1108,54 +1108,54 @@ msgstr "Không thể truy cập đến thông tin v� không gian tên.\n"
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:268
+#: src/cli/gns/gnunet-gns.c:269
 #, fuzzy, c-format
 msgid "`%s' is not a valid DNS domain name\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/cli/gns/gnunet-gns.c:279 src/lib/util/dnsparser.c:273
+#: src/cli/gns/gnunet-gns.c:280 src/lib/util/dnsparser.c:273
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/cli/gns/gnunet-gns.c:294
+#: src/cli/gns/gnunet-gns.c:295
 msgid "Cannot resolve using GNS: GNUnet peer not running\n"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:305
+#: src/cli/gns/gnunet-gns.c:306
 #: src/contrib/service/abd/gnunet-service-abd.c:1745
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/cli/gns/gnunet-gns.c:318
+#: src/cli/gns/gnunet-gns.c:325
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:358
+#: src/cli/gns/gnunet-gns.c:365
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:364
+#: src/cli/gns/gnunet-gns.c:371
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/cli/gns/gnunet-gns.c:370
+#: src/cli/gns/gnunet-gns.c:377
 #, fuzzy
 msgid "Specify a timeout for the lookup"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/cli/gns/gnunet-gns.c:374
+#: src/cli/gns/gnunet-gns.c:381
 msgid "No unneeded output"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:379
+#: src/cli/gns/gnunet-gns.c:386
 msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:393
+#: src/cli/gns/gnunet-gns.c:400
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "Bản ghi lỗi GNUnet"
@@ -1683,7 +1683,11 @@ msgstr ""
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/cli/nse/gnunet-nse.c:124
+#: src/cli/nse/gnunet-nse.c:126
+msgid "Monitor and output current estimates"
+msgstr ""
+
+#: src/cli/nse/gnunet-nse.c:137
 #, fuzzy
 msgid "Show network size estimates from NSE service."
 msgstr "# các yêu cầu get (lấy) dht được nhận"
@@ -1732,87 +1736,91 @@ msgstr ""
 msgid "The time until the DID Document is going to expire (e.g. 5d)"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:805
+#: src/cli/reclaim/gnunet-reclaim.c:813
 #, fuzzy, c-format
 msgid "Ego is required\n"
 msgstr "Bị từ chối đặt tùy ch�n « %s » trong phần « %s » thành « %s ».\n"
 
-#: src/cli/reclaim/gnunet-reclaim.c:812
+#: src/cli/reclaim/gnunet-reclaim.c:820
 #, c-format
 msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:819
+#: src/cli/reclaim/gnunet-reclaim.c:827
 #, fuzzy, c-format
 msgid "Requesting party key is required!\n"
 msgstr "đặt tên hiệu cần dùng (cần thiết)"
 
-#: src/cli/reclaim/gnunet-reclaim.c:837
+#: src/cli/reclaim/gnunet-reclaim.c:846
 msgid "Add or update an attribute NAME"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:842
+#: src/cli/reclaim/gnunet-reclaim.c:851
 msgid "Delete the attribute with ID"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:847
+#: src/cli/reclaim/gnunet-reclaim.c:856
 msgid "The attribute VALUE"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:852
+#: src/cli/reclaim/gnunet-reclaim.c:861
 #, fuzzy
 msgid "The EGO to use"
 msgstr "kích cỡ tin nhắn"
 
-#: src/cli/reclaim/gnunet-reclaim.c:858
+#: src/cli/reclaim/gnunet-reclaim.c:867
 msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:862
+#: src/cli/reclaim/gnunet-reclaim.c:873
+msgid "Specify the relying party URI for a ticket to consume"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:877
 msgid "List attributes for EGO"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:866
+#: src/cli/reclaim/gnunet-reclaim.c:881
 msgid "List credentials for EGO"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:872
+#: src/cli/reclaim/gnunet-reclaim.c:887
 msgid "Credential to use for attribute"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:877
+#: src/cli/reclaim/gnunet-reclaim.c:892
 msgid "Credential name"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:883
+#: src/cli/reclaim/gnunet-reclaim.c:898
 msgid "Issue a ticket for a set of attributes separated by comma"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:888
+#: src/cli/reclaim/gnunet-reclaim.c:903
 msgid "Consume a ticket"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:893
+#: src/cli/reclaim/gnunet-reclaim.c:908
 msgid "Revoke a ticket"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:898
+#: src/cli/reclaim/gnunet-reclaim.c:913
 msgid "Type of attribute"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:903
+#: src/cli/reclaim/gnunet-reclaim.c:918
 msgid "Type of credential"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:907
+#: src/cli/reclaim/gnunet-reclaim.c:922
 msgid "List tickets of ego"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:913
+#: src/cli/reclaim/gnunet-reclaim.c:928
 msgid "Expiration interval of the attribute"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:921
+#: src/cli/reclaim/gnunet-reclaim.c:936
 msgid "re:claimID command line tool"
 msgstr ""
 
@@ -2050,34 +2058,59 @@ msgstr "In ra thống kê v� các thao tác GNUnet."
 msgid "run decoder modus, otherwise runs as encoder"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:154
+#: src/cli/util/gnunet-config.c:101
 msgid "test if the current installation supports the specified BACKEND"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:160
+#: src/cli/util/gnunet-config.c:107
 msgid ""
 "Provide an appropriate value for CFLAGS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:165
+#: src/cli/util/gnunet-config.c:112
 msgid "Is this an experimental build of GNUnet"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:171
+#: src/cli/util/gnunet-config.c:118
 msgid ""
 "Provide an appropriate value for LIBS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:177
+#: src/cli/util/gnunet-config.c:123
+#, fuzzy
+msgid "Do not parse default configuration files"
+msgstr "cập nhật một giá trị trong tập tin cấu hình"
+
+#: src/cli/util/gnunet-config.c:129
 msgid "Provide the path under which GNUnet was installed"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:192
+#: src/cli/util/gnunet-config.c:136
+msgid ""
+"Parse main configuration from this command-line argument and not from disk"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:225
 #, fuzzy
-msgid "Manipulate GNUnet configuration files"
-msgstr "cập nhật một giá trị trong tập tin cấu hình"
+msgid "Failed to load default configuration, exiting ...\n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#: src/cli/util/gnunet-config.c:237
+#, fuzzy
+msgid "Failed to parse configuration, exiting ...\n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#: src/cli/util/gnunet-config.c:249 src/lib/util/program.c:287
+#, fuzzy, c-format
+msgid "Unreadable configuration file `%s', exiting ...\n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#: src/cli/util/gnunet-config.c:263 src/lib/util/program.c:299
+#, fuzzy, c-format
+msgid "Malformed configuration file `%s', exiting ...\n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
 #: src/cli/util/gnunet-crypto-tvg.c:1588
 msgid "verify a test vector from stdin"
@@ -2124,55 +2157,54 @@ msgstr ""
 msgid "Hostkeys file `%s' not found\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/cli/util/gnunet-ecc.c:314
+#: src/cli/util/gnunet-ecc.c:318
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr "�ịnh dạng của tập tin « %s » là không hợp lệ.\n"
 
-#: src/cli/util/gnunet-ecc.c:319 src/service/testing/list-keys.c:47
-#: src/service/testing/testing.c:308
+#: src/cli/util/gnunet-ecc.c:324
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:334
+#: src/cli/util/gnunet-ecc.c:340
 #, fuzzy, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr "Không thể đ�c danh sách bạn bè « %s »\n"
 
-#: src/cli/util/gnunet-ecc.c:388
+#: src/cli/util/gnunet-ecc.c:394
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:452
+#: src/cli/util/gnunet-ecc.c:458
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:458
+#: src/cli/util/gnunet-ecc.c:464
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:464
+#: src/cli/util/gnunet-ecc.c:470
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:469
+#: src/cli/util/gnunet-ecc.c:475
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:474
+#: src/cli/util/gnunet-ecc.c:480
 msgid "print the private key in ASCII format"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:479
+#: src/cli/util/gnunet-ecc.c:485
 msgid "print the public key in HEX format"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:485
+#: src/cli/util/gnunet-ecc.c:491
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:499
+#: src/cli/util/gnunet-ecc.c:505
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
@@ -3262,13 +3294,13 @@ msgstr ""
 msgid "Invalid handle type while writing `%s'"
 msgstr "�ịa chỉ IP định dạng sai: %s\n"
 
-#: src/lib/util/client.c:531 src/lib/util/service.c:1134
+#: src/lib/util/client.c:531 src/lib/util/service.c:1139
 #: src/service/arm/gnunet-service-arm.c:452
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/lib/util/client.c:536 src/lib/util/service.c:1138
+#: src/lib/util/client.c:536 src/lib/util/service.c:1143
 #: src/service/arm/gnunet-service-arm.c:456
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
@@ -3401,17 +3433,17 @@ msgstr ""
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
 
-#: src/lib/util/crypto_ecc.c:554
+#: src/lib/util/crypto_ecc.c:569
 #, fuzzy, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/lib/util/crypto_ecc.c:677
+#: src/lib/util/crypto_ecc.c:692
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
 
-#: src/lib/util/crypto_ecc_setup.c:282 src/lib/util/crypto_ecc_setup.c:304
+#: src/lib/util/crypto_ecc_setup.c:282 src/lib/util/crypto_ecc_setup.c:305
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
@@ -3436,7 +3468,7 @@ msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
 msgid "Expected `%s' to be a directory!\n"
 msgstr "Mong đợi « %s » là một thư mục.\n"
 
-#: src/lib/util/disk.c:1222 src/lib/util/service.c:1642
+#: src/lib/util/disk.c:1222 src/lib/util/service.c:1651
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Không thể lấy thông tin v� ngư�i dùng « %s »: %s\n"
@@ -3631,100 +3663,100 @@ msgstr "Phải gửi một con số cho tùy ch�n « %s ».\n"
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:60
+#: src/lib/util/gnunet_error_codes.c:59
 msgid "No error (success)."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:66
+#: src/lib/util/gnunet_error_codes.c:65
 #, fuzzy
 msgid "Unknown and unspecified error."
 msgstr "Lỗi không rõ.\n"
 
-#: src/lib/util/gnunet_error_codes.c:72
+#: src/lib/util/gnunet_error_codes.c:71
 #, fuzzy
 msgid "Communication with service failed."
 msgstr "Cổng để liên lạc với giao diện ngư�i dùng GNUnet"
 
-#: src/lib/util/gnunet_error_codes.c:78
+#: src/lib/util/gnunet_error_codes.c:77
 #, fuzzy
 msgid "Ego not found."
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/lib/util/gnunet_error_codes.c:84
+#: src/lib/util/gnunet_error_codes.c:83
 msgid "Identifier already in use for another ego."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:90
+#: src/lib/util/gnunet_error_codes.c:89
 msgid "The given ego is invalid or malformed."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:96
+#: src/lib/util/gnunet_error_codes.c:95
 #, fuzzy
 msgid "Unknown namestore error."
 msgstr "Lỗi không rõ.\n"
 
-#: src/lib/util/gnunet_error_codes.c:102 src/lib/util/gnunet_error_codes.c:120
+#: src/lib/util/gnunet_error_codes.c:101 src/lib/util/gnunet_error_codes.c:119
 #, fuzzy
 msgid "Zone iteration failed."
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/lib/util/gnunet_error_codes.c:108
+#: src/lib/util/gnunet_error_codes.c:107
 #, fuzzy
 msgid "Zone not found."
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/lib/util/gnunet_error_codes.c:114
+#: src/lib/util/gnunet_error_codes.c:113
 #, fuzzy
 msgid "Record not found."
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/lib/util/gnunet_error_codes.c:126
+#: src/lib/util/gnunet_error_codes.c:125
 #, fuzzy
 msgid "Zone does not contain any records."
 msgstr "Tập tin « %s » không chứa biệt hiệu.\n"
 
-#: src/lib/util/gnunet_error_codes.c:132
+#: src/lib/util/gnunet_error_codes.c:131
 #, fuzzy
 msgid "Failed to lookup record."
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/lib/util/gnunet_error_codes.c:138
+#: src/lib/util/gnunet_error_codes.c:137
 #, fuzzy
 msgid "No records given."
 msgstr "chưa đưa ra tên"
 
-#: src/lib/util/gnunet_error_codes.c:144
+#: src/lib/util/gnunet_error_codes.c:143
 msgid "Record data invalid."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:150
+#: src/lib/util/gnunet_error_codes.c:149
 #, fuzzy
 msgid "No label given."
 msgstr "chưa đưa ra tên"
 
-#: src/lib/util/gnunet_error_codes.c:156
+#: src/lib/util/gnunet_error_codes.c:155
 #, fuzzy
 msgid "No results given."
 msgstr "chưa đưa ra tên"
 
-#: src/lib/util/gnunet_error_codes.c:162
+#: src/lib/util/gnunet_error_codes.c:161
 msgid "Record already exists."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:168
+#: src/lib/util/gnunet_error_codes.c:167
 msgid "Record size exceeds maximum limit."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:174
+#: src/lib/util/gnunet_error_codes.c:173
 msgid "There was an error in the database backend."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:180
+#: src/lib/util/gnunet_error_codes.c:179
 #, fuzzy
 msgid "Failed to store the given records."
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/lib/util/gnunet_error_codes.c:186
+#: src/lib/util/gnunet_error_codes.c:185
 msgid "Label invalid or malformed."
 msgstr ""
 
@@ -3791,16 +3823,6 @@ msgstr "« %s » thất bại cho thư viện « %s » với lỗi: %s\n"
 msgid "Could not determine plugin installation path.\n"
 msgstr "Không thể truy cập đến thông tin v� không gian tên.\n"
 
-#: src/lib/util/program.c:287
-#, fuzzy, c-format
-msgid "Unreadable configuration file `%s', exiting ...\n"
-msgstr "Không thể lưu tập tin cấu hình « %s »:"
-
-#: src/lib/util/program.c:299
-#, fuzzy, c-format
-msgid "Malformed configuration file `%s', exiting ...\n"
-msgstr "Không thể lưu tập tin cấu hình « %s »:"
-
 #: src/lib/util/program.c:314
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s'. Exiting ...\n"
@@ -3849,120 +3871,120 @@ msgstr ""
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/lib/util/service.c:654
+#: src/lib/util/service.c:650
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/lib/util/service.c:838
+#: src/lib/util/service.c:841
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "\tKhông rõ mi�n tên « %s »\n"
 
-#: src/lib/util/service.c:951
+#: src/lib/util/service.c:956
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/lib/util/service.c:992
+#: src/lib/util/service.c:997
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/lib/util/service.c:1095 src/lib/util/service.c:1101
+#: src/lib/util/service.c:1100 src/lib/util/service.c:1106
 #: src/service/arm/gnunet-service-arm.c:412
 #: src/service/arm/gnunet-service-arm.c:418
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/lib/util/service.c:1158 src/service/arm/gnunet-service-arm.c:484
+#: src/lib/util/service.c:1163 src/service/arm/gnunet-service-arm.c:484
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/lib/util/service.c:1176 src/service/arm/gnunet-service-arm.c:505
+#: src/lib/util/service.c:1181 src/service/arm/gnunet-service-arm.c:505
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/lib/util/service.c:1207 src/service/arm/gnunet-service-arm.c:536
+#: src/lib/util/service.c:1212 src/service/arm/gnunet-service-arm.c:536
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/lib/util/service.c:1226 src/service/arm/gnunet-service-arm.c:555
+#: src/lib/util/service.c:1231 src/service/arm/gnunet-service-arm.c:555
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/lib/util/service.c:1401
+#: src/lib/util/service.c:1406
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
-#: src/lib/util/service.c:1413
+#: src/lib/util/service.c:1418
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
 
-#: src/lib/util/service.c:1420
+#: src/lib/util/service.c:1425
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
 
-#: src/lib/util/service.c:1481
+#: src/lib/util/service.c:1486
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/lib/util/service.c:1505
+#: src/lib/util/service.c:1510
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/lib/util/service.c:1573
+#: src/lib/util/service.c:1583
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/lib/util/service.c:1644
+#: src/lib/util/service.c:1653
 msgid "No such user"
 msgstr "Không có ngư�i dùng như vậy"
 
-#: src/lib/util/service.c:1658
+#: src/lib/util/service.c:1668
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Không thể thay đổi ngư�i dùng/nhóm thành « %s »: %s\n"
 
-#: src/lib/util/service.c:1751
+#: src/lib/util/service.c:1767
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/lib/util/service.c:1756
+#: src/lib/util/service.c:1772
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/lib/util/service.c:1761
+#: src/lib/util/service.c:1777
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/lib/util/service.c:1960 src/lib/util/service.c:2255
+#: src/lib/util/service.c:1990 src/lib/util/service.c:2304
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/lib/util/service.c:2036 src/lib/util/service.c:2048
-#: src/lib/util/service.c:2298 src/lib/util/service.c:2310
-#: src/service/transport/transport-testing-communicator.c:1056
+#: src/lib/util/service.c:2065 src/lib/util/service.c:2080
+#: src/lib/util/service.c:2353 src/lib/util/service.c:2368
+#: src/service/transport/transport-testing-communicator.c:1059
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/lib/util/service.c:2058 src/lib/util/service.c:2321
+#: src/lib/util/service.c:2092 src/lib/util/service.c:2381
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
@@ -4429,6 +4451,11 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
+#: src/service/arm/testing_arm_cmd_start_peer.c:197
+#, fuzzy, c-format
+msgid "Failed to start `%s': %s\n"
+msgstr "Lỗi chạy %s: %s %d\n"
+
 #: src/service/core/gnunet-service-core.c:329
 #, fuzzy
 msgid "# send requests dropped (disconnected)"
@@ -4616,8 +4643,8 @@ msgstr "# các byte đã giải mã"
 #: src/service/core/gnunet-service-core_sessions.c:337
 #: src/service/fs/gnunet-service-fs_cp.c:484
 #: src/service/fs/gnunet-service-fs_cp.c:1377
-#: src/service/topology/gnunet-daemon-topology.c:551
-#: src/service/topology/gnunet-daemon-topology.c:633
+#: src/service/topology/gnunet-daemon-topology.c:545
+#: src/service/topology/gnunet-daemon-topology.c:627
 #, fuzzy
 msgid "# peers connected"
 msgstr "# của các đồng đẳng đã kết nối"
@@ -5670,7 +5697,7 @@ msgstr "Lưu cấu hình ngay bây gi� không?"
 
 #: src/service/fs/gnunet-service-fs.c:1271
 #: src/service/hostlist/gnunet-daemon-hostlist.c:343
-#: src/service/topology/gnunet-daemon-topology.c:1066
+#: src/service/topology/gnunet-daemon-topology.c:1062
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
@@ -6510,7 +6537,7 @@ msgid "# hostlist advertisements send"
 msgstr "# Các quảng cáo ngoại được chuyển tiếp"
 
 #: src/service/hostlist/gnunet-daemon-hostlist_server.c:483
-#: src/service/topology/gnunet-daemon-topology.c:786
+#: src/service/topology/gnunet-daemon-topology.c:781
 #, fuzzy, c-format
 msgid "Error in communication with PEERSTORE service: %s\n"
 msgstr "Cổng để liên lạc với giao diện ngư�i dùng GNUnet"
@@ -6774,12 +6801,12 @@ msgstr ""
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/service/nat/gnunet-service-nat.c:1861
+#: src/service/nat/gnunet-service-nat.c:1860
 #, fuzzy
 msgid "Connection reversal request failed\n"
 msgstr "Thu thập bị dừng.\n"
 
-#: src/service/nat/gnunet-service-nat.c:1935
+#: src/service/nat/gnunet-service-nat.c:1999
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
@@ -6803,44 +6830,44 @@ msgstr ""
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1141
+#: src/service/peerstore/gnunet-service-peerstore.c:1150
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Lỗi đ�c danh sách bạn bè từ « %s »\n"
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1214
+#: src/service/peerstore/gnunet-service-peerstore.c:1223
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "Không thể đ�c danh sách bạn bè « %s »\n"
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1233
+#: src/service/peerstore/gnunet-service-peerstore.c:1242
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1244
+#: src/service/peerstore/gnunet-service-peerstore.c:1253
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/service/peerstore/peerstore_api.c:574
+#: src/service/peerstore/peerstore_api.c:579
 #, fuzzy
 msgid "Unexpected store response.\n"
 msgstr "Gặp sự kiện bất thư�ng: %d\n"
 
-#: src/service/peerstore/peerstore_api.c:606
+#: src/service/peerstore/peerstore_api.c:620
 #, fuzzy
 msgid "Unexpected iteration response.\n"
 msgstr "�ịnh dạng kết xuất không rõ, đi�u này không nên xảy ra.\n"
 
-#: src/service/peerstore/peerstore_api.c:652
+#: src/service/peerstore/peerstore_api.c:666
 #, fuzzy
 msgid ""
 "Unexpected iteration response, no iterating client found, discarding "
 "message.\n"
 msgstr "�ịnh dạng kết xuất không rõ, đi�u này không nên xảy ra.\n"
 
-#: src/service/peerstore/peerstore_api.c:662
-#: src/service/peerstore/peerstore_api_monitor.c:164
+#: src/service/peerstore/peerstore_api.c:676
+#: src/service/peerstore/peerstore_api_monitor.c:163
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Nhận yêu cầu định tuyến\n"
@@ -7018,12 +7045,12 @@ msgstr "Lỗi sơ khởi lõi.\n"
 msgid "Namestore REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
 
-#: src/service/rest/openid_plugin.c:3102
+#: src/service/rest/openid_plugin.c:3121
 #, fuzzy
 msgid "OpenID Connect REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
 
-#: src/service/rest/pabc_plugin.c:637 src/service/rest/reclaim_plugin.c:1523
+#: src/service/rest/pabc_plugin.c:637 src/service/rest/reclaim_plugin.c:1494
 #, fuzzy
 msgid "Identity Provider REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
@@ -7077,156 +7104,56 @@ msgstr "�ã tải %llu byte xuống « %s ».\n"
 msgid "Could not save some persistent statistics\n"
 msgstr "Không thể tạo mi�n tên.\n"
 
-#: src/service/testing/gnunet-testing.c:185
-#, fuzzy, c-format
-msgid "Could not extract hostkey %u (offset too large?)\n"
-msgstr "Không thể đ�c danh sách bạn bè « %s »\n"
-
-#: src/service/testing/gnunet-testing.c:275
-#, c-format
-msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
-msgstr ""
-
-#: src/service/testing/gnunet-testing.c:386
+#: src/service/testbed/gnunet-testbed.c:196
 #, fuzzy
-msgid "create unique configuration files"
-msgstr "cập nhật một giá trị trong tập tin cấu hình"
-
-#: src/service/testing/gnunet-testing.c:392
-msgid "extract hostkey file from pre-computed hostkey list"
-msgstr ""
-
-#: src/service/testing/gnunet-testing.c:400
-#, fuzzy
-msgid ""
-"number of unique configuration files to create, or number of the hostkey to "
-"extract"
+msgid "number of unique configuration files to create"
 msgstr "in ra đầu ra tiêu chuẩn một giá trị từ tập tin cấu hình"
 
-#: src/service/testing/gnunet-testing.c:407
+#: src/service/testbed/gnunet-testbed.c:202
 #, fuzzy
 msgid "configuration template"
 msgstr "Cấu hình đã được lưu."
 
-#: src/service/testing/gnunet-testing.c:415
-msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
-msgstr ""
-
-#: src/service/testing/gnunet-testing.c:432
+#: src/service/testbed/gnunet-testbed.c:218
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/service/testing/list-keys.c:92
-msgid "list COUNT number of keys"
-msgstr ""
-
-#: src/service/testing/testing.c:291
-#, c-format
-msgid "Hostkeys file not found: %s\n"
-msgstr ""
-
-#: src/service/testing/testing.c:743
-#, fuzzy, c-format
-msgid "Key number %u does not exist\n"
-msgstr "đặt số trình n�n cần khởi chạy"
-
-#: src/service/testing/testing.c:1217
-#, c-format
-msgid ""
-"You attempted to create a testbed with more than %u hosts.  Please "
-"precompute more hostkeys first.\n"
-msgstr ""
-
-#: src/service/testing/testing.c:1226
-#, fuzzy, c-format
-msgid "Failed to initialize hostkey for peer %u\n"
-msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
-
-#: src/service/testing/testing.c:1236
-msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
-msgstr ""
-
-#: src/service/testing/testing.c:1249
-#, fuzzy
-msgid "Failed to create configuration for peer (not enough free ports?)\n"
-msgstr "Không thể truy cập đến thông tin v� không gian tên.\n"
-
-#: src/service/testing/testing.c:1265
-#, fuzzy, c-format
-msgid "Cannot open hostkey file `%s': %s\n"
-msgstr "Không thể đ�c danh sách bạn bè « %s »\n"
-
-#: src/service/testing/testing.c:1279
-#, fuzzy, c-format
-msgid "Failed to write hostkey file for peer %u: %s\n"
-msgstr "Lỗi tạo thư mục tạm th�i."
-
-#: src/service/testing/testing.c:1307
-#, fuzzy, c-format
-msgid "Failed to write configuration file `%s' for peer %u: %s\n"
-msgstr "Không thể lưu tập tin cấu hình « %s »:"
-
-#: src/service/testing/testing.c:1413
-#, fuzzy, c-format
-msgid "Failed to start `%s': %s\n"
-msgstr "Lỗi chạy %s: %s %d\n"
-
-#: src/service/testing/testing.c:1664
-#, fuzzy, c-format
-msgid "Failed to load configuration from %s\n"
-msgstr "Không thể lưu tập tin cấu hình « %s »:"
-
-#: src/service/testing/testing.c:2795
-#, fuzzy, c-format
-msgid "Topology file %s not found\n"
-msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
-
-#: src/service/testing/testing.c:2803
-#, fuzzy, c-format
-msgid "Topology file %s has no data\n"
-msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
-
-#: src/service/testing/testing.c:2811
-#, fuzzy, c-format
-msgid "Topology file %s cannot be read\n"
-msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
-
 #: src/service/topology/gnunet-daemon-topology.c:286
 #, fuzzy
 msgid "# connect requests issued to ATS"
 msgstr "# các yêu cầu máy/trình khách lỗ hổng được phun vào"
 
-#: src/service/topology/gnunet-daemon-topology.c:480
+#: src/service/topology/gnunet-daemon-topology.c:475
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# các thông báo gửi đi bị loại b�"
 
-#: src/service/topology/gnunet-daemon-topology.c:752
+#: src/service/topology/gnunet-daemon-topology.c:747
 #, fuzzy
 msgid "Error in communication with PEERSTORE service to monitor.\n"
 msgstr "Cổng để liên lạc với giao diện ngư�i dùng GNUnet"
 
-#: src/service/topology/gnunet-daemon-topology.c:761
+#: src/service/topology/gnunet-daemon-topology.c:756
 msgid "Finished initial PEERSTORE iteration in monitor.\n"
 msgstr ""
 
-#: src/service/topology/gnunet-daemon-topology.c:869
+#: src/service/topology/gnunet-daemon-topology.c:864
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/service/topology/gnunet-daemon-topology.c:943
+#: src/service/topology/gnunet-daemon-topology.c:938
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/service/topology/gnunet-daemon-topology.c:1095
+#: src/service/topology/gnunet-daemon-topology.c:1091
 msgid "GNUnet topology control"
 msgstr ""
 
 #: src/service/transport/gnunet-communicator-quic.c:1717
 #: src/service/transport/gnunet-communicator-tcp.c:3814
-#: src/service/transport/gnunet-communicator-udp.c:3562
-#: src/service/transport/gnunet-service-transport.c:12124
+#: src/service/transport/gnunet-communicator-udp.c:3579
+#: src/service/transport/gnunet-service-transport.c:12543
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "Lưu cấu hình ngay bây gi� không?"
@@ -7239,7 +7166,7 @@ msgstr ""
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/service/transport/gnunet-communicator-udp.c:3637
+#: src/service/transport/gnunet-communicator-udp.c:3654
 msgid "GNUnet UDP communicator"
 msgstr ""
 
@@ -7553,6 +7480,54 @@ msgid "Failed to connect to the namestore!\n"
 msgstr "Không kết nối được đến trình n�n gnunetd."
 
 #, fuzzy, c-format
+#~ msgid "Could not extract hostkey %u (offset too large?)\n"
+#~ msgstr "Không thể đ�c danh sách bạn bè « %s »\n"
+
+#, fuzzy
+#~ msgid "create unique configuration files"
+#~ msgstr "cập nhật một giá trị trong tập tin cấu hình"
+
+#, fuzzy, c-format
+#~ msgid "Key number %u does not exist\n"
+#~ msgstr "đặt số trình n�n cần khởi chạy"
+
+#, fuzzy, c-format
+#~ msgid "Failed to initialize hostkey for peer %u\n"
+#~ msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
+
+#, fuzzy
+#~ msgid "Failed to create configuration for peer (not enough free ports?)\n"
+#~ msgstr "Không thể truy cập đến thông tin v� không gian tên.\n"
+
+#, fuzzy, c-format
+#~ msgid "Cannot open hostkey file `%s': %s\n"
+#~ msgstr "Không thể đ�c danh sách bạn bè « %s »\n"
+
+#, fuzzy, c-format
+#~ msgid "Failed to write hostkey file for peer %u: %s\n"
+#~ msgstr "Lỗi tạo thư mục tạm th�i."
+
+#, fuzzy, c-format
+#~ msgid "Failed to write configuration file `%s' for peer %u: %s\n"
+#~ msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#, fuzzy, c-format
+#~ msgid "Failed to load configuration from %s\n"
+#~ msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#, fuzzy, c-format
+#~ msgid "Topology file %s not found\n"
+#~ msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
+
+#, fuzzy, c-format
+#~ msgid "Topology file %s has no data\n"
+#~ msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
+
+#, fuzzy, c-format
+#~ msgid "Topology file %s cannot be read\n"
+#~ msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
+
+#, fuzzy, c-format
 #~ msgid ""
 #~ "Local peer: %s\n"
 #~ "\n"
@@ -8606,10 +8581,6 @@ msgstr "Không kết nối được đến trình n�n gnunetd."
 #~ msgstr "Lưu cấu hình ngay bây gi� không?"
 
 #, fuzzy
-#~ msgid "Unreadable or malformed default configuration file `%s', exit ...\n"
-#~ msgstr "Không thể lưu tập tin cấu hình « %s »:"
-
-#, fuzzy
 #~ msgid "Unreadable or malformed configuration, exit ...\n"
 #~ msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 145f268a5..b459071c3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2024-03-15 09:19+0100\n"
+"POT-Creation-Date: 2024-05-20 20:21+0200\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -343,27 +343,27 @@ msgstr "解��置文件“%s�失败\n"
 msgid "Failed to connect to CORE service!\n"
 msgstr "�始化“%s��务失败。\n"
 
-#: src/cli/core/gnunet-core.c:212
+#: src/cli/core/gnunet-core.c:213
 #, fuzzy
 msgid "No argument given.\n"
 msgstr "无法获�有关用户“%s�的信�：%s\n"
 
-#: src/cli/core/gnunet-core.c:235 src/service/transport/gnunet-transport.c:1389
+#: src/cli/core/gnunet-core.c:238 src/service/transport/gnunet-transport.c:1389
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
-#: src/cli/core/gnunet-core.c:241
+#: src/cli/core/gnunet-core.c:244
 msgid "Show our current peer identity"
 msgstr ""
 
-#: src/cli/core/gnunet-core.c:248
+#: src/cli/core/gnunet-core.c:251
 #, fuzzy
 msgid "Show current connections"
 msgstr ""
 "\n"
 "按任�键继续\n"
 
-#: src/cli/core/gnunet-core.c:259
+#: src/cli/core/gnunet-core.c:262
 msgid "Print information about connected peers."
 msgstr ""
 
@@ -1060,52 +1060,52 @@ msgstr ""
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:268
+#: src/cli/gns/gnunet-gns.c:269
 #, fuzzy, c-format
 msgid "`%s' is not a valid DNS domain name\n"
 msgstr "“%s���用。\n"
 
-#: src/cli/gns/gnunet-gns.c:279 src/lib/util/dnsparser.c:273
+#: src/cli/gns/gnunet-gns.c:280 src/lib/util/dnsparser.c:273
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "打开日志文件“%s�失败：%s\n"
 
-#: src/cli/gns/gnunet-gns.c:294
+#: src/cli/gns/gnunet-gns.c:295
 msgid "Cannot resolve using GNS: GNUnet peer not running\n"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:305
+#: src/cli/gns/gnunet-gns.c:306
 #: src/contrib/service/abd/gnunet-service-abd.c:1745
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "�始化“%s��务失败。\n"
 
-#: src/cli/gns/gnunet-gns.c:318
+#: src/cli/gns/gnunet-gns.c:325
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:358
+#: src/cli/gns/gnunet-gns.c:365
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:364
+#: src/cli/gns/gnunet-gns.c:371
 msgid "Specify the type of the record to lookup"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:370
+#: src/cli/gns/gnunet-gns.c:377
 msgid "Specify a timeout for the lookup"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:374
+#: src/cli/gns/gnunet-gns.c:381
 msgid "No unneeded output"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:379
+#: src/cli/gns/gnunet-gns.c:386
 msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
 msgstr ""
 
-#: src/cli/gns/gnunet-gns.c:393
+#: src/cli/gns/gnunet-gns.c:400
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "GNUnet 错误日志"
@@ -1632,7 +1632,11 @@ msgstr ""
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/cli/nse/gnunet-nse.c:124
+#: src/cli/nse/gnunet-nse.c:126
+msgid "Monitor and output current estimates"
+msgstr ""
+
+#: src/cli/nse/gnunet-nse.c:137
 msgid "Show network size estimates from NSE service."
 msgstr ""
 
@@ -1680,87 +1684,91 @@ msgstr ""
 msgid "The time until the DID Document is going to expire (e.g. 5d)"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:805
+#: src/cli/reclaim/gnunet-reclaim.c:813
 #, fuzzy, c-format
 msgid "Ego is required\n"
 msgstr "%s：选项“%s�有歧义\n"
 
-#: src/cli/reclaim/gnunet-reclaim.c:812
+#: src/cli/reclaim/gnunet-reclaim.c:820
 #, c-format
 msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:819
+#: src/cli/reclaim/gnunet-reclaim.c:827
 #, fuzzy, c-format
 msgid "Requesting party key is required!\n"
 msgstr "设置�使用的昵称(必须)"
 
-#: src/cli/reclaim/gnunet-reclaim.c:837
+#: src/cli/reclaim/gnunet-reclaim.c:846
 msgid "Add or update an attribute NAME"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:842
+#: src/cli/reclaim/gnunet-reclaim.c:851
 msgid "Delete the attribute with ID"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:847
+#: src/cli/reclaim/gnunet-reclaim.c:856
 msgid "The attribute VALUE"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:852
+#: src/cli/reclaim/gnunet-reclaim.c:861
 #, fuzzy
 msgid "The EGO to use"
 msgstr "消�尺寸"
 
-#: src/cli/reclaim/gnunet-reclaim.c:858
+#: src/cli/reclaim/gnunet-reclaim.c:867
 msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:862
+#: src/cli/reclaim/gnunet-reclaim.c:873
+msgid "Specify the relying party URI for a ticket to consume"
+msgstr ""
+
+#: src/cli/reclaim/gnunet-reclaim.c:877
 msgid "List attributes for EGO"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:866
+#: src/cli/reclaim/gnunet-reclaim.c:881
 msgid "List credentials for EGO"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:872
+#: src/cli/reclaim/gnunet-reclaim.c:887
 msgid "Credential to use for attribute"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:877
+#: src/cli/reclaim/gnunet-reclaim.c:892
 msgid "Credential name"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:883
+#: src/cli/reclaim/gnunet-reclaim.c:898
 msgid "Issue a ticket for a set of attributes separated by comma"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:888
+#: src/cli/reclaim/gnunet-reclaim.c:903
 msgid "Consume a ticket"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:893
+#: src/cli/reclaim/gnunet-reclaim.c:908
 msgid "Revoke a ticket"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:898
+#: src/cli/reclaim/gnunet-reclaim.c:913
 msgid "Type of attribute"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:903
+#: src/cli/reclaim/gnunet-reclaim.c:918
 msgid "Type of credential"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:907
+#: src/cli/reclaim/gnunet-reclaim.c:922
 msgid "List tickets of ego"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:913
+#: src/cli/reclaim/gnunet-reclaim.c:928
 msgid "Expiration interval of the attribute"
 msgstr ""
 
-#: src/cli/reclaim/gnunet-reclaim.c:921
+#: src/cli/reclaim/gnunet-reclaim.c:936
 msgid "re:claimID command line tool"
 msgstr ""
 
@@ -1997,34 +2005,59 @@ msgstr ""
 msgid "run decoder modus, otherwise runs as encoder"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:154
+#: src/cli/util/gnunet-config.c:101
 msgid "test if the current installation supports the specified BACKEND"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:160
+#: src/cli/util/gnunet-config.c:107
 msgid ""
 "Provide an appropriate value for CFLAGS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:165
+#: src/cli/util/gnunet-config.c:112
 msgid "Is this an experimental build of GNUnet"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:171
+#: src/cli/util/gnunet-config.c:118
 msgid ""
 "Provide an appropriate value for LIBS to applications building on top of "
 "GNUnet"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:177
+#: src/cli/util/gnunet-config.c:123
+#, fuzzy
+msgid "Do not parse default configuration files"
+msgstr "更改�置文件中的一个值"
+
+#: src/cli/util/gnunet-config.c:129
 msgid "Provide the path under which GNUnet was installed"
 msgstr ""
 
-#: src/cli/util/gnunet-config.c:192
+#: src/cli/util/gnunet-config.c:136
+msgid ""
+"Parse main configuration from this command-line argument and not from disk"
+msgstr ""
+
+#: src/cli/util/gnunet-config.c:225
 #, fuzzy
-msgid "Manipulate GNUnet configuration files"
-msgstr "更改�置文件中的一个值"
+msgid "Failed to load default configuration, exiting ...\n"
+msgstr "解��置文件“%s�失败\n"
+
+#: src/cli/util/gnunet-config.c:237
+#, fuzzy
+msgid "Failed to parse configuration, exiting ...\n"
+msgstr "解��置文件“%s�失败\n"
+
+#: src/cli/util/gnunet-config.c:249 src/lib/util/program.c:287
+#, fuzzy, c-format
+msgid "Unreadable configuration file `%s', exiting ...\n"
+msgstr "解��置文件“%s�失败\n"
+
+#: src/cli/util/gnunet-config.c:263 src/lib/util/program.c:299
+#, fuzzy, c-format
+msgid "Malformed configuration file `%s', exiting ...\n"
+msgstr "解��置文件“%s�失败\n"
 
 #: src/cli/util/gnunet-crypto-tvg.c:1588
 msgid "verify a test vector from stdin"
@@ -2071,55 +2104,54 @@ msgstr ""
 msgid "Hostkeys file `%s' not found\n"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:314
+#: src/cli/util/gnunet-ecc.c:318
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr "找�到接�“%s�的一个 IP 地�。\n"
 
-#: src/cli/util/gnunet-ecc.c:319 src/service/testing/list-keys.c:47
-#: src/service/testing/testing.c:308
+#: src/cli/util/gnunet-ecc.c:324
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:334
+#: src/cli/util/gnunet-ecc.c:340
 #, fuzzy, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr "找�到接�“%s�的一个 IP 地�。\n"
 
-#: src/cli/util/gnunet-ecc.c:388
+#: src/cli/util/gnunet-ecc.c:394
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:452
+#: src/cli/util/gnunet-ecc.c:458
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:458
+#: src/cli/util/gnunet-ecc.c:464
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:464
+#: src/cli/util/gnunet-ecc.c:470
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:469
+#: src/cli/util/gnunet-ecc.c:475
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:474
+#: src/cli/util/gnunet-ecc.c:480
 msgid "print the private key in ASCII format"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:479
+#: src/cli/util/gnunet-ecc.c:485
 msgid "print the public key in HEX format"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:485
+#: src/cli/util/gnunet-ecc.c:491
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/cli/util/gnunet-ecc.c:499
+#: src/cli/util/gnunet-ecc.c:505
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "更改�置文件中的一个值"
@@ -3197,13 +3229,13 @@ msgstr ""
 msgid "Invalid handle type while writing `%s'"
 msgstr "IP 格�无效：“%s�\n"
 
-#: src/lib/util/client.c:531 src/lib/util/service.c:1134
+#: src/lib/util/client.c:531 src/lib/util/service.c:1139
 #: src/service/arm/gnunet-service-arm.c:452
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/lib/util/client.c:536 src/lib/util/service.c:1138
+#: src/lib/util/client.c:536 src/lib/util/service.c:1143
 #: src/service/arm/gnunet-service-arm.c:456
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
@@ -3332,17 +3364,17 @@ msgstr ""
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "“%s�于 %s:%d 处失败，错误为：%s\n"
 
-#: src/lib/util/crypto_ecc.c:554
+#: src/lib/util/crypto_ecc.c:569
 #, fuzzy, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s�的“%1$s��作失败：%3$u\n"
 
-#: src/lib/util/crypto_ecc.c:677
+#: src/lib/util/crypto_ecc.c:692
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s�的“%1$s��作失败：%3$u\n"
 
-#: src/lib/util/crypto_ecc_setup.c:282 src/lib/util/crypto_ecc_setup.c:304
+#: src/lib/util/crypto_ecc_setup.c:282 src/lib/util/crypto_ecc_setup.c:305
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "找�到接�“%s�的一个 IP 地�。\n"
@@ -3367,7 +3399,7 @@ msgstr "对驱动器“%2$s�的“%1$s��作失败：%3$u\n"
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s�应为目录�\n"
 
-#: src/lib/util/disk.c:1222 src/lib/util/service.c:1642
+#: src/lib/util/disk.c:1222 src/lib/util/service.c:1651
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "无法获�有关用户“%s�的信�：%s\n"
@@ -3558,94 +3590,94 @@ msgstr "您必须�“%s�选项传递一个数字。\n"
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:60
+#: src/lib/util/gnunet_error_codes.c:59
 msgid "No error (success)."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:66
+#: src/lib/util/gnunet_error_codes.c:65
 #, fuzzy
 msgid "Unknown and unspecified error."
 msgstr "未知的用户“%s�\n"
 
-#: src/lib/util/gnunet_error_codes.c:72
+#: src/lib/util/gnunet_error_codes.c:71
 #, fuzzy
 msgid "Communication with service failed."
 msgstr "连接 %s:%u 出错。守护程�在�行�？\n"
 
-#: src/lib/util/gnunet_error_codes.c:78
+#: src/lib/util/gnunet_error_codes.c:77
 msgid "Ego not found."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:84
+#: src/lib/util/gnunet_error_codes.c:83
 msgid "Identifier already in use for another ego."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:90
+#: src/lib/util/gnunet_error_codes.c:89
 msgid "The given ego is invalid or malformed."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:96
+#: src/lib/util/gnunet_error_codes.c:95
 #, fuzzy
 msgid "Unknown namestore error."
 msgstr "未知的用户“%s�\n"
 
-#: src/lib/util/gnunet_error_codes.c:102 src/lib/util/gnunet_error_codes.c:120
+#: src/lib/util/gnunet_error_codes.c:101 src/lib/util/gnunet_error_codes.c:119
 msgid "Zone iteration failed."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:108
+#: src/lib/util/gnunet_error_codes.c:107
 msgid "Zone not found."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:114
+#: src/lib/util/gnunet_error_codes.c:113
 msgid "Record not found."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:126
+#: src/lib/util/gnunet_error_codes.c:125
 msgid "Zone does not contain any records."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:132
+#: src/lib/util/gnunet_error_codes.c:131
 #, fuzzy
 msgid "Failed to lookup record."
 msgstr "�行 %s失败：%s %d\n"
 
-#: src/lib/util/gnunet_error_codes.c:138
+#: src/lib/util/gnunet_error_codes.c:137
 #, fuzzy
 msgid "No records given."
 msgstr "无法获�有关用户“%s�的信�：%s\n"
 
-#: src/lib/util/gnunet_error_codes.c:144
+#: src/lib/util/gnunet_error_codes.c:143
 msgid "Record data invalid."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:150
+#: src/lib/util/gnunet_error_codes.c:149
 msgid "No label given."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:156
+#: src/lib/util/gnunet_error_codes.c:155
 #, fuzzy
 msgid "No results given."
 msgstr "无法获�有关用户“%s�的信�：%s\n"
 
-#: src/lib/util/gnunet_error_codes.c:162
+#: src/lib/util/gnunet_error_codes.c:161
 msgid "Record already exists."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:168
+#: src/lib/util/gnunet_error_codes.c:167
 msgid "Record size exceeds maximum limit."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:174
+#: src/lib/util/gnunet_error_codes.c:173
 msgid "There was an error in the database backend."
 msgstr ""
 
-#: src/lib/util/gnunet_error_codes.c:180
+#: src/lib/util/gnunet_error_codes.c:179
 #, fuzzy
 msgid "Failed to store the given records."
 msgstr "�行 %s失败：%s %d\n"
 
-#: src/lib/util/gnunet_error_codes.c:186
+#: src/lib/util/gnunet_error_codes.c:185
 msgid "Label invalid or malformed."
 msgstr ""
 
@@ -3712,16 +3744,6 @@ msgstr ""
 msgid "Could not determine plugin installation path.\n"
 msgstr "无法确定用户界�定义文件。"
 
-#: src/lib/util/program.c:287
-#, fuzzy, c-format
-msgid "Unreadable configuration file `%s', exiting ...\n"
-msgstr "解��置文件“%s�失败\n"
-
-#: src/lib/util/program.c:299
-#, fuzzy, c-format
-msgid "Malformed configuration file `%s', exiting ...\n"
-msgstr "解��置文件“%s�失败\n"
-
 #: src/lib/util/program.c:314
 #, fuzzy, c-format
 msgid "Unreadable configuration file `%s'. Exiting ...\n"
@@ -3770,120 +3792,120 @@ msgstr ""
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "无法解�“%s�(%s)：%s\n"
 
-#: src/lib/util/service.c:654
+#: src/lib/util/service.c:650
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/lib/util/service.c:838
+#: src/lib/util/service.c:841
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
 
-#: src/lib/util/service.c:951
+#: src/lib/util/service.c:956
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/lib/util/service.c:992
+#: src/lib/util/service.c:997
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/lib/util/service.c:1095 src/lib/util/service.c:1101
+#: src/lib/util/service.c:1100 src/lib/util/service.c:1106
 #: src/service/arm/gnunet-service-arm.c:412
 #: src/service/arm/gnunet-service-arm.c:418
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/lib/util/service.c:1158 src/service/arm/gnunet-service-arm.c:484
+#: src/lib/util/service.c:1163 src/service/arm/gnunet-service-arm.c:484
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/lib/util/service.c:1176 src/service/arm/gnunet-service-arm.c:505
+#: src/lib/util/service.c:1181 src/service/arm/gnunet-service-arm.c:505
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/lib/util/service.c:1207 src/service/arm/gnunet-service-arm.c:536
+#: src/lib/util/service.c:1212 src/service/arm/gnunet-service-arm.c:536
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "打开日志文件“%s�失败：%s\n"
 
-#: src/lib/util/service.c:1226 src/service/arm/gnunet-service-arm.c:555
+#: src/lib/util/service.c:1231 src/service/arm/gnunet-service-arm.c:555
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "找�到接�“%s�的一个 IP 地�。\n"
 
-#: src/lib/util/service.c:1401
+#: src/lib/util/service.c:1406
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "对驱动器“%2$s�的“%1$s��作失败：%3$u\n"
 
-#: src/lib/util/service.c:1413
+#: src/lib/util/service.c:1418
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/lib/util/service.c:1420
+#: src/lib/util/service.c:1425
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "对驱动器“%2$s�的“%1$s��作失败：%3$u\n"
 
-#: src/lib/util/service.c:1481
+#: src/lib/util/service.c:1486
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/lib/util/service.c:1505
+#: src/lib/util/service.c:1510
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/lib/util/service.c:1573
+#: src/lib/util/service.c:1583
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/lib/util/service.c:1644
+#: src/lib/util/service.c:1653
 msgid "No such user"
 msgstr "无此用户"
 
-#: src/lib/util/service.c:1658
+#: src/lib/util/service.c:1668
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "无法更改用户/组为“%s�：%s\n"
 
-#: src/lib/util/service.c:1751
+#: src/lib/util/service.c:1767
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/lib/util/service.c:1756
+#: src/lib/util/service.c:1772
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/lib/util/service.c:1761
+#: src/lib/util/service.c:1777
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/lib/util/service.c:1960 src/lib/util/service.c:2255
+#: src/lib/util/service.c:1990 src/lib/util/service.c:2304
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/lib/util/service.c:2036 src/lib/util/service.c:2048
-#: src/lib/util/service.c:2298 src/lib/util/service.c:2310
-#: src/service/transport/transport-testing-communicator.c:1056
+#: src/lib/util/service.c:2065 src/lib/util/service.c:2080
+#: src/lib/util/service.c:2353 src/lib/util/service.c:2368
+#: src/service/transport/transport-testing-communicator.c:1059
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "解��置文件“%s�失败\n"
 
-#: src/lib/util/service.c:2058 src/lib/util/service.c:2321
+#: src/lib/util/service.c:2092 src/lib/util/service.c:2381
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "解��置文件“%s�失败\n"
@@ -4347,6 +4369,11 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
+#: src/service/arm/testing_arm_cmd_start_peer.c:197
+#, fuzzy, c-format
+msgid "Failed to start `%s': %s\n"
+msgstr "�行 %s失败：%s %d\n"
+
 #: src/service/core/gnunet-service-core.c:329
 msgid "# send requests dropped (disconnected)"
 msgstr ""
@@ -4511,8 +4538,8 @@ msgstr ""
 #: src/service/core/gnunet-service-core_sessions.c:337
 #: src/service/fs/gnunet-service-fs_cp.c:484
 #: src/service/fs/gnunet-service-fs_cp.c:1377
-#: src/service/topology/gnunet-daemon-topology.c:551
-#: src/service/topology/gnunet-daemon-topology.c:633
+#: src/service/topology/gnunet-daemon-topology.c:545
+#: src/service/topology/gnunet-daemon-topology.c:627
 msgid "# peers connected"
 msgstr ""
 
@@ -5523,7 +5550,7 @@ msgstr "立��存�置？"
 
 #: src/service/fs/gnunet-service-fs.c:1271
 #: src/service/hostlist/gnunet-daemon-hostlist.c:343
-#: src/service/topology/gnunet-daemon-topology.c:1066
+#: src/service/topology/gnunet-daemon-topology.c:1062
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "�始化“%s��务失败。\n"
@@ -6322,7 +6349,7 @@ msgid "# hostlist advertisements send"
 msgstr ""
 
 #: src/service/hostlist/gnunet-daemon-hostlist_server.c:483
-#: src/service/topology/gnunet-daemon-topology.c:786
+#: src/service/topology/gnunet-daemon-topology.c:781
 #, fuzzy, c-format
 msgid "Error in communication with PEERSTORE service: %s\n"
 msgstr "连接 %s:%u 出错。守护程�在�行�？\n"
@@ -6584,11 +6611,11 @@ msgstr ""
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/service/nat/gnunet-service-nat.c:1861
+#: src/service/nat/gnunet-service-nat.c:1860
 msgid "Connection reversal request failed\n"
 msgstr ""
 
-#: src/service/nat/gnunet-service-nat.c:1935
+#: src/service/nat/gnunet-service-nat.c:1999
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
@@ -6612,44 +6639,44 @@ msgstr ""
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1141
+#: src/service/peerstore/gnunet-service-peerstore.c:1150
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "解��置文件“%s�失败\n"
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1214
+#: src/service/peerstore/gnunet-service-peerstore.c:1223
 #, fuzzy, c-format
 msgid "Could not load database backend `%s'\n"
 msgstr "无法解�“%s�(%s)：%s\n"
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1233
+#: src/service/peerstore/gnunet-service-peerstore.c:1242
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/service/peerstore/gnunet-service-peerstore.c:1244
+#: src/service/peerstore/gnunet-service-peerstore.c:1253
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/service/peerstore/peerstore_api.c:574
+#: src/service/peerstore/peerstore_api.c:579
 #, fuzzy
 msgid "Unexpected store response.\n"
 msgstr "已完�数�仓库轮�。\n"
 
-#: src/service/peerstore/peerstore_api.c:606
+#: src/service/peerstore/peerstore_api.c:620
 #, fuzzy
 msgid "Unexpected iteration response.\n"
 msgstr "输出格�未知，�应出现这�情况。\n"
 
-#: src/service/peerstore/peerstore_api.c:652
+#: src/service/peerstore/peerstore_api.c:666
 #, fuzzy
 msgid ""
 "Unexpected iteration response, no iterating client found, discarding "
 "message.\n"
 msgstr "输出格�未知，�应出现这�情况。\n"
 
-#: src/service/peerstore/peerstore_api.c:662
-#: src/service/peerstore/peerstore_api_monitor.c:164
+#: src/service/peerstore/peerstore_api.c:676
+#: src/service/peerstore/peerstore_api_monitor.c:163
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "“%s�的�数无效。\n"
@@ -6813,11 +6840,11 @@ msgstr ""
 msgid "Namestore REST API initialized\n"
 msgstr ""
 
-#: src/service/rest/openid_plugin.c:3102
+#: src/service/rest/openid_plugin.c:3121
 msgid "OpenID Connect REST API initialized\n"
 msgstr ""
 
-#: src/service/rest/pabc_plugin.c:637 src/service/rest/reclaim_plugin.c:1523
+#: src/service/rest/pabc_plugin.c:637 src/service/rest/reclaim_plugin.c:1494
 msgid "Identity Provider REST API initialized\n"
 msgstr ""
 
@@ -6869,153 +6896,53 @@ msgstr ""
 msgid "Could not save some persistent statistics\n"
 msgstr "�始化“%s��务失败。\n"
 
-#: src/service/testing/gnunet-testing.c:185
-#, fuzzy, c-format
-msgid "Could not extract hostkey %u (offset too large?)\n"
-msgstr "找�到接�“%s�的一个 IP 地�。\n"
-
-#: src/service/testing/gnunet-testing.c:275
-#, c-format
-msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
-msgstr ""
-
-#: src/service/testing/gnunet-testing.c:386
-#, fuzzy
-msgid "create unique configuration files"
-msgstr "更改�置文件中的一个值"
-
-#: src/service/testing/gnunet-testing.c:392
-msgid "extract hostkey file from pre-computed hostkey list"
-msgstr ""
-
-#: src/service/testing/gnunet-testing.c:400
+#: src/service/testbed/gnunet-testbed.c:196
 #, fuzzy
-msgid ""
-"number of unique configuration files to create, or number of the hostkey to "
-"extract"
+msgid "number of unique configuration files to create"
 msgstr "打��置文件中的一个值到标准输出"
 
-#: src/service/testing/gnunet-testing.c:407
+#: src/service/testbed/gnunet-testbed.c:202
 #, fuzzy
 msgid "configuration template"
 msgstr "�置已�存"
 
-#: src/service/testing/gnunet-testing.c:415
-msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
-msgstr ""
-
-#: src/service/testing/gnunet-testing.c:432
+#: src/service/testbed/gnunet-testbed.c:218
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/service/testing/list-keys.c:92
-msgid "list COUNT number of keys"
-msgstr ""
-
-#: src/service/testing/testing.c:291
-#, c-format
-msgid "Hostkeys file not found: %s\n"
-msgstr ""
-
-#: src/service/testing/testing.c:743
-#, c-format
-msgid "Key number %u does not exist\n"
-msgstr ""
-
-#: src/service/testing/testing.c:1217
-#, c-format
-msgid ""
-"You attempted to create a testbed with more than %u hosts.  Please "
-"precompute more hostkeys first.\n"
-msgstr ""
-
-#: src/service/testing/testing.c:1226
-#, fuzzy, c-format
-msgid "Failed to initialize hostkey for peer %u\n"
-msgstr "�始化“%s��务失败。\n"
-
-#: src/service/testing/testing.c:1236
-msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
-msgstr ""
-
-#: src/service/testing/testing.c:1249
-#, fuzzy
-msgid "Failed to create configuration for peer (not enough free ports?)\n"
-msgstr "解��置文件“%s�失败\n"
-
-#: src/service/testing/testing.c:1265
-#, fuzzy, c-format
-msgid "Cannot open hostkey file `%s': %s\n"
-msgstr "找�到接�“%s�的一个 IP 地�。\n"
-
-#: src/service/testing/testing.c:1279
-#, fuzzy, c-format
-msgid "Failed to write hostkey file for peer %u: %s\n"
-msgstr "��消�失败。\n"
-
-#: src/service/testing/testing.c:1307
-#, fuzzy, c-format
-msgid "Failed to write configuration file `%s' for peer %u: %s\n"
-msgstr "解��置文件“%s�失败\n"
-
-#: src/service/testing/testing.c:1413
-#, fuzzy, c-format
-msgid "Failed to start `%s': %s\n"
-msgstr "�行 %s失败：%s %d\n"
-
-#: src/service/testing/testing.c:1664
-#, fuzzy, c-format
-msgid "Failed to load configuration from %s\n"
-msgstr "解��置文件“%s�失败\n"
-
-#: src/service/testing/testing.c:2795
-#, c-format
-msgid "Topology file %s not found\n"
-msgstr ""
-
-#: src/service/testing/testing.c:2803
-#, c-format
-msgid "Topology file %s has no data\n"
-msgstr ""
-
-#: src/service/testing/testing.c:2811
-#, c-format
-msgid "Topology file %s cannot be read\n"
-msgstr ""
-
 #: src/service/topology/gnunet-daemon-topology.c:286
 msgid "# connect requests issued to ATS"
 msgstr ""
 
-#: src/service/topology/gnunet-daemon-topology.c:480
+#: src/service/topology/gnunet-daemon-topology.c:475
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/service/topology/gnunet-daemon-topology.c:752
+#: src/service/topology/gnunet-daemon-topology.c:747
 #, fuzzy
 msgid "Error in communication with PEERSTORE service to monitor.\n"
 msgstr "连接 %s:%u 出错。守护程�在�行�？\n"
 
-#: src/service/topology/gnunet-daemon-topology.c:761
+#: src/service/topology/gnunet-daemon-topology.c:756
 msgid "Finished initial PEERSTORE iteration in monitor.\n"
 msgstr ""
 
-#: src/service/topology/gnunet-daemon-topology.c:869
+#: src/service/topology/gnunet-daemon-topology.c:864
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/service/topology/gnunet-daemon-topology.c:943
+#: src/service/topology/gnunet-daemon-topology.c:938
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/service/topology/gnunet-daemon-topology.c:1095
+#: src/service/topology/gnunet-daemon-topology.c:1091
 msgid "GNUnet topology control"
 msgstr ""
 
 #: src/service/transport/gnunet-communicator-quic.c:1717
 #: src/service/transport/gnunet-communicator-tcp.c:3814
-#: src/service/transport/gnunet-communicator-udp.c:3562
-#: src/service/transport/gnunet-service-transport.c:12124
+#: src/service/transport/gnunet-communicator-udp.c:3579
+#: src/service/transport/gnunet-service-transport.c:12543
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "立��存�置？"
@@ -7028,7 +6955,7 @@ msgstr ""
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/service/transport/gnunet-communicator-udp.c:3637
+#: src/service/transport/gnunet-communicator-udp.c:3654
 msgid "GNUnet UDP communicator"
 msgstr ""
 
@@ -7332,6 +7259,38 @@ msgstr "��消�失败。\n"
 msgid "Failed to connect to the namestore!\n"
 msgstr "�始化“%s��务失败。\n"
 
+#, fuzzy, c-format
+#~ msgid "Could not extract hostkey %u (offset too large?)\n"
+#~ msgstr "找�到接�“%s�的一个 IP 地�。\n"
+
+#, fuzzy
+#~ msgid "create unique configuration files"
+#~ msgstr "更改�置文件中的一个值"
+
+#, fuzzy, c-format
+#~ msgid "Failed to initialize hostkey for peer %u\n"
+#~ msgstr "�始化“%s��务失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to create configuration for peer (not enough free ports?)\n"
+#~ msgstr "解��置文件“%s�失败\n"
+
+#, fuzzy, c-format
+#~ msgid "Cannot open hostkey file `%s': %s\n"
+#~ msgstr "找�到接�“%s�的一个 IP 地�。\n"
+
+#, fuzzy, c-format
+#~ msgid "Failed to write hostkey file for peer %u: %s\n"
+#~ msgstr "��消�失败。\n"
+
+#, fuzzy, c-format
+#~ msgid "Failed to write configuration file `%s' for peer %u: %s\n"
+#~ msgstr "解��置文件“%s�失败\n"
+
+#, fuzzy, c-format
+#~ msgid "Failed to load configuration from %s\n"
+#~ msgstr "解��置文件“%s�失败\n"
+
 #, fuzzy
 #~ msgid "number of PeerIDs to request"
 #~ msgstr "迭代次数"
@@ -7789,10 +7748,6 @@ msgstr "�始化“%s��务失败。\n"
 #~ msgstr "立��存�置？"
 
 #, fuzzy
-#~ msgid "Unreadable or malformed default configuration file `%s', exit ...\n"
-#~ msgstr "解��置文件“%s�失败\n"
-
-#, fuzzy
 #~ msgid "Unreadable or malformed configuration, exit ...\n"
 #~ msgstr "解��置文件“%s�失败\n"
 
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 994d90952..819ca903e 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -3,9 +3,11 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
 
 dist_pkgdata_DATA = \
   netjail/netjail_core.sh \
-  netjail/netjail_exec.sh \
   netjail/netjail_start.sh \
+  netjail/netjail_exec.sh \
+  netjail/netjail_start_new.sh \
   netjail/netjail_stop.sh \
+  netjail/netjail_test_master.sh \
   netjail/topo.sh \
   testing-ng/block.sh
 
@@ -20,11 +22,13 @@ EXTRA_DIST = \
         sphinx_update.sh
 
 install-data-hook:
-        chmod o+x '$(DESTDIR)$(pkgdatadir)/netjail_core.sh'
-        chmod o+x '$(DESTDIR)$(pkgdatadir)/netjail_start.sh'
-        chmod o+x '$(DESTDIR)$(pkgdatadir)/netjail_stop.sh'
-        chmod o+x '$(DESTDIR)$(pkgdatadir)/netjail_exec.sh'
-        chmod o+x '$(DESTDIR)$(pkgdatadir)/topo.sh'
-        chmod o+x '$(DESTDIR)$(pkgdatadir)/block.sh'
+        chmod +x '$(DESTDIR)$(pkgdatadir)/netjail_core.sh'
+        chmod +x '$(DESTDIR)$(pkgdatadir)/netjail_start.sh'
+        chmod +x '$(DESTDIR)$(pkgdatadir)/netjail_start_new.sh'
+        chmod +x '$(DESTDIR)$(pkgdatadir)/netjail_exec.sh'
+        chmod +x '$(DESTDIR)$(pkgdatadir)/netjail_stop.sh'
+        chmod +x '$(DESTDIR)$(pkgdatadir)/netjail_test_master.sh'
+        chmod +x '$(DESTDIR)$(pkgdatadir)/topo.sh'
+        chmod +x '$(DESTDIR)$(pkgdatadir)/block.sh'
 
 ## EOF
diff --git a/scripts/meson.build b/scripts/meson.build
index 1628bfd13..e36a90578 100644
--- a/scripts/meson.build
+++ b/scripts/meson.build
@@ -1,6 +1,5 @@
 install_data([
               'netjail'/'netjail_core.sh',
-              'netjail'/'netjail_exec.sh',
               'netjail'/'netjail_start.sh',
               'netjail'/'netjail_stop.sh',
               'netjail'/'topo.sh',
@@ -25,4 +24,3 @@ foreach f : binfiles
     output : f,
     copy: true)
 endforeach
-
diff --git a/scripts/netjail/netjail_core.sh b/scripts/netjail/netjail_core.sh
index b71b51451..8a039cd2f 100755
--- a/scripts/netjail/netjail_core.sh
+++ b/scripts/netjail/netjail_core.sh
@@ -52,7 +52,7 @@ netjail_opts() {
         local OPT=$1
         local DEF=$2
         shift 2
-        
+
         while [ $# -gt 0 ]; do
                 if [ "$1" = "$OPT" ]; then
                         printf "$2"
@@ -61,7 +61,7 @@ netjail_opts() {
 
                 shift 1
         done
-        
+
         RESULT="$DEF"
 }
 
@@ -100,7 +100,7 @@ netjail_bridge() {
 
         ip link add $BRIDGE type bridge
         ip link set dev $BRIDGE up
-        
+
         RESULT=$BRIDGE
 }
 
@@ -108,7 +108,7 @@ netjail_bridge_name() {
         netjail_next_interface
         local NUM=$RESULT
         local BRIDGE=$(printf $INTERFACE_FORMAT_STRING $PREPREFIX $PREFIX $NUM)
-        
+
         RESULT=$BRIDGE
 }
 
@@ -124,7 +124,7 @@ netjail_node() {
         local NODE=$(printf $INTERFACE_FORMAT_STRING $PREPREFIX $PREFIX $NUM)
 
         ip netns add $NODE
-        
+
         RESULT=$NODE
 }
 
@@ -132,7 +132,7 @@ netjail_node_name() {
         netjail_next_namespace
         local NUM=$RESULT
         local NODE=$(printf $INTERFACE_FORMAT_STRING $PREPREFIX $PREFIX $NUM)
-        
+
         RESULT=$NODE
 }
 
@@ -215,21 +215,6 @@ netjail_node_exec() {
         ip netns exec $NODE sudo -u $JAILOR -- $@ 1>& $FD_OUT 0<& $FD_IN
 }
 
-netjail_node_exec_without_fds() {
-    JAILOR=${SUDO_USER:?must run in sudo}
-        NODE=$1
-        shift 1
-
-        ip netns exec $NODE sudo -u $JAILOR -- $@
-}
-
-netjail_node_exec_without_fds_and_sudo() {
-        NODE=$1
-        shift 1
-
-        ip netns exec $NODE $@
-}
-
 netjail_kill() {
         local PID=$1
         local MATCH=$(ps --pid $PID | awk "{ if ( \$1 == $PID ) { print \$1 } }" | wc -l)
@@ -264,4 +249,3 @@ netjail_waitall() {
                 done
         fi
 }
-
diff --git a/scripts/netjail/netjail_exec.sh b/scripts/netjail/netjail_exec.sh
index 34edf56bf..a9678cc57 100755..100644
--- a/scripts/netjail/netjail_exec.sh
+++ b/scripts/netjail/netjail_exec.sh
@@ -1,15 +1,7 @@
 #!/bin/bash
 . "$(dirname $0)/netjail_core.sh"
 
-set -eu
-set -x
+NODE=$1
+shift 1
 
-export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-
-M=$1
-N=$2
-
-NODE=$6
-
-#netjail_node_exec_without_fds_and_sudo $NODE valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes --trace-children=yes $3 $4 $5 $1 $2 $7 $8
-netjail_node_exec_without_fds_and_sudo $NODE $3 $4 $5 $1 $2 $7 $8
+ip netns exec $NODE $@
diff --git a/scripts/netjail/netjail_start.sh b/scripts/netjail/netjail_start.sh
index 5e1dd2b1f..1bf9d427a 100755
--- a/scripts/netjail/netjail_start.sh
+++ b/scripts/netjail/netjail_start.sh
@@ -8,11 +8,14 @@ set -x
 export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
 filename=$1
-PREFIX=$2
-readfile=$3
+PREFIX=$PPID
+readfile=$2
 
 BROADCAST=0
 
+# FIXME: We need to test CGNAT. Therefore we have to change the address spaces.
+# We have the backbone network with 192.168.1.X/16 for the global reachable CGN routers and 192.168.2.X/16 for global reachable GNUnet nodes. Every CGN router spans a 10.X.0.0 carrier network for the home router subnets resp. mobile devices. With them given adresses like 10.X.Y.0 with Y being the number of those systems. Home router span a subnet 10.X.Y.0 with device getting address like 10.X.Y.Z with Z being the number of those devices.
+
 if [ $readfile -eq 0 ]
 then
     read_topology_string "$filename"
diff --git a/scripts/netjail/netjail_start_new.sh b/scripts/netjail/netjail_start_new.sh
new file mode 100755
index 000000000..ed9ba71e4
--- /dev/null
+++ b/scripts/netjail/netjail_start_new.sh
@@ -0,0 +1,266 @@
+#!/bin/bash
+. "$(dirname $0)/netjail_core.sh"
+echo gaga
+set -u
+set -x
+
+filename=$1
+
+PREFIX=$2
+readfile=$3
+
+echo gaga
+if [ $readfile -eq 0 ]
+then
+    cmd='gnunet-config -n '
+    option=' -R '
+else
+    echo read file
+    cmd='gnunet-config -n '
+    option=' -c '
+fi
+echo cmd $cmd
+# The order in which the namespaces of the topology are created must be in sync with the order the topology file is parsed in the C code. 
+
+configure_subnet_peer()
+{
+    X=$1
+    Y=$2
+    echo subnet peers $X $Y
+    for Z in $(seq ${CARRIER_SUBNET_PEERS[$X,$Y]}); do
+
+        echo gaga 5
+        TOTAL_NODES=$(($TOTAL_NODES+1))
+
+        SETUP_PROGRAMMS=$($cmd-s CARRIER-$X-SUBNET-$Y-PEER-$Z -o SETUP_PROGRAMMS$option"$filename")
+        if [ -n "$SETUP_PROGRAMMS" ]
+        then
+            CARRIER_SUBNET_PEER_SETUP_PROGRAMMS[$X,$Y,$Z]=$SETUP_PROGRAMMS
+        else
+            CARRIER_SUBNET_PEER_SETUP_PROGRAMMS[$X,$Y,$Z]=$PEER_SETUP_PROGRAMMS
+        fi
+        CARRIER_SUBNET_PEER_TESTBED_PLUGIN=$($cmd-s CARRIER-$X-SUBNET-$Y-PEER-$Z -o TESTBED_PLUGIN$option"$filename")
+        if [ -n "$CARRIER_SUBNET_PEER_TESTBED_PLUGIN" ]
+        then
+            CARRIER_SUBNET_PEER_TESTBED_PLUGIN[$X,$Y,Z]=$CARRIER_SUBNET_PEER_TESTBED_PLUGIN
+        else
+            CARRIER_SUBNET_PEER_TESTBED_PLUGIN[$X,$Y,Z]=$DEFAULT_TESTBED_PLUGIN
+        fi
+
+        ADDRESS=${CARRIER_NET/X/$X}
+        ADDRESS=${ADDRESS/Y/$Y}
+        ADDRESS=${ADDRESS/Z/$Z}
+        netjail_node
+            SUBNET_PEER[$X,$Y,$Z]=$RESULT
+                netjail_node_link_bridge ${SUBNET_PEER[$X,$Y,$Z]} ${SUBNET_ROUTER_NETS[$X,$Y]} $ADDRESS 24
+    done
+}
+
+configure_carrier_subnet()
+{
+    X=$1
+
+    for Y in $(seq ${CARRIER_SUBNETS[$X]}); do
+
+        echo gaga 4
+        TOTAL_NODES=$(($TOTAL_NODES+1))
+
+        SETUP_PROGRAMMS=$($cmd-s CARRIER-$X-SUBNET-$Y -o SETUP_PROGRAMMS$option"$filename")
+        if [ -n "$SETUP_PROGRAMMS" ]
+        then
+            CARRIER_SUBNET_SETUP_PROGRAMMS[$X,$Y]=$SETUP_PROGRAMMS
+        else
+            CARRIER_SUBNET_SETUP_PROGRAMMS[$X,$Y]=$SUBNET_SETUP_PROGRAMMS
+        fi
+        echo subnets $Y
+        CARRIER_SUBNET=$($cmd-s CARRIER-$X-SUBNET-$Y -o SUBNET$option"$filename")
+        if [ -n "$CARRIER_SUBNET" ]
+        then
+            CARRIER_SUBNET[$X,$Y]=$CARRIER_SUBNET
+        else
+            CARRIER_SUBNET[$X,$Y]=$DEFAULT_CARRIER_SUBNET
+        fi
+        CARRIER_SUBNET_PEERS=$($cmd-s CARRIER-$X-SUBNET-$Y -o SUBNET_PEERS$option"$filename")
+        if [ -n "$CARRIER_SUBNET_PEERS" ]
+        then
+            CARRIER_SUBNET_PEERS[$X,$Y]=$CARRIER_SUBNET_PEERS
+        else
+            CARRIER_SUBNET_PEERS[$X,$Y]=$DEFAULT_SUBNET_PEERS
+        fi
+        CARRIER_SUBNET_TESTBED_PLUGIN=$($cmd-s CARRIER-$X-SUBNET-$Y -o TESTBED_PLUGIN$option"$filename")
+        if [ -n "$CARRIER_SUBNET_TESTBED_PLUGIN" ]
+        then
+            CARRIER_SUBNET_TESTBED_PLUGIN[$X,$Y]=$CARRIER_SUBNET_TESTBED_PLUGIN
+        else
+            CARRIER_SUBNET_TESTBED_PLUGIN[$X,$Y]=$DEFAULT_TESTBED_PLUGIN
+        fi
+
+        SUBNET_NODE_NUMBER[$X]=$((${CARRIER_PEERS[$X]}+$Y))
+        ADDRESS=${CARRIER_NET/X/$X}
+        ADDRESS=${ADDRESS/Y/${SUBNET_NODE_NUMBER[$X]}}
+        ADDRESS=${ADDRESS/Z/0}
+        netjail_node
+            SUBNET_ROUTERS[$X,$Y]=$RESULT
+            netjail_node_link_bridge ${SUBNET_ROUTERS[$X,$Y]} ${CARRIER_ROUTER_NETS[$X]} $ADDRESS 16
+            SUBNET_ROUTER_EXT_IF[$X]=$RESULT
+            netjail_bridge
+            SUBNET_ROUTER_NETS[$X,$Y]=$RESULT
+
+        configure_subnet_peer $X $Y
+
+        echo gaga 5.5 ${SUBNET_ROUTERS[$X,$Y]}
+ 
+        ADDRESS=${CARRIER_NET/X/$X}
+        ADDRESS=${ADDRESS/Y/${SUBNET_NODE_NUMBER[$X]}}
+        ADDRESS=${ADDRESS/Z/$((${CARRIER_SUBNET_PEERS[$X,$Y]+}1))}
+        netjail_node_link_bridge ${SUBNET_ROUTERS[$X,$Y]} ${SUBNET_ROUTER_NETS[$X,$Y]} $ADDRESS 24
+        for Z in $(seq ${CARRIER_SUBNET_PEERS[$X,$Y]}); do
+                    netjail_node_add_default ${SUBNET_PEER[$X,$Y,$Z]} $ADDRESS
+            done
+        echo gaga 6
+    done
+}
+
+configure_carrier_peer()
+{
+    X=$1
+    for Y in $(seq ${CARRIER_PEERS[$X]}); do
+
+        echo gaga 3
+        TOTAL_NODES=$(($TOTAL_NODES+1))
+
+        CARRIER_PEER_TESTBED_PLUGIN=$($cmd-s CARRIER-$X-PEER-$Y -o TESTBED_PLUGIN$option"$filename")
+        if [ -n "$CARRIER_PEER_TESTBED_PLUGIN" ]
+        then
+            CARRIER_PEER_TESTBED_PLUGIN[$X,$Y]=$CARRIER_PEER_TESTBED_PLUGIN
+        else
+            CARRIER_PEER_TESTBED_PLUGIN[$X,$Y]=$DEFAULT_TESTBED_PLUGIN
+        fi
+        ADDRESS=${CARRIER_NET/X/$X}
+        ADDRESS=${ADDRESS/Y/$Y}
+        ADDRESS=${ADDRESS/Z/0}
+        netjail_node
+                CARRIER_PEER[$X,$Y]=$RESULT
+                netjail_node_link_bridge ${CARRIER_PEER[$X,$Y]} ${CARRIER_ROUTER_NETS[$X]} $ADDRESS 24
+    done
+}
+
+configure_carriers ()
+{
+    X=$1
+
+    SETUP_PROGRAMMS=$($cmd-s CARRIER-$X -o SETUP_PROGRAMMS$option"$filename")
+    if [ -n "$SETUP_PROGRAMMS" ]
+    then
+        CARRIER_SETUP_PROGRAMMS[$X]=$SETUP_PROGRAMMS
+    else
+        CARRIER_SETUP_PROGRAMMS[$X]=$CARRIER_SETUP_PROGRAMMS[0]
+    fi
+    SUBNET=$($cmd-s CARRIER-$X -o SUBNET$option"$filename")
+    if [ -n "$SUBNET" ]
+    then
+        SUBNET[$X]=$SUBNET
+    else
+        SUBNET[$X]=$DEFAULT_SUBNET
+    fi
+    CARRIER_TESTBED_PLUGIN=$($cmd-s CARRIER-$X -o TESTBED_PLUGIN$option"$filename")
+    if [ -n "$CARRIER_TESTBED_PLUGIN" ]
+    then
+        CARRIER_TESTBED_PLUGIN[$X]=$CARRIER_TESTBED_PLUGIN
+    else
+        CARRIER_TESTBED_PLUGIN[$X]=$DEFAULT_TESTBED_PLUGIN
+    fi
+    CARRIER_PEERS=$($cmd-s CARRIER-$X -o CARRIER_PEERS$option"$filename")
+    if [ -n "$CARRIER_PEERS" ]
+    then
+        CARRIER_PEERS[$X]=$CARRIER_PEERS
+    else
+        CARRIER_PEERS[$X]=$DEFAULT_CARRIER_PEERS
+    fi
+    CARRIER_SUBNETS=$($cmd-s CARRIER-$X -o SUBNETS$option"$filename")
+    if [ -n "$CARRIER_SUBNETS" ]
+    then
+        CARRIER_SUBNETS[$X]=$CARRIER_SUBNETS
+    else
+        CARRIER_SUBNETS[$X]=$DEFAULT_SUBNETS
+    fi
+    # FIXME configure backbone peers
+
+    echo gaga 2
+    ADDRESS=${INET/X/$TOTAL_NODES}
+    netjail_node
+        CARRIER_ROUTERS[$X]=$RESULT
+        netjail_node_link_bridge ${CARRIER_ROUTERS[$X]} $NETWORK_NET $ADDRESS 16
+        netjail_bridge
+        CARRIER_ROUTER_NETS[$X]=$RESULT
+
+    configure_carrier_peer $X
+    configure_carrier_subnet $X
+
+    echo gaga 7 ${CARRIER_PEERS[$X]}
+
+    ROUTER_ADDRESS=${CARRIER_NET/X/$X}
+    ROUTER_ADDRESS=${ROUTER_ADDRESS/Y/$((${SUBNET_NODE_NUMBER[$X]}+1))}
+    ROUTER_ADDRESS=${ROUTER_ADDRESS/Z/0}
+    netjail_node_link_bridge ${CARRIER_ROUTERS[$X]} ${CARRIER_ROUTER_NETS[$X]} $ROUTER_ADDRESS 24
+    for Y in $(seq ${CARRIER_PEERS[$X]}); do
+                netjail_node_add_default ${CARRIER_PEER[$X,$Y]} $ROUTER_ADDRESS
+        done
+    echo gaga 7.5
+    for Y in $(seq ${CARRIER_SUBNETS[$X]}); do
+                netjail_node_add_default ${SUBNET_ROUTERS[$X,$Y]} $ROUTER_ADDRESS
+        done
+    echo gaga 8
+}
+
+DEFAULT_SUBNET=10.X.0.0
+DEFAULT_CARRIER_SUBNET=10.X.Y.0
+
+INET=192.168.1.X
+CARRIER_NET=10.X.Y.Z
+
+
+CARRIER_SETUP_PROGRAMMS[0]=$($cmd-s DEFAULTs -o CARRIER_SETUP_PROGRAMMS$option"$filename")
+SUBNET_SETUP_PROGRAMMS=$($cmd-s DEFAULTs -o SUBNET_SETUP_PROGRAMMS$option"$filename")
+PEER_SETUP_PROGRAMMS[0]=$($cmd-s DEFAULTs -o PEER_SETUP_PROGRAMMS$option"$filename")
+DEFAULT_SUBNETS=$($cmd-s DEFAULTs -o SUBNETS$option"$filename")
+DEFAULT_TESTBED_PLUGIN=$($cmd-s DEFAULTs -o TESTBED_PLUGIN$option"$filename")
+DEFAULT_CARRIER_PEERS=$($cmd-s DEFAULTs -o CARRIER_PEERS$option"$filename")
+DEFAULT_SUBNET_PEERS=$($cmd-s DEFAULTs -o SUBNET_PEERS$option"$filename")
+BACKBONE_PEERS=$($cmd-s BACKBONE -o BACKBONE_PEERS$option"$filename")
+CARRIERS=$($cmd-s BACKBONE -o CARRIERS$option"$filename")
+
+TOTAL_NODES=0
+
+netjail_bridge
+NETWORK_NET=$RESULT
+
+echo gaga 1 $BACKBONE_PEERS
+
+for X in $(seq $BACKBONE_PEERS); do
+    echo gaga 1.1
+    TOTAL_NODES=$(($TOTAL_NODES+1))
+    BACKBONE_PEER_TESTBED_PLUGIN=$($cmd-s BACKBONE-PEER-$X -o TESTBED_PLUGIN$option"$filename")
+    if [ -n "$BACKBONE_PEER_TESTBED_PLUGIN" ]
+    then
+        BACKBONE_PEER_TESTBED_PLUGIN[$X]=$BACKBONE_PEER_TESTBED_PLUGIN
+    else
+        BACKBONE_PEER_TESTBED_PLUGIN[$X]=$DEFAULT_TESTBED_PLUGIN
+    fi
+    # FIXME configure backbone peers
+
+    echo gaga 0 $BACKBONE_PEER_TESTBED_PLUGIN
+    netjail_node
+        BB_PEERS[$X]=$RESULT
+    ADDRESS=${INET/X/$TOTAL_NODES}
+        netjail_node_link_bridge ${BB_PEERS[$X]} $NETWORK_NET $ADDRESS  16
+done
+
+IPT=iptables-nft
+
+for X in $(seq $CARRIERS); do
+    TOTAL_NODES=$(($TOTAL_NODES+1))
+    configure_carriers $X
+done
+
+
diff --git a/scripts/netjail/netjail_stop.sh b/scripts/netjail/netjail_stop.sh
index 8f6c07f50..c17a4d6ca 100755
--- a/scripts/netjail/netjail_stop.sh
+++ b/scripts/netjail/netjail_stop.sh
@@ -8,7 +8,7 @@ set -x
 export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
 filename=$1
-PREFIX=$2
+PREFIX=$PPID
 readfile=$3
 
 if [ $readfile -eq 0 ]
diff --git a/scripts/netjail/netjail_test_master.sh b/scripts/netjail/netjail_test_master.sh
new file mode 100755
index 000000000..9487f3106
--- /dev/null
+++ b/scripts/netjail/netjail_test_master.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+if ! [ -d "/run/netns" ];
+then
+    echo "You have to create the directory '/run/netns'."
+    exit 77
+fi
+if [ -f /proc/sys/kernel/unprivileged_userns_clone ];
+then
+    if [ "$(cat /proc/sys/kernel/unprivileged_userns_clone)" != 1 ];
+    then
+        echo -e "Error during test setup: The kernel parameter 'kernel.unprivileged_userns_clone' has to be set to 1! One has to execute\n\n sysctl kernel.unprivileged_userns_clone=1\n"
+        exit 77
+    fi
+else
+    echo -e "Error during test setup: The kernel lacks the parameter 'kernel.unprivileged_userns_clone'\n"
+    exit 77
+fi
+exec unshare -r -nmU bash -c "mount -t tmpfs --make-rshared tmpfs /run/netns; $*"
diff --git a/src/cli/core/gnunet-core.c b/src/cli/core/gnunet-core.c
index d351a2f7f..00b08eefc 100644
--- a/src/cli/core/gnunet-core.c
+++ b/src/cli/core/gnunet-core.c
@@ -204,14 +204,17 @@ run (void *cls,
     if (NULL == mh)
     {
       fprintf (stderr, "%s", _ ("Failed to connect to CORE service!\n"));
+      GNUNET_free (keyfile);
       return;
     }
   }
   if (! show_pid && ! show_conns && ! monitor_connections)
   {
     fprintf (stderr, "%s", _ ("No argument given.\n"));
+    GNUNET_free (keyfile);
     return;
   }
+  GNUNET_free (keyfile);
   GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL);
 }
 
diff --git a/src/cli/gns/test_dns2gns.sh b/src/cli/gns/test_dns2gns.sh
index a6024ca3c..a5657a719 100755
--- a/src/cli/gns/test_dns2gns.sh
+++ b/src/cli/gns/test_dns2gns.sh
@@ -8,7 +8,7 @@ if [ -z $LOCATION ]
 then
   LOCATION="gnunet-config"
 fi
-$LOCATION --version 1> /dev/null
+$LOCATION --list-sections 1> /dev/null
 if test $? != 0
 then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
diff --git a/src/cli/gns/test_gns_at_lookup.sh b/src/cli/gns/test_gns_at_lookup.sh
index 6a2c958de..b10ecfd18 100755
--- a/src/cli/gns/test_gns_at_lookup.sh
+++ b/src/cli/gns/test_gns_at_lookup.sh
@@ -7,7 +7,7 @@ if [ -z $LOCATION ]
 then
   LOCATION="gnunet-config"
 fi
-$LOCATION --version 1> /dev/null
+$LOCATION --list-sections 1> /dev/null
 if test $? != 0
 then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
diff --git a/src/cli/gns/test_gns_box_sbox.sh b/src/cli/gns/test_gns_box_sbox.sh
index d7e95912e..062194091 100755
--- a/src/cli/gns/test_gns_box_sbox.sh
+++ b/src/cli/gns/test_gns_box_sbox.sh
@@ -7,7 +7,7 @@ if [ -z $LOCATION ]
 then
   LOCATION="gnunet-config"
 fi
-$LOCATION --version 1> /dev/null
+$LOCATION --list-sections 1> /dev/null
 if test $? != 0
 then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
diff --git a/src/cli/gns/test_gns_caa_lookup.sh b/src/cli/gns/test_gns_caa_lookup.sh
index fb488f47b..5740caf4c 100755
--- a/src/cli/gns/test_gns_caa_lookup.sh
+++ b/src/cli/gns/test_gns_caa_lookup.sh
@@ -7,7 +7,7 @@ if [ -z $LOCATION ]
 then
   LOCATION="gnunet-config"
 fi
-$LOCATION --version 1> /dev/null
+$LOCATION --list-sections 1> /dev/null
 if test $? != 0
 then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
diff --git a/src/cli/gns/test_gns_config_lookup.sh b/src/cli/gns/test_gns_config_lookup.sh
index bda08f87b..4b01ddbd8 100755
--- a/src/cli/gns/test_gns_config_lookup.sh
+++ b/src/cli/gns/test_gns_config_lookup.sh
@@ -7,7 +7,7 @@ if [ -z $LOCATION ]
 then
   LOCATION="gnunet-config"
 fi
-$LOCATION --version 1> /dev/null
+$LOCATION --list-sections 1> /dev/null
 if test $? != 0
 then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
diff --git a/src/cli/gns/test_gns_delegated_lookup.sh b/src/cli/gns/test_gns_delegated_lookup.sh
index 5105abdb5..b90d2d750 100755
--- a/src/cli/gns/test_gns_delegated_lookup.sh
+++ b/src/cli/gns/test_gns_delegated_lookup.sh
@@ -8,7 +8,7 @@ if [ -z $LOCATION ]
 then
   LOCATION="gnunet-config"
 fi
-$LOCATION --version 1> /dev/null
+$LOCATION --list-sections 1> /dev/null
 if test $? != 0
 then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
diff --git a/src/cli/gns/test_gns_dht_lookup.sh b/src/cli/gns/test_gns_dht_lookup.sh
index da87d8477..bd342fff7 100755
--- a/src/cli/gns/test_gns_dht_lookup.sh
+++ b/src/cli/gns/test_gns_dht_lookup.sh
@@ -8,7 +8,7 @@ if [ -z $LOCATION ]
 then
   LOCATION="gnunet-config"
 fi
-$LOCATION --version 1> /dev/null
+$LOCATION --list-sections 1> /dev/null
 if test $? != 0
 then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
diff --git a/src/cli/gns/test_gns_gns2dns_cname_lookup.sh b/src/cli/gns/test_gns_gns2dns_cname_lookup.sh
index c33c9d132..885c9991a 100755
--- a/src/cli/gns/test_gns_gns2dns_cname_lookup.sh
+++ b/src/cli/gns/test_gns_gns2dns_cname_lookup.sh
@@ -7,7 +7,7 @@ if [ -z $LOCATION ]
 then
   LOCATION="gnunet-config"
 fi
-$LOCATION --version 1> /dev/null
+$LOCATION --list-sections 1> /dev/null
 if test $? != 0
 then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
diff --git a/src/cli/gns/test_gns_gns2dns_lookup.sh b/src/cli/gns/test_gns_gns2dns_lookup.sh
index 43a4756d3..4e2801432 100755
--- a/src/cli/gns/test_gns_gns2dns_lookup.sh
+++ b/src/cli/gns/test_gns_gns2dns_lookup.sh
@@ -6,7 +6,7 @@ if [ -z $LOCATION ]
 then
   LOCATION="gnunet-config"
 fi
-$LOCATION --version 1> /dev/null
+$LOCATION --list-sections 1> /dev/null
 if test $? != 0
 then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
diff --git a/src/cli/gns/test_gns_gns2dns_zkey_lookup.sh b/src/cli/gns/test_gns_gns2dns_zkey_lookup.sh
index 03549314e..e497815a7 100755
--- a/src/cli/gns/test_gns_gns2dns_zkey_lookup.sh
+++ b/src/cli/gns/test_gns_gns2dns_zkey_lookup.sh
@@ -6,7 +6,7 @@ if [ -z $LOCATION ]
 then
   LOCATION="gnunet-config"
 fi
-$LOCATION --version 1> /dev/null
+$LOCATION --list-sections 1> /dev/null
 if test $? != 0
 then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
diff --git a/src/cli/gns/test_gns_ipv6_lookup.sh b/src/cli/gns/test_gns_ipv6_lookup.sh
index 31e662f68..1b4849b32 100755
--- a/src/cli/gns/test_gns_ipv6_lookup.sh
+++ b/src/cli/gns/test_gns_ipv6_lookup.sh
@@ -7,7 +7,7 @@ if [ -z $LOCATION ]
 then
   LOCATION="gnunet-config"
 fi
-$LOCATION --version 1> /dev/null
+$LOCATION --list-sections 1> /dev/null
 if test $? != 0
 then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
diff --git a/src/cli/gns/test_gns_lightest.sh b/src/cli/gns/test_gns_lightest.sh
index 2d2203e66..dff5db225 100755
--- a/src/cli/gns/test_gns_lightest.sh
+++ b/src/cli/gns/test_gns_lightest.sh
@@ -7,7 +7,7 @@ if [ -z $LOCATION ]
 then
   LOCATION="gnunet-config"
 fi
-$LOCATION --version 1> /dev/null
+$LOCATION --list-sections 1> /dev/null
 if test $? != 0
 then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
diff --git a/src/cli/gns/test_gns_lookup.sh b/src/cli/gns/test_gns_lookup.sh
index 92dfae28b..5cdd7791f 100755
--- a/src/cli/gns/test_gns_lookup.sh
+++ b/src/cli/gns/test_gns_lookup.sh
@@ -7,7 +7,7 @@ if [ -z $LOCATION ]
 then
   LOCATION="gnunet-config"
 fi
-$LOCATION --version 1> /dev/null
+$LOCATION --list-sections 1> /dev/null
 if test $? != 0
 then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
diff --git a/src/cli/gns/test_gns_multiple_record_lookup.sh b/src/cli/gns/test_gns_multiple_record_lookup.sh
index 52a487329..958f85cd4 100755
--- a/src/cli/gns/test_gns_multiple_record_lookup.sh
+++ b/src/cli/gns/test_gns_multiple_record_lookup.sh
@@ -13,7 +13,7 @@ if [ -z $LOCATION ]
 then
   LOCATION="gnunet-config"
 fi
-$LOCATION --version 1> /dev/null
+$LOCATION --list-sections 1> /dev/null
 if test $? != 0
 then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
diff --git a/src/cli/gns/test_gns_mx_lookup.sh b/src/cli/gns/test_gns_mx_lookup.sh
index 6f2b8192d..d13bbcba7 100755
--- a/src/cli/gns/test_gns_mx_lookup.sh
+++ b/src/cli/gns/test_gns_mx_lookup.sh
@@ -7,7 +7,7 @@ if [ -z $LOCATION ]
 then
   LOCATION="gnunet-config"
 fi
-$LOCATION --version 1> /dev/null
+$LOCATION --list-sections 1> /dev/null
 if test $? != 0
 then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
diff --git a/src/cli/gns/test_gns_quickupdate.sh b/src/cli/gns/test_gns_quickupdate.sh
index eac69103d..e3877b6f0 100755
--- a/src/cli/gns/test_gns_quickupdate.sh
+++ b/src/cli/gns/test_gns_quickupdate.sh
@@ -7,7 +7,7 @@ if [ -z $LOCATION ]
 then
   LOCATION="gnunet-config"
 fi
-$LOCATION --version 1> /dev/null
+$LOCATION --list-sections 1> /dev/null
 if test $? != 0
 then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
diff --git a/src/cli/gns/test_gns_redirect_lookup.sh b/src/cli/gns/test_gns_redirect_lookup.sh
index 90729713d..d07406511 100755
--- a/src/cli/gns/test_gns_redirect_lookup.sh
+++ b/src/cli/gns/test_gns_redirect_lookup.sh
@@ -7,7 +7,7 @@ if [ -z $LOCATION ]
 then
   LOCATION="gnunet-config"
 fi
-$LOCATION --version 1> /dev/null
+$LOCATION --list-sections 1> /dev/null
 if test $? != 0
 then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
diff --git a/src/cli/gns/test_gns_rel_expiration.sh b/src/cli/gns/test_gns_rel_expiration.sh
index a240cfd0f..01a61bcb3 100755
--- a/src/cli/gns/test_gns_rel_expiration.sh
+++ b/src/cli/gns/test_gns_rel_expiration.sh
@@ -14,7 +14,7 @@ then
   exit 77
 fi
 
-$LOCATION --version 1> /dev/null
+$LOCATION --list-sections 1> /dev/null
 if test $? != 0
 then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
diff --git a/src/cli/gns/test_gns_revocation.sh b/src/cli/gns/test_gns_revocation.sh
index 2253adcb4..f3c9b3d8c 100755
--- a/src/cli/gns/test_gns_revocation.sh
+++ b/src/cli/gns/test_gns_revocation.sh
@@ -8,7 +8,7 @@ if [ -z $LOCATION ]
 then
   LOCATION="gnunet-config"
 fi
-$LOCATION --version 1> /dev/null
+$LOCATION --list-sections 1> /dev/null
 if test $? != 0
 then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
diff --git a/src/cli/gns/test_gns_sbox.sh b/src/cli/gns/test_gns_sbox.sh
index 6918bf130..313590587 100755
--- a/src/cli/gns/test_gns_sbox.sh
+++ b/src/cli/gns/test_gns_sbox.sh
@@ -7,7 +7,7 @@ if [ -z $LOCATION ]
 then
   LOCATION="gnunet-config"
 fi
-$LOCATION --version 1> /dev/null
+$LOCATION --list-sections 1> /dev/null
 if test $? != 0
 then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
diff --git a/src/cli/gns/test_gns_sbox_simple.sh b/src/cli/gns/test_gns_sbox_simple.sh
index f0d31e471..e29a00be1 100755
--- a/src/cli/gns/test_gns_sbox_simple.sh
+++ b/src/cli/gns/test_gns_sbox_simple.sh
@@ -7,7 +7,7 @@ if [ -z $LOCATION ]
 then
   LOCATION="gnunet-config"
 fi
-$LOCATION --version 1> /dev/null
+$LOCATION --list-sections 1> /dev/null
 if test $? != 0
 then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
diff --git a/src/cli/gns/test_gns_soa_lookup.sh b/src/cli/gns/test_gns_soa_lookup.sh
index a697782bb..cd358cc32 100755
--- a/src/cli/gns/test_gns_soa_lookup.sh
+++ b/src/cli/gns/test_gns_soa_lookup.sh
@@ -7,7 +7,7 @@ if [ -z $LOCATION ]
 then
   LOCATION="gnunet-config"
 fi
-$LOCATION --version 1> /dev/null
+$LOCATION --list-sections 1> /dev/null
 if test $? != 0
 then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
diff --git a/src/cli/gns/test_gns_txt_lookup.sh b/src/cli/gns/test_gns_txt_lookup.sh
index 4e36e8ad8..038ee596b 100755
--- a/src/cli/gns/test_gns_txt_lookup.sh
+++ b/src/cli/gns/test_gns_txt_lookup.sh
@@ -7,7 +7,7 @@ if [ -z $LOCATION ]
 then
   LOCATION="gnunet-config"
 fi
-$LOCATION --version 1> /dev/null
+$LOCATION --list-sections 1> /dev/null
 if test $? != 0
 then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
diff --git a/src/cli/gns/test_gns_zkey_lookup.sh b/src/cli/gns/test_gns_zkey_lookup.sh
index 3d4aefc7c..d7cc1a475 100755
--- a/src/cli/gns/test_gns_zkey_lookup.sh
+++ b/src/cli/gns/test_gns_zkey_lookup.sh
@@ -8,7 +8,7 @@ if [ -z $LOCATION ]
 then
   LOCATION="gnunet-config"
 fi
-$LOCATION --version 1> /dev/null
+$LOCATION --list-sections 1> /dev/null
 if test $? != 0
 then
         echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
diff --git a/src/cli/reclaim/test_reclaim.conf b/src/cli/reclaim/test_reclaim.conf
index 83a5c30d9..a8d2c808a 100644
--- a/src/cli/reclaim/test_reclaim.conf
+++ b/src/cli/reclaim/test_reclaim.conf
@@ -8,7 +8,8 @@ START_ON_DEMAND = YES
 
 [rest]
 START_ON_DEMAND = YES
-PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=$GNUNET_TMP/restlog
+# PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=$GNUNET_TMP/restlog
+BASIC_AUTH_ENABLED = NO
 
 [transport]
 PLUGINS =
@@ -34,6 +35,10 @@ ZONE_PUBLISH_TIME_WINDOW = 1 h
 DNS_ROOT=PD67SGHF3E0447TU9HADIVU9OM7V4QHTOG0EBU69TFRI2LG63DR0
 
 [reclaim-rest-plugin]
-address = http://localhost:8000/#/login
-psw = mysupersecretpassword
 expiration_time = 3600
+JWT_SECRET = secret
+OIDC_USERINFO_CONSUME_TIMEOUT = 5s
+OIDC_DIR = $GNUNET_DATA_HOME/oidc
+OIDC_CLIENT_HMAC_SECRET = secret
+OIDC_JSON_WEB_ALGORITHM = RS256
+ADDRESS = https://ui.reclaim/#/login
diff --git a/src/cli/reclaim/test_reclaim_oidc.sh b/src/cli/reclaim/test_reclaim_oidc.sh
new file mode 100755
index 000000000..cdea61a03
--- /dev/null
+++ b/src/cli/reclaim/test_reclaim_oidc.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+trap "gnunet-arm -e -c test_reclaim.conf" SIGINT
+
+LOCATION=$(which gnunet-config)
+if [ -z $LOCATION ]
+then
+  LOCATION="gnunet-config"
+fi
+$LOCATION --version 1>/dev/null
+if test $? != 0
+then
+        echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX"
+        exit 77
+fi
+
+rm -rf `gnunet-config -c test_reclaim.conf -s PATHS -o GNUNET_HOME -f`
+
+which timeout >/dev/null 2>&1 && DO_TIMEOUT="timeout 30"
+
+RES=0
+TEST_ATTR="test"
+REDIRECT_URI="https://example.gns.alt/my_cb"
+SCOPE="\"openid email name\""
+gnunet-arm -s -c test_reclaim.conf
+gnunet-arm -i rest -c test_reclaim.conf
+gnunet-arm -I
+gnunet-identity -C testego -c test_reclaim.conf
+gnunet-identity -C rpego -c test_reclaim.conf
+TEST_KEY=$(gnunet-identity -d -e rpego -q -c test_reclaim.conf)
+SUBJECT_KEY=$(gnunet-identity -d -e testego -q -c test_reclaim.conf)
+gnunet-reclaim -e testego -a email -V john@doe.gnu -c test_reclaim.conf
+gnunet-reclaim -e testego -a name -V John -c test_reclaim.conf
+
+# Register client
+gnunet-namestore -z rpego -a -n @ -t RECLAIM_OIDC_CLIENT -V "My RP" -e 1d -p -c test_reclaim.conf
+gnunet-namestore -z rpego -a -n @ -t RECLAIM_OIDC_REDIRECT -V $REDIRECT_URI -e 1d -p -c test_reclaim.conf
+
+gnunet-gns -u @.$TEST_KEY -t RECLAIM_OIDC_REDIRECT -c test_reclaim.conf
+curl -v -X POST -H -v "http://localhost:7776/openid/login" --data "{\"identity\": \"$SUBJECT_KEY\"}"
+
+PKCE_CHALLENGE=$(echo -n secret | openssl dgst -binary -sha256 | openssl base64 | sed 's/\=//g' | sed 's/+/-/g' | sed 's/\//_/g')
+
+CODE=$(curl -H "Cookie: Identity=$SUBJECT_KEY" "http://localhost:7776/openid/authorize?client_id=$TEST_KEY&response_type=code&redirect_uri=$REDIRECT_URI&scope=openid&claims=%7B%22userinfo%22%3A%20%7B%22email%22%3A%20%7B%22essential%22%20%20%20%20%3A%20true%7D%7D%2C%22id_token%22%3A%20%7B%22email%22%3A%20%7B%22essential%22%3A%20true%7D%7D%7D&state=xyz&code_challenge=$PKCE_CHALLENGE&code_challenge_method=S256" \
+  -sS -D - -o /dev/null | grep "Location: " | cut -d" " -f2 | cut -d"?" -f2 | cut -d"&" -f1 | cut -d"=" -f2)
+
+echo "Code: $CODE"
+
+curl -v -X POST -u$TEST_KEY:"secret" "http://localhost:7776/openid/token?client_id=$TEST_KEY&response_type=code&redirect_uri=$REDIRECT_URI&scope=openid&claims=%7B%22userinfo%22%3A%20%7B%22email%22%3A%20%7B%22essential%22%20%20%20%20%3A%20true%7D%7D%2C%22id_token%22%3A%20%7B%22email%22%3A%20%7B%22essential%22%3A%20true%7D%7D%7D&state=xyz&grant_type=authorization_code&code=$CODE&code_verifier=secret"
+
+gnunet-identity -D testego -c test_reclaim.conf
+gnunet-identity -D rpego -c test_reclaim.conf
+gnunet-arm -e -c test_reclaim.conf
+if test $RES != 0
+then
+  echo "Failed."
+fi
+
diff --git a/src/cli/util/gnunet-config.c b/src/cli/util/gnunet-config.c
index 714c683dd..979f0b3f4 100644
--- a/src/cli/util/gnunet-config.c
+++ b/src/cli/util/gnunet-config.c
@@ -35,7 +35,6 @@
  */
 static char *backend_check;
 
-
 /**
  * If printing the value of CFLAGS has been requested.
  */
@@ -46,13 +45,21 @@ static int cflags;
  */
 static int is_experimental;
 
+/**
+ * Do not load default configuration
+ */
+static int no_defaults;
+
+/**
+ * Parse configuration from this memory.
+ */
+static char *ram_config;
 
 /**
  * If printing the value of LIBS has been requested.
  */
 static int libs;
 
-
 /**
  * If printing the value of PREFIX has been requested.
  */
@@ -60,76 +67,6 @@ static int prefix;
 
 
 /**
- * Print each option in a given section.
- * Main task to run to perform operations typical for
- * gnunet-config as per the configuration settings
- * given in @a cls.
- *
- * @param cls closure with the `struct GNUNET_CONFIGURATION_ConfigSettings`
- * @param args remaining command-line arguments
- * @param cfgfile name of the configuration file used (for saving,
- *                                                     can be NULL!)
- * @param cfg configuration
- */
-static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  struct GNUNET_CONFIGURATION_ConfigSettings *cs = cls;
-
-  if (1 == is_experimental)
-  {
-#ifdef GNUNET_EXPERIMENTAL
-    cs->global_ret = 0;
-#else
-    cs->global_ret = 1;
-#endif
-    return;
-  }
-  if (1 == cflags || 1 == libs || 1 == prefix)
-  {
-    char *prefixdir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_PREFIX);
-    char *libdir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_LIBDIR);
-
-    if (1 == cflags)
-    {
-      fprintf (stdout, "-I%sinclude\n", prefixdir);
-    }
-    if (1 == libs)
-    {
-      fprintf (stdout, "-L%s -lgnunetutil\n", libdir);
-    }
-    if (1 == prefix)
-    {
-      fprintf (stdout, "%s\n", prefixdir);
-    }
-    cs->global_ret = 0;
-    GNUNET_free (prefixdir);
-    GNUNET_free (libdir);
-    return;
-  }
-  if (NULL != backend_check)
-  {
-    char *name;
-
-    GNUNET_asprintf (&name,
-                     "libgnunet_plugin_%s",
-                     backend_check);
-    cs->global_ret = (GNUNET_OK ==
-                      GNUNET_PLUGIN_test (name)) ? 0 : 77;
-    GNUNET_free (name);
-    return;
-  }
-  GNUNET_CONFIGURATION_config_tool_run (cs,
-                                        args,
-                                        cfgfile,
-                                        cfg);
-}
-
-
-/**
  * Program to manipulate configuration files.
  *
  * @param argc number of arguments from the command line
@@ -144,7 +81,17 @@ main (int argc,
     .api_version = GNUNET_UTIL_VERSION,
     .global_ret = EXIT_SUCCESS
   };
+  const struct GNUNET_OS_ProjectData *pd
+    = GNUNET_OS_project_data_get ();
+  char *cfgfile = NULL;
+  char *loglev = NULL;
+  char *logfile = NULL;
   struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_option_cfgfile (&cfgfile),
+    GNUNET_GETOPT_option_help ("gnunet-config [OPTIONS]"),
+    GNUNET_GETOPT_option_loglevel (&loglev),
+    GNUNET_GETOPT_option_logfile (&logfile),
+    GNUNET_GETOPT_option_version (pd->version),
     GNUNET_GETOPT_option_exclusive (
       GNUNET_GETOPT_option_string (
         'b',
@@ -171,34 +118,163 @@ main (int argc,
         "Provide an appropriate value for LIBS to applications building on top of GNUnet"),
       &libs),
     GNUNET_GETOPT_option_flag (
+      'n',
+      "no-defaults",
+      gettext_noop ("Do not parse default configuration files"),
+      &no_defaults),
+    GNUNET_GETOPT_option_flag (
       'p',
       "prefix",
       gettext_noop (
         "Provide the path under which GNUnet was installed"),
       &prefix),
+    GNUNET_GETOPT_option_string (
+      'R',
+      "ram-config",
+      "CONFIG_DATA",
+      gettext_noop (
+        "Parse main configuration from this command-line argument and not from disk"),
+      &ram_config),
     GNUNET_CONFIGURATION_CONFIG_OPTIONS (&cs),
     GNUNET_GETOPT_OPTION_END
   };
-  enum GNUNET_GenericReturnValue ret;
+  int iret;
 
   if (GNUNET_OK !=
       GNUNET_STRINGS_get_utf8_args (argc, argv,
                                     &argc, &argv))
     return EXIT_FAILURE;
-  ret =
-    GNUNET_PROGRAM_run (argc,
-                        argv,
-                        "gnunet-config [OPTIONS]",
-                        gettext_noop ("Manipulate GNUnet configuration files"),
-                        options,
-                        &run,
-                        &cs);
-  GNUNET_free_nz ((void *) argv);
-  GNUNET_CONFIGURATION_config_settings_free (&cs);
-  if (GNUNET_NO == ret)
-    return 0;
-  if (GNUNET_SYSERR == ret)
+  if ( (NULL != pd->config_file) &&
+       (NULL != pd->user_config_file) )
+    cfgfile = GNUNET_CONFIGURATION_default_filename ();
+  iret = GNUNET_GETOPT_run ("gnunet-config",
+                            options,
+                            argc,
+                            argv);
+  if (GNUNET_SYSERR == iret)
+  {
+    GNUNET_free_nz ((void *) argv);
     return EXIT_INVALIDARGUMENT;
+  }
+  if (GNUNET_OK !=
+      GNUNET_log_setup ("gnunet-config",
+                        loglev,
+                        logfile))
+  {
+    GNUNET_free_nz ((void *) argv);
+    return EXIT_FAILURE;
+  }
+  if (1 == is_experimental)
+  {
+    GNUNET_free_nz ((void *) argv);
+#ifdef GNUNET_EXPERIMENTAL
+    return 0;
+#else
+    return 1;
+#endif
+  }
+  if (1 == cflags || 1 == libs || 1 == prefix)
+  {
+    char *prefixdir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_PREFIX);
+    char *libdir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_LIBDIR);
+
+    if (1 == cflags)
+    {
+      fprintf (stdout, "-I%sinclude\n", prefixdir);
+    }
+    if (1 == libs)
+    {
+      fprintf (stdout, "-L%s -lgnunetutil\n", libdir);
+    }
+    if (1 == prefix)
+    {
+      fprintf (stdout, "%s\n", prefixdir);
+    }
+    GNUNET_free (prefixdir);
+    GNUNET_free (libdir);
+    GNUNET_free_nz ((void *) argv);
+    return 0;
+  }
+  if (NULL != backend_check)
+  {
+    char *name;
+
+    GNUNET_asprintf (&name,
+                     "libgnunet_plugin_%s",
+                     backend_check);
+    iret = (GNUNET_OK ==
+            GNUNET_PLUGIN_test (name)) ? 0 : 77;
+    GNUNET_free (name);
+    GNUNET_free_nz ((void *) argv);
+    return iret;
+  }
+
+  {
+    struct GNUNET_CONFIGURATION_Handle *cfg;
+
+    cfg = GNUNET_CONFIGURATION_create ();
+
+    if (NULL != ram_config)
+    {
+      if ( (! no_defaults) &&
+           (GNUNET_SYSERR ==
+            GNUNET_CONFIGURATION_load (cfg,
+                                       NULL)) )
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    _ ("Failed to load default configuration, exiting ...\n"));
+        GNUNET_free_nz ((void *) argv);
+        GNUNET_CONFIGURATION_destroy (cfg);
+        return EXIT_FAILURE;
+      }
+      if (GNUNET_OK !=
+          GNUNET_CONFIGURATION_deserialize (cfg,
+                                            ram_config,
+                                            strlen (ram_config),
+                                            NULL))
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    _ ("Failed to parse configuration, exiting ...\n"));
+        GNUNET_free_nz ((void *) argv);
+        GNUNET_CONFIGURATION_destroy (cfg);
+        return EXIT_FAILURE;
+      }
+    }
+    else
+    {
+      if (GNUNET_YES !=
+          GNUNET_DISK_file_test (cfgfile))
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    _ ("Unreadable configuration file `%s', exiting ...\n"),
+                    cfgfile);
+        GNUNET_free_nz ((void *) argv);
+        GNUNET_CONFIGURATION_destroy (cfg);
+        return EXIT_FAILURE;
+      }
+      if (GNUNET_SYSERR ==
+          (no_defaults
+        ? GNUNET_CONFIGURATION_parse (cfg,
+                                      cfgfile)
+         : GNUNET_CONFIGURATION_load (cfg,
+                                      cfgfile)) )
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    _ ("Malformed configuration file `%s', exiting ...\n"),
+                    cfgfile);
+        GNUNET_free_nz ((void *) argv);
+        GNUNET_CONFIGURATION_destroy (cfg);
+        return EXIT_FAILURE;
+      }
+    }
+    GNUNET_CONFIGURATION_config_tool_run (&cs,
+                                          &argv[iret],
+                                          cfgfile,
+                                          cfg);
+    GNUNET_free_nz ((void *) argv);
+    GNUNET_CONFIGURATION_config_settings_free (&cs);
+    GNUNET_CONFIGURATION_destroy (cfg);
+  }
   return cs.global_ret;
 }
 
diff --git a/src/cli/util/gnunet-ecc.c b/src/cli/util/gnunet-ecc.c
index 812745085..9a9fc17e4 100644
--- a/src/cli/util/gnunet-ecc.c
+++ b/src/cli/util/gnunet-ecc.c
@@ -168,10 +168,10 @@ create_keys (const char *fn, const char *prefix)
         }
       }
     }
-    if (GNUNET_TESTING_HOSTKEYFILESIZE !=
+    if (sizeof (struct GNUNET_PeerIdentity) !=
         fwrite (&pk,
                 1,
-                GNUNET_TESTING_HOSTKEYFILESIZE,
+                sizeof (struct GNUNET_PeerIdentity),
                 f))
     {
       fprintf (stderr,
@@ -307,16 +307,22 @@ print_key (const char *filename)
 
   /* Check hostkey file size, read entire thing into memory */
   if (GNUNET_OK !=
-      GNUNET_DISK_file_size (filename, &fs, GNUNET_YES, GNUNET_YES))
+      GNUNET_DISK_file_size (filename,
+                             &fs,
+                             GNUNET_YES,
+                             GNUNET_YES))
     fs = 0;
   if (0 == fs)
   {
-    fprintf (stderr, _ ("Hostkeys file `%s' is empty\n"), filename);
+    fprintf (stderr,
+             _ ("Hostkeys file `%s' is empty\n"), filename);
     return;   /* File is empty */
   }
-  if (0 != (fs % GNUNET_TESTING_HOSTKEYFILESIZE))
+  if (0 != (fs % sizeof (struct GNUNET_PeerIdentity)))
   {
-    fprintf (stderr, _ ("Incorrect hostkey file format: %s\n"), filename);
+    fprintf (stderr,
+             _ ("Incorrect hostkey file format: %s\n"),
+             filename);
     return;
   }
   fd = GNUNET_DISK_file_open (filename,
@@ -340,12 +346,12 @@ print_key (const char *filename)
 
   if (NULL == hostkeys_data)
     return;
-  total_hostkeys = fs / GNUNET_TESTING_HOSTKEYFILESIZE;
+  total_hostkeys = fs / sizeof (struct GNUNET_PeerIdentity);
   for (c = 0; (c < total_hostkeys) && (c < list_keys_count); c++)
   {
     GNUNET_memcpy (&private_key,
-                   hostkeys_data + (c * GNUNET_TESTING_HOSTKEYFILESIZE),
-                   GNUNET_TESTING_HOSTKEYFILESIZE);
+                   hostkeys_data + (c * sizeof (struct GNUNET_PeerIdentity)),
+                   sizeof (struct GNUNET_PeerIdentity));
     GNUNET_CRYPTO_eddsa_key_get_public (&private_key, &public_key);
     hostkey_str = GNUNET_CRYPTO_eddsa_public_key_to_string (&public_key);
     if (NULL != hostkey_str)
diff --git a/src/contrib/service/consensus/Makefile.am b/src/contrib/service/consensus/Makefile.am
index 6b4db05fc..35ac47203 100644
--- a/src/contrib/service/consensus/Makefile.am
+++ b/src/contrib/service/consensus/Makefile.am
@@ -80,8 +80,8 @@ libgnunet_plugin_block_consensus_la_LDFLAGS = \
 
 
 
-check_PROGRAMS = \
- test_consensus_api
+#check_PROGRAMS = \
+# test_consensus_api
 
 if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
diff --git a/src/contrib/service/consensus/meson.build b/src/contrib/service/consensus/meson.build
index 86cc0663b..361268c85 100644
--- a/src/contrib/service/consensus/meson.build
+++ b/src/contrib/service/consensus/meson.build
@@ -47,6 +47,7 @@ executable ('gnunet-service-consensus',
             install_dir: get_option('libdir') / 'gnunet' / 'libexec')
 
 # FIXME do we need evil stuff and ENABLE_MALICIOUS?
+if false
 
 testconsensusapi = executable ('test_consensus_api',
             ['test_consensus_api.c'],
@@ -64,3 +65,5 @@ configure_file(input : 'test_consensus.conf',
 test('test_consensus_api', testconsensusapi,
   workdir: meson.current_build_dir(),
   suite: ['consensus', 'contrib'])
+
+endif
\ No newline at end of file
diff --git a/src/contrib/service/conversation/Makefile.am b/src/contrib/service/conversation/Makefile.am
index b573208e6..7c5960c94 100644
--- a/src/contrib/service/conversation/Makefile.am
+++ b/src/contrib/service/conversation/Makefile.am
@@ -22,10 +22,10 @@ bin_PROGRAMS = \
 libexec_PROGRAMS = \
   gnunet-service-conversation
 
-check_PROGRAMS = \
- test_conversation_api \
- test_conversation_api_reject \
- test_conversation_api_twocalls
+#check_PROGRAMS = \
+# test_conversation_api \
+# test_conversation_api_reject \
+# test_conversation_api_twocalls
 
 pkgcfg_DATA = conversation.conf
 endif
@@ -83,17 +83,17 @@ libgnunetconversation_la_LDFLAGS = \
 if BUILD_PULSE_HELPERS
 AUDIO_HELPER_RECD=gnunet-helper-audio-record
 AUDIO_HELPER_PLAY=gnunet-helper-audio-playback
-AUDIO_TESTS=$(check_PROGRAMS)
+#AUDIO_TESTS=$(check_PROGRAMS)
 else
 if BUILD_GST_HELPERS
 AUDIO_HELPER_RECD=gnunet-helper-audio-record
 AUDIO_HELPER_PLAY=gnunet-helper-audio-playback
-AUDIO_TESTS=$(check_PROGRAMS)
+#AUDIO_TESTS=$(check_PROGRAMS)
 else
 if BUILD_EXPERIMENTAL_HELPERS
 AUDIO_HELPER_RECD=gnunet-helper-audio-record
 AUDIO_HELPER_PLAY=gnunet-helper-audio-playback
-AUDIO_TESTS=$(check_PROGRAMS)
+#AUDIO_TESTS=$(check_PROGRAMS)
 endif
 endif
 endif
@@ -117,7 +117,7 @@ gnunet_helper_audio_record_LDADD = \
   -lpulse  -lopus -logg \
   $(INTLLIBS)
 #gnunet_helper_audio_record_LDFLAGS = \
-#  
+#
 
 gnunet_helper_audio_playback_SOURCES = \
   gnunet-helper-audio-playback.c
@@ -126,7 +126,7 @@ gnunet_helper_audio_playback_LDADD = \
   -lpulse -lopus -logg \
   $(INTLLIBS)
 #gnunet_helper_audio_playback_LDFLAGS = \
-#  
+#
 else
 if BUILD_GST_HELPERS
 gnunet_helper_audio_record_SOURCES = \
@@ -188,7 +188,7 @@ gnunet_service_conversation_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(INTLLIBS)
 #gnunet_service_conversation_LDFLAGS = \
-#  
+#
 
 gnunet_conversation_SOURCES = \
   gnunet-conversation.c
@@ -203,7 +203,7 @@ gnunet_conversation_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(INTLLIBS)
 #gnunet_conversation_LDFLAGS = \
-# 
+#
 
 gnunet_conversation_test_SOURCES = \
   gnunet-conversation-test.c
@@ -213,7 +213,7 @@ gnunet_conversation_test_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la  \
   $(INTLLIBS)
 #gnunet_conversation_test_LDFLAGS = \
-# 
+#
 
 
 test_conversation_api_SOURCES = \
diff --git a/src/contrib/service/conversation/meson.build b/src/contrib/service/conversation/meson.build
index 4ecc0fc93..70e68f094 100644
--- a/src/contrib/service/conversation/meson.build
+++ b/src/contrib/service/conversation/meson.build
@@ -145,6 +145,8 @@ executable ('gnunet-helper-audio-playback',
           install: true,
           install_dir: get_option('libdir') / 'gnunet' / 'libexec')
 
+if false
+
 testconvapi = executable ('test_conversation_api',
          ['test_conversation_api.c'],
           dependencies: [libgnunetconversation_dep,
@@ -201,3 +203,4 @@ test('test_conversation_api_twocalls', testconvapitwo, workdir: meson.current_bu
 test('test_conversation_api_reject', testconvapireject, workdir: meson.current_build_dir(),
      suite: ['conversation', 'contrib'])
 
+endif
\ No newline at end of file
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 8f39faab6..ea8bae62f 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -33,7 +33,6 @@ gnunetinclude_HEADERS = \
   gnunet_container_lib.h \
   gnunet_conversation_service.h \
   gnunet_core_service.h \
-  gnunet_core_testing_lib.h \
   gnunet_crypto_lib.h \
   gnunet_curl_lib.h \
   gnunet_datacache_lib.h \
@@ -81,7 +80,6 @@ gnunetinclude_HEADERS = \
   gnunet_network_lib.h \
   gnunet_nse_service.h \
   gnunet_nt_lib.h \
-  gnunet_op_lib.h \
   gnunet_os_lib.h \
   gnunet_peer_lib.h \
   gnunet_peerstore_plugin.h \
@@ -110,18 +108,17 @@ gnunetinclude_HEADERS = \
   gnunet_sq_lib.h \
   gnunet_statistics_service.h \
   gnunet_strings_lib.h \
-  gnunet_testing_barrier.h \
   gnunet_testing_lib.h \
-  gnunet_testing_plugin.h \
-  gnunet_testing_ng_lib.h \
-  gnunet_testing_loop_lib.h \
-  gnunet_testing_netjail_lib.h \
+  gnunet_testing_arm_lib.h \
+  gnunet_testing_core_lib.h \
+  gnunet_testing_testbed_lib.h \
+  gnunet_testing_transport_lib.h \
+  gnunet_testbed_lib.h \
   gnunet_time_lib.h \
   gnunet_transport_application_service.h \
   gnunet_transport_communication_service.h \
   gnunet_transport_monitor_service.h \
   gnunet_transport_core_service.h \
-  gnunet_transport_testing_ng_lib.h \
   gnunet_tun_lib.h \
   gnunet_uri_lib.h \
   gnunet_util_lib.h \
diff --git a/src/include/gettext.h b/src/include/gettext.h
index 6e98f197a..d62a3db7d 100644
--- a/src/include/gettext.h
+++ b/src/include/gettext.h
@@ -20,6 +20,10 @@
 #define _LIBGETTEXT_H 1
 
 /* NLS can be disabled through the configure --disable-nls option.  */
+#ifndef ENABLE_NLS
+#define ENABLE_NLS 0
+#endif
+
 #if ENABLE_NLS
 
 /* Get declarations of GNU message catalog functions.  */
@@ -47,11 +51,11 @@
 #define dgettext(Domainname, Msgid) ((const char *) (Msgid))
 #define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid))
 #define ngettext(Msgid1, Msgid2, N) \
-  ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+        ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
 #define dngettext(Domainname, Msgid1, Msgid2, N) \
-  ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+        ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
 #define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
-  ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+        ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
 /* slight modification here to avoid warnings: generate GNUNET_NO code,
    not even the cast... */
 #define textdomain(Domainname)
diff --git a/src/include/gnunet_arm_service.h b/src/include/gnunet_arm_service.h
index 639e723c5..ef860bff4 100644
--- a/src/include/gnunet_arm_service.h
+++ b/src/include/gnunet_arm_service.h
@@ -244,8 +244,9 @@ struct GNUNET_ARM_Operation;
  *                  #GNUNET_SYSERR if there was an error.
  */
 typedef void
-(*GNUNET_ARM_ConnectionStatusCallback) (void *cls,
-                                        int connected);
+(*GNUNET_ARM_ConnectionStatusCallback) (
+  void *cls,
+  enum GNUNET_GenericReturnValue connected);
 
 
 /**
@@ -259,9 +260,10 @@ typedef void
  * @param result result of the operation
  */
 typedef void
-(*GNUNET_ARM_ResultCallback) (void *cls,
-                              enum GNUNET_ARM_RequestStatus rs,
-                              enum GNUNET_ARM_Result result);
+(*GNUNET_ARM_ResultCallback) (
+  void *cls,
+  enum GNUNET_ARM_RequestStatus rs,
+  enum GNUNET_ARM_Result result);
 
 
 /**
@@ -276,10 +278,11 @@ typedef void
  * @param list list of services managed by arm
  */
 typedef void
-(*GNUNET_ARM_ServiceListCallback) (void *cls,
-                                   enum GNUNET_ARM_RequestStatus rs,
-                                   unsigned int count,
-                                   const struct GNUNET_ARM_ServiceInfo *list);
+(*GNUNET_ARM_ServiceListCallback) (
+  void *cls,
+  enum GNUNET_ARM_RequestStatus rs,
+  unsigned int count,
+  const struct GNUNET_ARM_ServiceInfo *list);
 
 
 /**
@@ -294,18 +297,20 @@ typedef void
  * @return context to use for further ARM operations, NULL on error.
  */
 struct GNUNET_ARM_Handle *
-GNUNET_ARM_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                    GNUNET_ARM_ConnectionStatusCallback conn_status,
-                    void *conn_status_cls);
+GNUNET_ARM_connect (
+  const struct GNUNET_CONFIGURATION_Handle *cfg,
+  GNUNET_ARM_ConnectionStatusCallback conn_status,
+  void *conn_status_cls);
 
 
 /**
  * Disconnect from the ARM service and destroy the handle.
  *
- * @param h the handle that was being used
+ * @param[in] h the handle that was being used
  */
 void
-GNUNET_ARM_disconnect (struct GNUNET_ARM_Handle *h);
+GNUNET_ARM_disconnect (
+  struct GNUNET_ARM_Handle *h);
 
 
 /**
@@ -315,7 +320,8 @@ GNUNET_ARM_disconnect (struct GNUNET_ARM_Handle *h);
  * @param op operation to cancel
  */
 void
-GNUNET_ARM_operation_cancel (struct GNUNET_ARM_Operation *op);
+GNUNET_ARM_operation_cancel (
+  struct GNUNET_ARM_Operation *op);
 
 
 /**
@@ -327,9 +333,10 @@ GNUNET_ARM_operation_cancel (struct GNUNET_ARM_Operation *op);
  * @return handle for the operation, NULL on error
  */
 struct GNUNET_ARM_Operation *
-GNUNET_ARM_request_service_list (struct GNUNET_ARM_Handle *h,
-                                 GNUNET_ARM_ServiceListCallback cont,
-                                 void *cont_cls);
+GNUNET_ARM_request_service_list (
+  struct GNUNET_ARM_Handle *h,
+  GNUNET_ARM_ServiceListCallback cont,
+  void *cont_cls);
 
 
 /**
@@ -347,10 +354,11 @@ GNUNET_ARM_request_service_list (struct GNUNET_ARM_Handle *h,
  * @return handle for the operation, NULL on error
  */
 struct GNUNET_ARM_Operation *
-GNUNET_ARM_request_service_stop (struct GNUNET_ARM_Handle *h,
-                                 const char *service_name,
-                                 GNUNET_ARM_ResultCallback cont,
-                                 void *cont_cls);
+GNUNET_ARM_request_service_stop (
+  struct GNUNET_ARM_Handle *h,
+  const char *service_name,
+  GNUNET_ARM_ResultCallback cont,
+  void *cont_cls);
 
 
 /**
@@ -364,12 +372,12 @@ GNUNET_ARM_request_service_stop (struct GNUNET_ARM_Handle *h,
  * @return handle for the operation, NULL on error
  */
 struct GNUNET_ARM_Operation *
-GNUNET_ARM_request_service_start (struct GNUNET_ARM_Handle *h,
-                                  const char *service_name,
-                                  enum GNUNET_OS_InheritStdioFlags
-                                  std_inheritance,
-                                  GNUNET_ARM_ResultCallback cont,
-                                  void *cont_cls);
+GNUNET_ARM_request_service_start (
+  struct GNUNET_ARM_Handle *h,
+  const char *service_name,
+  enum GNUNET_OS_InheritStdioFlags std_inheritance,
+  GNUNET_ARM_ResultCallback cont,
+  void *cont_cls);
 
 
 /**
@@ -386,10 +394,10 @@ struct GNUNET_ARM_MonitorHandle;
  * @param status status of the service
  */
 typedef void
-(*GNUNET_ARM_ServiceMonitorCallback) (void *cls,
-                                      const char *service,
-                                      enum GNUNET_ARM_ServiceMonitorStatus
-                                      status);
+(*GNUNET_ARM_ServiceMonitorCallback) (
+  void *cls,
+  const char *service,
+  enum GNUNET_ARM_ServiceMonitorStatus status);
 
 
 /**
@@ -404,9 +412,10 @@ typedef void
  * @return context to use for further ARM monitor operations, NULL on error.
  */
 struct GNUNET_ARM_MonitorHandle *
-GNUNET_ARM_monitor_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                          GNUNET_ARM_ServiceMonitorCallback cont,
-                          void *cont_cls);
+GNUNET_ARM_monitor_start (
+  const struct GNUNET_CONFIGURATION_Handle *cfg,
+  GNUNET_ARM_ServiceMonitorCallback cont,
+  void *cont_cls);
 
 
 /**
@@ -415,7 +424,8 @@ GNUNET_ARM_monitor_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param h the handle that was being used
  */
 void
-GNUNET_ARM_monitor_stop (struct GNUNET_ARM_MonitorHandle *h);
+GNUNET_ARM_monitor_stop (
+  struct GNUNET_ARM_MonitorHandle *h);
 
 #if 0                           /* keep Emacsens' auto-indent happy */
 {
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index 9fa3de37d..c5885e7c4 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -55,20 +55,20 @@
 #if defined(__FreeBSD__)
 
 #include <sys/endian.h>
-#define bswap_32(x) bswap32(x)
-#define bswap_64(x) bswap64(x)
+#define bswap_32(x) bswap32 (x)
+#define bswap_64(x) bswap64 (x)
 
 #elif defined(__OpenBSD__)
 
-#define bswap_32(x) swap32(x)
-#define bswap_64(x) swap64(x)
+#define bswap_32(x) swap32 (x)
+#define bswap_64(x) swap64 (x)
 
 #elif defined(__NetBSD__)
 
 #include <machine/bswap.h>
-#if defined(__BSWAP_RENAME) && !defined(__bswap_32)
-#define bswap_32(x) bswap32(x)
-#define bswap_64(x) bswap64(x)
+#if defined(__BSWAP_RENAME) && ! defined(__bswap_32)
+#define bswap_32(x) bswap32 (x)
+#define bswap_64(x) bswap64 (x)
 #endif
 
 #elif defined(__linux__) || defined(GNU)
@@ -166,15 +166,19 @@ enum GNUNET_GenericReturnValue
 #define BYTE_SWAP_16(x) ((((x) & 0x00ff) << 8) | (((x) & 0xff00) >> 8))
 
 #define BYTE_SWAP_32(x)                                   \
-  ((((x) & 0x000000ffU) << 24) | (((x) & 0x0000ff00U) << 8)   \
-   | (((x) & 0x00ff0000U) >> 8) | (((x) & 0xff000000U) >> 24))
+        ((((x) & 0x000000ffU) << 24) | (((x) & 0x0000ff00U) << 8)   \
+         | (((x) & 0x00ff0000U) >> 8) | (((x) & 0xff000000U) >> 24))
 
 #define BYTE_SWAP_64(x)                                                      \
-  ((((x) & 0x00000000000000ffUL) << 56) | (((x) & 0x000000000000ff00UL) << 40)   \
-   | (((x) & 0x0000000000ff0000UL) << 24) | (((x) & 0x00000000ff000000UL) << 8)    \
-   | (((x) & 0x000000ff00000000UL) >> 8) | (((x) & 0x0000ff0000000000UL) >> 24)    \
-   | (((x) & 0x00ff000000000000UL) >> 40) | (((x) & 0xff00000000000000UL) >> \
-                                             56))
+        ((((x) & 0x00000000000000ffUL) << 56) | (((x) & 0x000000000000ff00UL) << \
+                                                 40)   \
+         | (((x) & 0x0000000000ff0000UL) << 24) | (((x) & 0x00000000ff000000UL) \
+                                                   << 8)    \
+         | (((x) & 0x000000ff00000000UL) >> 8) | (((x) & 0x0000ff0000000000UL) \
+                                                  >> 24)    \
+         | (((x) & 0x00ff000000000000UL) >> 40) | (((x) & 0xff00000000000000UL) \
+                                                   >> \
+                                                   56))
 #endif
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN
@@ -479,7 +483,7 @@ GNUNET_get_log_call_status (int caller_level,
 
 #endif
 
-
+/* *INDENT-OFF* */
 /**
  * @ingroup logging
  * Main log function.
@@ -489,13 +493,15 @@ GNUNET_get_log_call_status (int caller_level,
  * @param ... arguments for format string
  */
 void
-GNUNET_log_nocheck (enum GNUNET_ErrorType kind, const char *message, ...)
+GNUNET_log_nocheck (enum GNUNET_ErrorType kind,
+                    const char *message,
+                    ...)
 __attribute__ ((format (printf, 2, 3)));
 
 /* from glib */
 #if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
 #define _GNUNET_BOOLEAN_EXPR(expr) \
-  __extension__ ({                  \
+  __extension__ ({                 \
     int _gnunet_boolean_var_;      \
     if (expr)                      \
       _gnunet_boolean_var_ = 1;    \
@@ -513,6 +519,7 @@ __attribute__ ((format (printf, 2, 3)));
 #if ! defined(GNUNET_LOG_CALL_STATUS)
 #define GNUNET_LOG_CALL_STATUS -1
 #endif
+/* *INDENT-ON* */
 
 
 /**
@@ -534,56 +541,56 @@ __attribute__ ((format (printf, 3, 4)));
 
 #if ! defined(GNUNET_CULL_LOGGING)
 #define GNUNET_log_from(kind, comp, ...)                                  \
-  do                                                                      \
-  {                                                                       \
-    static int log_call_enabled = GNUNET_LOG_CALL_STATUS;                 \
-    if ((GNUNET_EXTRA_LOGGING > 0) ||                                     \
-        ((GNUNET_ERROR_TYPE_DEBUG & (kind)) == 0))                        \
-    {                                                                     \
-      if (GN_UNLIKELY (log_call_enabled == -1))                           \
-        log_call_enabled =                                                \
-          GNUNET_get_log_call_status ((kind) & (~GNUNET_ERROR_TYPE_BULK), \
-                                      (comp),                             \
-                                      __FILE__,                           \
-                                      __FUNCTION__,                       \
-                                      __LINE__);                          \
-      if (GN_UNLIKELY (GNUNET_get_log_skip () > 0))                       \
-      {                                                                   \
-        GNUNET_log_skip (-1, GNUNET_NO);                                  \
-      }                                                                   \
-      else                                                                \
-      {                                                                   \
-        if (GN_UNLIKELY (log_call_enabled))                               \
-          GNUNET_log_from_nocheck ((kind), comp, __VA_ARGS__);            \
-      }                                                                   \
-    }                                                                     \
-  } while (0)
+        do                                                                      \
+        {                                                                       \
+          static int log_call_enabled = GNUNET_LOG_CALL_STATUS;                 \
+          if ((GNUNET_EXTRA_LOGGING > 0) ||                                     \
+              ((GNUNET_ERROR_TYPE_DEBUG & (kind)) == 0))                        \
+          {                                                                     \
+            if (GN_UNLIKELY (log_call_enabled == -1))                           \
+            log_call_enabled =                                                \
+              GNUNET_get_log_call_status ((kind) & (~GNUNET_ERROR_TYPE_BULK), \
+                                          (comp),                             \
+                                          __FILE__,                           \
+                                          __FUNCTION__,                       \
+                                          __LINE__);                          \
+            if (GN_UNLIKELY (GNUNET_get_log_skip () > 0))                       \
+            {                                                                   \
+              GNUNET_log_skip (-1, GNUNET_NO);                                  \
+            }                                                                   \
+            else                                                                \
+            {                                                                   \
+              if (GN_UNLIKELY (log_call_enabled))                               \
+              GNUNET_log_from_nocheck ((kind), comp, __VA_ARGS__);            \
+            }                                                                   \
+          }                                                                     \
+        } while (0)
 
 #define GNUNET_log(kind, ...)                                             \
-  do                                                                      \
-  {                                                                       \
-    static int log_call_enabled = GNUNET_LOG_CALL_STATUS;                 \
-    if ((GNUNET_EXTRA_LOGGING > 0) ||                                     \
-        ((GNUNET_ERROR_TYPE_DEBUG & (kind)) == 0))                        \
-    {                                                                     \
-      if (GN_UNLIKELY (log_call_enabled == -1))                           \
-        log_call_enabled =                                                \
-          GNUNET_get_log_call_status ((kind) & (~GNUNET_ERROR_TYPE_BULK), \
-                                      NULL,                               \
-                                      __FILE__,                           \
-                                      __FUNCTION__,                       \
-                                      __LINE__);                          \
-      if (GN_UNLIKELY (GNUNET_get_log_skip () > 0))                       \
-      {                                                                   \
-        GNUNET_log_skip (-1, GNUNET_NO);                                  \
-      }                                                                   \
-      else                                                                \
-      {                                                                   \
-        if (GN_UNLIKELY (log_call_enabled))                               \
-          GNUNET_log_nocheck ((kind), __VA_ARGS__);                       \
-      }                                                                   \
-    }                                                                     \
-  } while (0)
+        do                                                                      \
+        {                                                                       \
+          static int log_call_enabled = GNUNET_LOG_CALL_STATUS;                 \
+          if ((GNUNET_EXTRA_LOGGING > 0) ||                                     \
+              ((GNUNET_ERROR_TYPE_DEBUG & (kind)) == 0))                        \
+          {                                                                     \
+            if (GN_UNLIKELY (log_call_enabled == -1))                           \
+            log_call_enabled =                                                \
+              GNUNET_get_log_call_status ((kind) & (~GNUNET_ERROR_TYPE_BULK), \
+                                          NULL,                               \
+                                          __FILE__,                           \
+                                          __FUNCTION__,                       \
+                                          __LINE__);                          \
+            if (GN_UNLIKELY (GNUNET_get_log_skip () > 0))                       \
+            {                                                                   \
+              GNUNET_log_skip (-1, GNUNET_NO);                                  \
+            }                                                                   \
+            else                                                                \
+            {                                                                   \
+              if (GN_UNLIKELY (log_call_enabled))                               \
+              GNUNET_log_nocheck ((kind), __VA_ARGS__);                       \
+            }                                                                   \
+          }                                                                     \
+        } while (0)
 #else
 #define GNUNET_log(...)
 #define GNUNET_log_from(...)
@@ -642,7 +649,7 @@ GNUNET_abort_ (void) GNUNET_NORETURN;
  */
 const char *
 GNUNET_b2s (const void *buf,
-           size_t buf_size);
+            size_t buf_size);
 
 
 /**
@@ -676,7 +683,9 @@ GNUNET_log_skip (int n, int check_reset);
  * @return #GNUNET_OK on success, #GNUNET_SYSERR if logfile could not be opened
  */
 enum GNUNET_GenericReturnValue
-GNUNET_log_setup (const char *comp, const char *loglevel, const char *logfile);
+GNUNET_log_setup (const char *comp,
+                  const char *loglevel,
+                  const char *logfile);
 
 
 /**
@@ -690,7 +699,8 @@ GNUNET_log_setup (const char *comp, const char *loglevel, const char *logfile);
  * @param logger_cls closure for @a logger
  */
 void
-GNUNET_logger_add (GNUNET_Logger logger, void *logger_cls);
+GNUNET_logger_add (GNUNET_Logger logger,
+                   void *logger_cls);
 
 
 /**
@@ -701,7 +711,8 @@ GNUNET_logger_add (GNUNET_Logger logger, void *logger_cls);
  * @param logger_cls closure for @a logger
  */
 void
-GNUNET_logger_remove (GNUNET_Logger logger, void *logger_cls);
+GNUNET_logger_remove (GNUNET_Logger logger,
+                      void *logger_cls);
 
 
 /**
@@ -916,36 +927,37 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
  * @ingroup logging
  * Use this for fatal errors that cannot be handled
  */
-#if __GNUC__ >= 6  || __clang_major__ >= 6
+#if __GNUC__ >= 6 || __clang_major__ >= 6
 #define GNUNET_assert(cond)                                     \
-  do                                                            \
-  {                                                             \
- _Pragma("GCC diagnostic push")                                 \
- _Pragma("GCC diagnostic ignored \"-Wtautological-compare\"")   \
-    if (! (cond))                                               \
-    {                                                           \
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,                      \
-                  dgettext ("gnunet", "Assertion failed at %s:%d. Aborting.\n"), \
-                  __FILE__,                                     \
-                  __LINE__);                                    \
-      GNUNET_abort_ ();                                         \
-    }                                                           \
- _Pragma("GCC diagnostic pop")                                  \
-  } while (0)
+        do                                                            \
+        {                                                             \
+          _Pragma("GCC diagnostic push")                                 \
+          _Pragma("GCC diagnostic ignored \"-Wtautological-compare\"")   \
+          if (! (cond))                                               \
+          {                                                           \
+          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,                      \
+          dgettext ("gnunet", "Assertion failed at %s:%d. Aborting.\n"), \
+          __FILE__,                                     \
+          __LINE__);                                    \
+          GNUNET_abort_ ();                                         \
+          }                                                           \
+          _Pragma("GCC diagnostic pop")                                  \
+          } while (0)
 #else
 /* older GCC/clangs do not support -Wtautological-compare */
 #define GNUNET_assert(cond)                                     \
-  do                                                            \
-  {                                                             \
-    if (! (cond))                                               \
-    {                                                           \
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,                      \
-                  dgettext ("gnunet", "Assertion failed at %s:%d. Aborting.\n"), \
-                  __FILE__,                                     \
-                  __LINE__);                                    \
-      GNUNET_abort_ ();                                         \
-    }                                                           \
-  } while (0)
+        do                                                            \
+        {                                                             \
+          if (! (cond))                                               \
+          {                                                           \
+            GNUNET_log (GNUNET_ERROR_TYPE_ERROR,                      \
+                        dgettext ("gnunet", \
+                                  "Assertion failed at %s:%d. Aborting.\n"), \
+                        __FILE__,                                     \
+                        __LINE__);                                    \
+            GNUNET_abort_ ();                                         \
+          }                                                           \
+        } while (0)
 #endif
 
 /**
@@ -953,17 +965,18 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
  * Use this for fatal errors that cannot be handled
  */
 #define GNUNET_assert_at(cond, f, l)                            \
-  do                                                            \
-  {                                                             \
-    if (! (cond))                                               \
-    {                                                           \
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,                      \
-                  dgettext ("gnunet", "Assertion failed at %s:%d. Aborting.\n"), \
-                  f,                                            \
-                  l);                                           \
-      GNUNET_abort_ ();                                         \
-    }                                                           \
-  } while (0)
+        do                                                            \
+        {                                                             \
+          if (! (cond))                                               \
+          {                                                           \
+            GNUNET_log (GNUNET_ERROR_TYPE_ERROR,                      \
+                        dgettext ("gnunet", \
+                                  "Assertion failed at %s:%d. Aborting.\n"), \
+                        f,                                            \
+                        l);                                           \
+            GNUNET_abort_ ();                                         \
+          }                                                           \
+        } while (0)
 
 
 /**
@@ -974,18 +987,20 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
  * @param comp Component string to use for logging
  */
 #define GNUNET_assert_from(cond, comp)                               \
-  do                                                                 \
-  {                                                                  \
-    if (! (cond))                                                    \
-    {                                                                \
-      GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,                      \
-                       comp,                                         \
-                       dgettext ("gnunet", "Assertion failed at %s:%d. Aborting.\n"), \
-                       __FILE__,                                     \
-                       __LINE__);                                    \
-      GNUNET_abort_ ();                                              \
-    }                                                                \
-  } while (0)
+        do                                                                 \
+        {                                                                  \
+          if (! (cond))                                                    \
+          {                                                                \
+            GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,                      \
+                             comp,                                         \
+                             dgettext ("gnunet", \
+                                       "Assertion failed at %s:%d. Aborting.\n") \
+                             , \
+                             __FILE__,                                     \
+                             __LINE__);                                    \
+            GNUNET_abort_ ();                                              \
+          }                                                                \
+        } while (0)
 
 
 #ifdef _Static_assert
@@ -1016,16 +1031,16 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
  * not fatal (can be handled) but should not occur.
  */
 #define GNUNET_break(cond)                            \
-  do                                                  \
-  {                                                   \
-    if (! (cond))                                     \
-    {                                                 \
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,            \
-                  dgettext ("gnunet", "Assertion failed at %s:%d.\n"),   \
-                  __FILE__,                           \
-                  __LINE__);                          \
-    }                                                 \
-  } while (0)
+        do                                                  \
+        {                                                   \
+          if (! (cond))                                     \
+          {                                                 \
+            GNUNET_log (GNUNET_ERROR_TYPE_ERROR,            \
+                        dgettext ("gnunet", "Assertion failed at %s:%d.\n"),   \
+                        __FILE__,                           \
+                        __LINE__);                          \
+          }                                                 \
+        } while (0)
 
 
 /**
@@ -1038,16 +1053,17 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
  * development and testing.  "OP == other peer".
  */
 #define GNUNET_break_op(cond)                                             \
-  do                                                                      \
-  {                                                                       \
-    if (! (cond))                                                         \
-    {                                                                     \
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,     \
-                  dgettext ("gnunet", "External protocol violation detected at %s:%d.\n"), \
-                  __FILE__,                                               \
-                  __LINE__);                                              \
-    }                                                                     \
-  } while (0)
+        do                                                                      \
+        {                                                                       \
+          if (! (cond))                                                         \
+          {                                                                     \
+            GNUNET_log (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,     \
+                        dgettext ("gnunet", \
+                                  "External protocol violation detected at %s:%d.\n"), \
+                        __FILE__,                                               \
+                        __LINE__);                                              \
+          }                                                                     \
+        } while (0)
 
 
 /**
@@ -1057,15 +1073,16 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
  * by strerror(errno).
  */
 #define GNUNET_log_strerror(level, cmd)                      \
-  do                                                         \
-  {                                                          \
-    GNUNET_log (level,                                       \
-                dgettext ("gnunet", "`%s' failed at %s:%d with error: %s\n"), \
-                cmd,                                         \
-                __FILE__,                                    \
-                __LINE__,                                    \
-                strerror (errno));                           \
-  } while (0)
+        do                                                         \
+        {                                                          \
+          GNUNET_log (level,                                       \
+                      dgettext ("gnunet", \
+                                "`%s' failed at %s:%d with error: %s\n"), \
+                      cmd,                                         \
+                      __FILE__,                                    \
+                      __LINE__,                                    \
+                      strerror (errno));                           \
+        } while (0)
 
 
 /**
@@ -1075,16 +1092,17 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
  * by strerror(errno).
  */
 #define GNUNET_log_from_strerror(level, component, cmd)           \
-  do                                                              \
-  {                                                               \
-    GNUNET_log_from (level,                                       \
-                     component,                                   \
-                     dgettext ("gnunet", "`%s' failed at %s:%d with error: %s\n"), \
-                     cmd,                                         \
-                     __FILE__,                                    \
-                     __LINE__,                                    \
-                     strerror (errno));                           \
-  } while (0)
+        do                                                              \
+        {                                                               \
+          GNUNET_log_from (level,                                       \
+                           component,                                   \
+                           dgettext ("gnunet", \
+                                     "`%s' failed at %s:%d with error: %s\n"), \
+                           cmd,                                         \
+                           __FILE__,                                    \
+                           __LINE__,                                    \
+                           strerror (errno));                           \
+        } while (0)
 
 
 /**
@@ -1094,16 +1112,17 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
  * by strerror(errno).
  */
 #define GNUNET_log_strerror_file(level, cmd, filename)                    \
-  do                                                                      \
-  {                                                                       \
-    GNUNET_log (level,                                                    \
-                dgettext ("gnunet", "`%s' failed on file `%s' at %s:%d with error: %s\n"), \
-                cmd,                                                      \
-                filename,                                                 \
-                __FILE__,                                                 \
-                __LINE__,                                                 \
-                strerror (errno));                                        \
-  } while (0)
+        do                                                                      \
+        {                                                                       \
+          GNUNET_log (level,                                                    \
+                      dgettext ("gnunet", \
+                                "`%s' failed on file `%s' at %s:%d with error: %s\n"), \
+                      cmd,                                                      \
+                      filename,                                                 \
+                      __FILE__,                                                 \
+                      __LINE__,                                                 \
+                      strerror (errno));                                        \
+        } while (0)
 
 
 /**
@@ -1113,17 +1132,18 @@ GNUNET_error_type_to_string (enum GNUNET_ErrorType kind);
  * by strerror(errno).
  */
 #define GNUNET_log_from_strerror_file(level, component, cmd, filename)         \
-  do                                                                           \
-  {                                                                            \
-    GNUNET_log_from (level,                                                    \
-                     component,                                                \
-                     dgettext ("gnunet", "`%s' failed on file `%s' at %s:%d with error: %s\n"), \
-                     cmd,                                                      \
-                     filename,                                                 \
-                     __FILE__,                                                 \
-                     __LINE__,                                                 \
-                     strerror (errno));                                        \
-  } while (0)
+        do                                                                           \
+        {                                                                            \
+          GNUNET_log_from (level,                                                    \
+                           component,                                                \
+                           dgettext ("gnunet", \
+                                     "`%s' failed on file `%s' at %s:%d with error: %s\n"), \
+                           cmd,                                                      \
+                           filename,                                                 \
+                           __FILE__,                                                 \
+                           __LINE__,                                                 \
+                           strerror (errno));                                        \
+        } while (0)
 
 /* ************************* endianness conversion ****************** */
 
@@ -1216,7 +1236,7 @@ GNUNET_ntoh_double (double d);
  * the first element!
  */
 #define GNUNET_memcmp(a, b)       \
-  ({                              \
+        ({                              \
     const typeof (*b) * _a = (a);  \
     const typeof (*a) * _b = (b);  \
     memcmp (_a, _b, sizeof(*a)); \
@@ -1245,7 +1265,7 @@ GNUNET_memcmp_ct_ (const void *b1,
  * the first element!
  */
 #define GNUNET_memcmp_priv(a, b)       \
-  ({                              \
+        ({                              \
     const typeof (*b) * _a = (a);  \
     const typeof (*a) * _b = (b);  \
     GNUNET_memcmp_ct_ (_a, _b, sizeof(*a)); \
@@ -1258,9 +1278,9 @@ GNUNET_memcmp_ct_ (const void *b1,
  * @param a pointer to @a n bytes which should be tested for the
  *          entire memory being zero'ed out.
  * @param n number of bytes in @a to be tested
- * @return GNUNET_YES if a is zero, GNUNET_NO otherwise
+ * @return true if @a a is zero, false_NO otherwise
  */
-enum GNUNET_GenericReturnValue
+bool
 GNUNET_is_zero_ (const void *a,
                  size_t n);
 
@@ -1273,7 +1293,7 @@ GNUNET_is_zero_ (const void *a,
  * @return GNUNET_YES if a is zero, GNUNET_NO otherwise
  */
 #define GNUNET_is_zero(a)           \
-  GNUNET_is_zero_ ((a), sizeof (*(a)))
+        GNUNET_is_zero_ ((a), sizeof (*(a)))
 
 
 /**
@@ -1286,15 +1306,16 @@ GNUNET_is_zero_ (const void *a,
  * @param n number of bytes to copy
  */
 #define GNUNET_memcpy(dst, src, n) \
-  do                               \
-  {                                \
-    if (0 != n)                    \
-    {                              \
-      (void) memcpy (dst, src, n); \
-    }                              \
-  } while (0)
+        do                               \
+        {                                \
+          if (0 != n)                    \
+          {                              \
+            (void) memcpy (dst, src, n); \
+          }                              \
+        } while (0)
 
 
+/* *INDENT-OFF* */
 /**
  * @ingroup memory
  * Allocate a size @a n array with structs or unions of the given @a type.
@@ -1308,6 +1329,7 @@ GNUNET_is_zero_ (const void *a,
     GNUNET_assert (SIZE_MAX / sizeof (type) >= n);     \
     (type *) GNUNET_malloc ((n) * sizeof(type));   \
   })
+/* *INDENT-ON* */
 
 /**
  * @ingroup memory
@@ -1319,7 +1341,7 @@ GNUNET_is_zero_ (const void *a,
  * @param type name of the struct or union, i.e. pass 'struct Foo'.
  */
 #define GNUNET_new_array_2d(n, m, type) \
-  (type **) GNUNET_xnew_array_2d_ (n, m, sizeof(type), __FILE__, __LINE__)
+        (type **) GNUNET_xnew_array_2d_ (n, m, sizeof(type), __FILE__, __LINE__)
 
 /**
  * @ingroup memory
@@ -1332,7 +1354,8 @@ GNUNET_is_zero_ (const void *a,
  * @param type name of the struct or union, i.e. pass 'struct Foo'.
  */
 #define GNUNET_new_array_3d(n, m, o, type) \
-  (type ***) GNUNET_xnew_array_3d_ (n, m, o, sizeof(type), __FILE__, __LINE__)
+        (type ***) GNUNET_xnew_array_3d_ (n, m, o, sizeof(type), __FILE__, \
+                                          __LINE__)
 
 /**
  * @ingroup memory
@@ -1364,7 +1387,7 @@ GNUNET_is_zero_ (const void *a,
  * @return pointer to size bytes of memory, NULL if we do not have enough memory
  */
 #define GNUNET_malloc_large(size) \
-  GNUNET_xmalloc_unchecked_ (size, __FILE__, __LINE__)
+        GNUNET_xmalloc_unchecked_ (size, __FILE__, __LINE__)
 
 
 /**
@@ -1377,7 +1400,7 @@ GNUNET_is_zero_ (const void *a,
  * @return pointer to size bytes of memory
  */
 #define GNUNET_realloc(ptr, size) \
-  GNUNET_xrealloc_ (ptr, size, __FILE__, __LINE__)
+        GNUNET_xrealloc_ (ptr, size, __FILE__, __LINE__)
 
 
 /**
@@ -1404,8 +1427,8 @@ GNUNET_is_zero_ (const void *a,
  *     been returned by #GNUNET_strdup, #GNUNET_strndup, #GNUNET_malloc or #GNUNET_array_grow earlier.  NULL is allowed.
  */
 #define GNUNET_free(ptr) do { \
-    GNUNET_xfree_ (ptr, __FILE__, __LINE__); \
-    ptr = NULL; \
+          GNUNET_xfree_ (ptr, __FILE__, __LINE__); \
+          ptr = NULL; \
 } while (0)
 
 
@@ -1419,6 +1442,7 @@ GNUNET_is_zero_ (const void *a,
  */
 #define GNUNET_strdup(a) GNUNET_xstrdup_ (a, __FILE__, __LINE__)
 
+
 /**
  * @ingroup memory
  * Wrapper around #GNUNET_xstrndup_.  Makes a partial copy of the string
@@ -1429,7 +1453,7 @@ GNUNET_is_zero_ (const void *a,
  * @return a partial copy of the string including zero-termination
  */
 #define GNUNET_strndup(a, length) \
-  GNUNET_xstrndup_ (a, length, __FILE__, __LINE__)
+        GNUNET_xstrndup_ (a, length, __FILE__, __LINE__)
 
 /**
  * @ingroup memory
@@ -1467,12 +1491,12 @@ GNUNET_is_zero_ (const void *a,
  *        free the vector (then, arr will be NULL afterwards).
  */
 #define GNUNET_array_grow(arr, size, tsize) \
-  GNUNET_xgrow_ ((void **) &(arr),          \
-                 sizeof((arr)[0]),         \
-                 &size,                     \
-                 tsize,                     \
-                 __FILE__,                  \
-                 __LINE__)
+        GNUNET_xgrow_ ((void **) &(arr),          \
+                       sizeof((arr)[0]),         \
+                       &size,                     \
+                       tsize,                     \
+                       __FILE__,                  \
+                       __LINE__)
 
 /**
  * @ingroup memory
@@ -1488,12 +1512,12 @@ GNUNET_is_zero_ (const void *a,
  * @param element the element that will be appended to the array
  */
 #define GNUNET_array_append(arr, len, element) \
-  do                                            \
-  {                                             \
-    GNUNET_assert ((len) + 1 > (len)); \
-    GNUNET_array_grow (arr, len, len + 1);    \
-    (arr) [len - 1] = element;                  \
-  } while (0)
+        do                                            \
+        {                                             \
+          GNUNET_assert ((len) + 1 > (len)); \
+          GNUNET_array_grow (arr, len, len + 1);    \
+          (arr) [len - 1] = element;                  \
+        } while (0)
 
 
 /**
@@ -1520,15 +1544,15 @@ GNUNET_is_zero_ (const void *a,
 
  */
 #define GNUNET_array_concatenate(arr1, len1, arr2, len2)   \
-  do                                            \
-  {                                             \
-    const typeof (*arr2) * _a1 = (arr1);  \
-    const typeof (*arr1) * _a2 = (arr2);  \
-    GNUNET_assert ((len1) + (len2) >= (len1));                    \
-    GNUNET_assert (SIZE_MAX / sizeof (*_a1) >= ((len1) + (len2))); \
-    GNUNET_array_grow (arr1, len1, (len1) + (len2));            \
-    memcpy (&(arr1) [(len1) - (len2)], _a2, (len2) * sizeof (*arr1));    \
-  } while (0)
+        do                                            \
+        {                                             \
+          const typeof (*arr2) * _a1 = (arr1);  \
+          const typeof (*arr1) * _a2 = (arr2);  \
+          GNUNET_assert ((len1) + (len2) >= (len1));                    \
+          GNUNET_assert (SIZE_MAX / sizeof (*_a1) >= ((len1) + (len2))); \
+          GNUNET_array_grow (arr1, len1, (len1) + (len2));            \
+          memcpy (&(arr1) [(len1) - (len2)], _a2, (len2) * sizeof (*arr1));    \
+        } while (0)
 
 
 /**
@@ -1579,7 +1603,9 @@ __attribute__ ((format (printf, 2, 3)));
  * @return allocated memory, never NULL
  */
 void *
-GNUNET_xmalloc_ (size_t size, const char *filename, int linenumber);
+GNUNET_xmalloc_ (size_t size,
+                 const char *filename,
+                 int linenumber);
 
 
 /**
@@ -1659,7 +1685,9 @@ GNUNET_xmemdup_ (const void *buf,
  * @return pointer to size bytes of memory, NULL if we do not have enough memory
  */
 void *
-GNUNET_xmalloc_unchecked_ (size_t size, const char *filename, int linenumber);
+GNUNET_xmalloc_unchecked_ (size_t size,
+                           const char *filename,
+                           int linenumber);
 
 
 /**
@@ -1667,7 +1695,10 @@ GNUNET_xmalloc_unchecked_ (size_t size, const char *filename, int linenumber);
  * memory is available.
  */
 void *
-GNUNET_xrealloc_ (void *ptr, size_t n, const char *filename, int linenumber);
+GNUNET_xrealloc_ (void *ptr,
+                  size_t n,
+                  const char *filename,
+                  int linenumber);
 
 
 /**
@@ -1680,7 +1711,9 @@ GNUNET_xrealloc_ (void *ptr, size_t n, const char *filename, int linenumber);
  * @param linenumber line where this call is being made (for debugging)
  */
 void
-GNUNET_xfree_ (void *ptr, const char *filename, int linenumber);
+GNUNET_xfree_ (void *ptr,
+               const char *filename,
+               int linenumber);
 
 
 /**
@@ -1691,7 +1724,9 @@ GNUNET_xfree_ (void *ptr, const char *filename, int linenumber);
  * @return the duplicated string
  */
 char *
-GNUNET_xstrdup_ (const char *str, const char *filename, int linenumber);
+GNUNET_xstrdup_ (const char *str,
+                 const char *filename,
+                 int linenumber);
 
 /**
  * Dup partially a string. Don't call GNUNET_xstrndup_ directly. Use the #GNUNET_strndup macro.
@@ -1861,6 +1896,8 @@ enum GNUNET_SCHEDULER_Priority
 };
 
 
+/* *INDENT-OFF* */
+
 #if 0 /* keep Emacsens' auto-indent happy */
 {
 #endif
@@ -1869,5 +1906,3 @@ enum GNUNET_SCHEDULER_Priority
 #endif
 
 #endif /* GNUNET_COMMON_H */
-
-/** @} */ /* end of group addition */
diff --git a/src/include/gnunet_configuration_lib.h b/src/include/gnunet_configuration_lib.h
index 3b9be5849..132172516 100644
--- a/src/include/gnunet_configuration_lib.h
+++ b/src/include/gnunet_configuration_lib.h
@@ -66,7 +66,8 @@ GNUNET_CONFIGURATION_create (void);
  * @return duplicate configuration
  */
 struct GNUNET_CONFIGURATION_Handle *
-GNUNET_CONFIGURATION_dup (const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_CONFIGURATION_dup (
+  const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -75,7 +76,8 @@ GNUNET_CONFIGURATION_dup (const struct GNUNET_CONFIGURATION_Handle *cfg);
  * @param cfg configuration to destroy
  */
 void
-GNUNET_CONFIGURATION_destroy (struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_CONFIGURATION_destroy (
+  struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -88,8 +90,9 @@ GNUNET_CONFIGURATION_destroy (struct GNUNET_CONFIGURATION_Handle *cfg);
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 enum GNUNET_GenericReturnValue
-GNUNET_CONFIGURATION_load (struct GNUNET_CONFIGURATION_Handle *cfg,
-                           const char *filename);
+GNUNET_CONFIGURATION_load (
+  struct GNUNET_CONFIGURATION_Handle *cfg,
+  const char *filename);
 
 
 /**
@@ -101,8 +104,9 @@ GNUNET_CONFIGURATION_load (struct GNUNET_CONFIGURATION_Handle *cfg,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 enum GNUNET_GenericReturnValue
-GNUNET_CONFIGURATION_load_from (struct GNUNET_CONFIGURATION_Handle *cfg,
-                                const char *defaults_d);
+GNUNET_CONFIGURATION_load_from (
+  struct GNUNET_CONFIGURATION_Handle *cfg,
+  const char *defaults_d);
 
 
 /**
@@ -138,8 +142,9 @@ GNUNET_CONFIGURATION_default_filename (void);
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 enum GNUNET_GenericReturnValue
-GNUNET_CONFIGURATION_parse (struct GNUNET_CONFIGURATION_Handle *cfg,
-                            const char *filename);
+GNUNET_CONFIGURATION_parse (
+  struct GNUNET_CONFIGURATION_Handle *cfg,
+  const char *filename);
 
 
 /**
@@ -151,8 +156,9 @@ GNUNET_CONFIGURATION_parse (struct GNUNET_CONFIGURATION_Handle *cfg,
  *           present. This memory should be freed by the caller
  */
 char *
-GNUNET_CONFIGURATION_serialize (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                                size_t *size);
+GNUNET_CONFIGURATION_serialize (
+  const struct GNUNET_CONFIGURATION_Handle *cfg,
+  size_t *size);
 
 
 /**
@@ -168,6 +174,7 @@ char *
 GNUNET_CONFIGURATION_serialize_diagnostics (
   const struct GNUNET_CONFIGURATION_Handle *cfg);
 
+
 /**
  * De-serializes configuration
  *
@@ -179,10 +186,11 @@ GNUNET_CONFIGURATION_serialize_diagnostics (
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 enum GNUNET_GenericReturnValue
-GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
-                                  const char *mem,
-                                  size_t size,
-                                  const char *source_filename);
+GNUNET_CONFIGURATION_deserialize (
+  struct GNUNET_CONFIGURATION_Handle *cfg,
+  const char *mem,
+  size_t size,
+  const char *source_filename);
 
 
 /**
@@ -193,8 +201,9 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
 enum GNUNET_GenericReturnValue
-GNUNET_CONFIGURATION_write (struct GNUNET_CONFIGURATION_Handle *cfg,
-                            const char *filename);
+GNUNET_CONFIGURATION_write (
+  struct GNUNET_CONFIGURATION_Handle *cfg,
+  const char *filename);
 
 
 /**
@@ -233,7 +242,8 @@ GNUNET_CONFIGURATION_get_diff (
  * @return #GNUNET_NO if clean, #GNUNET_YES if dirty, #GNUNET_SYSERR on error (i.e. last save failed)
  */
 enum GNUNET_GenericReturnValue
-GNUNET_CONFIGURATION_is_dirty (const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_CONFIGURATION_is_dirty (
+  const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -244,8 +254,9 @@ GNUNET_CONFIGURATION_is_dirty (const struct GNUNET_CONFIGURATION_Handle *cfg);
  * @return status code
  */
 typedef enum GNUNET_GenericReturnValue
-(*GNUNET_CONFIGURATION_Callback)(void *cls,
-                                 const struct GNUNET_CONFIGURATION_Handle *cfg);
+(*GNUNET_CONFIGURATION_Callback)(
+  void *cls,
+  const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -260,9 +271,10 @@ typedef enum GNUNET_GenericReturnValue
  *   otherwise return value from @a cb.
  */
 enum GNUNET_GenericReturnValue
-GNUNET_CONFIGURATION_parse_and_run (const char *filename,
-                                    GNUNET_CONFIGURATION_Callback cb,
-                                    void *cb_cls);
+GNUNET_CONFIGURATION_parse_and_run (
+  const char *filename,
+  GNUNET_CONFIGURATION_Callback cb,
+  void *cb_cls);
 
 /**
  * Enable extra diagnostics.  Will produce more log output
@@ -309,9 +321,10 @@ typedef void
  * @param iter_cls closure for @a iter
  */
 void
-GNUNET_CONFIGURATION_iterate (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                              GNUNET_CONFIGURATION_Iterator iter,
-                              void *iter_cls);
+GNUNET_CONFIGURATION_iterate (
+  const struct GNUNET_CONFIGURATION_Handle *cfg,
+  GNUNET_CONFIGURATION_Iterator iter,
+  void *iter_cls);
 
 
 /**
@@ -335,8 +348,9 @@ GNUNET_CONFIGURATION_iterate_sections (
  * @param section name of the section to remove
  */
 void
-GNUNET_CONFIGURATION_remove_section (struct GNUNET_CONFIGURATION_Handle *cfg,
-                                     const char *section);
+GNUNET_CONFIGURATION_remove_section (
+  struct GNUNET_CONFIGURATION_Handle *cfg,
+  const char *section);
 
 
 /**
@@ -596,10 +610,11 @@ GNUNET_CONFIGURATION_set_value_number (struct GNUNET_CONFIGURATION_Handle *cfg,
  * @param value value to set
  */
 void
-GNUNET_CONFIGURATION_set_value_string (struct GNUNET_CONFIGURATION_Handle *cfg,
-                                       const char *section,
-                                       const char *option,
-                                       const char *value);
+GNUNET_CONFIGURATION_set_value_string (
+  struct GNUNET_CONFIGURATION_Handle *cfg,
+  const char *section,
+  const char *option,
+  const char *value);
 
 
 /**
@@ -649,10 +664,8 @@ struct GNUNET_CONFIGURATION_ConfigSettings
 {
 
   /**
-   * Must be set to the API version, i.e.
-   * #GNUNET_UTIL_VERSION. Used to detect
-   * which version of the struct the client
-   * is using.
+   * Must be set to the API version, i.e.  #GNUNET_UTIL_VERSION. Used to
+   * detect which version of the struct the client is using.
    */
   unsigned int api_version;
 
@@ -696,7 +709,6 @@ struct GNUNET_CONFIGURATION_ConfigSettings
    */
   int full;
 
-
   /**
    * Return value from the operation, to be returned
    * from 'main'.
@@ -714,50 +726,52 @@ struct GNUNET_CONFIGURATION_ConfigSettings
  * @param cs configuration settings to initialize
  */
 #define GNUNET_CONFIGURATION_CONFIG_OPTIONS(cs) \
-  GNUNET_GETOPT_option_flag ( \
-    'F', \
-    "full", \
-    gettext_noop ( \
-      "write the full configuration file, including default values"), \
-    &(cs)->full), \
-  GNUNET_GETOPT_option_flag ( \
-    'f', \
-    "filename", \
-    gettext_noop ("interpret option value as a filename (with $-expansion)"), \
-    &(cs)->is_filename), \
-  GNUNET_GETOPT_option_string ('o', \
-                               "option", \
-                               "OPTION", \
-                               gettext_noop ("name of the option to access"), \
-                               &(cs)->option), \
-  GNUNET_GETOPT_option_flag ( \
-    'r', \
-    "rewrite", \
-    gettext_noop ( \
-      "rewrite the configuration file, even if nothing changed"), \
-    &(cs)->rewrite), \
-  GNUNET_GETOPT_option_flag ( \
-    'd', \
-    "diagnostics", \
-    gettext_noop ( \
-      "output extra diagnostics"), \
-    &(cs)->diagnostics), \
-  GNUNET_GETOPT_option_flag ('S', \
-                             "list-sections", \
-                             gettext_noop ( \
-                               "print available configuration sections"), \
-                             &(cs)->list_sections), \
-  GNUNET_GETOPT_option_string ('s', \
-                               "section", \
-                               "SECTION", \
-                               gettext_noop ( \
-                                 "name of the section to access"), \
-                               &(cs)->section), \
-  GNUNET_GETOPT_option_string ('V', \
-                               "value", \
-                               "VALUE", \
-                               gettext_noop ("value to set"), \
-                               &(cs)->value)
+        GNUNET_GETOPT_option_flag ( \
+          'F', \
+          "full", \
+          gettext_noop ( \
+            "write the full configuration file, including default values"), \
+          &(cs)->full), \
+        GNUNET_GETOPT_option_flag ( \
+          'f', \
+          "filename", \
+          gettext_noop ( \
+            "interpret option value as a filename (with $-expansion)"), \
+          &(cs)->is_filename), \
+        GNUNET_GETOPT_option_string ('o', \
+                                     "option", \
+                                     "OPTION", \
+                                     gettext_noop ( \
+                                       "name of the option to access"), \
+                                     &(cs)->option), \
+        GNUNET_GETOPT_option_flag ( \
+          'r', \
+          "rewrite", \
+          gettext_noop ( \
+            "rewrite the configuration file, even if nothing changed"), \
+          &(cs)->rewrite), \
+        GNUNET_GETOPT_option_flag ( \
+          'd', \
+          "diagnostics", \
+          gettext_noop ( \
+            "output extra diagnostics"), \
+          &(cs)->diagnostics), \
+        GNUNET_GETOPT_option_flag ('S', \
+                                   "list-sections", \
+                                   gettext_noop ( \
+                                     "print available configuration sections"), \
+                                   &(cs)->list_sections), \
+        GNUNET_GETOPT_option_string ('s', \
+                                     "section", \
+                                     "SECTION", \
+                                     gettext_noop ( \
+                                       "name of the section to access"), \
+                                     &(cs)->section), \
+        GNUNET_GETOPT_option_string ('V', \
+                                     "value", \
+                                     "VALUE", \
+                                     gettext_noop ("value to set"), \
+                                     &(cs)->value)
 
 
 /**
diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h
index 50937324d..b74bbcd1e 100644
--- a/src/include/gnunet_crypto_lib.h
+++ b/src/include/gnunet_crypto_lib.h
@@ -1736,6 +1736,15 @@ GNUNET_CRYPTO_edx25519_key_clear (struct GNUNET_CRYPTO_Edx25519PrivateKey *pk);
 void
 GNUNET_CRYPTO_ecdhe_key_clear (struct GNUNET_CRYPTO_EcdhePrivateKey *pk);
 
+/**
+ * @ingroup crypto
+ * Clear memory that was used to store a private key.
+ *
+ * @param pk location of the key
+ */
+void
+GNUNET_CRYPTO_private_key_clear (struct GNUNET_CRYPTO_PrivateKey *pk);
+
 
 /**
  * @ingroup crypto
diff --git a/src/include/gnunet_getopt_lib.h b/src/include/gnunet_getopt_lib.h
index 390e8c153..451ddf12b 100644
--- a/src/include/gnunet_getopt_lib.h
+++ b/src/include/gnunet_getopt_lib.h
@@ -33,7 +33,7 @@
  * @{
  */
 
-#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#if ! defined (__GNUNET_UTIL_LIB_H_INSIDE__)
 #error "Only <gnunet_util_lib.h> can be included directly."
 #endif
 
@@ -275,12 +275,12 @@ GNUNET_GETOPT_option_base32_fixed_size (char shortName,
                                          argumentHelp,  \
                                          description,   \
                                          val)           \
-  GNUNET_GETOPT_option_base32_fixed_size (shortName,    \
-                                          name,         \
-                                          argumentHelp, \
-                                          description,  \
-                                          val,          \
-                                          sizeof(*val))
+        GNUNET_GETOPT_option_base32_fixed_size (shortName,    \
+                                                name,         \
+                                                argumentHelp, \
+                                                description,  \
+                                                val,          \
+                                                sizeof(*val))
 
 
 /**
@@ -440,15 +440,6 @@ GNUNET_GETOPT_option_verbose (unsigned int *level);
 
 
 /**
- * Allow user to specify log file name (-l option)
- *
- * @param[out] logfn set to the name of the logfile
- */
-struct GNUNET_GETOPT_CommandLineOption
-GNUNET_GETOPT_option_logfile (char **logfn);
-
-
-/**
  * Allow user to specify configuration file name (-c option)
  *
  * @param[out] fn set to the name of the configuration file
@@ -481,9 +472,9 @@ GNUNET_GETOPT_option_exclusive (struct GNUNET_GETOPT_CommandLineOption opt);
  * Marker for the end of the list of options.
  */
 #define GNUNET_GETOPT_OPTION_END                      \
-  {                                                   \
-    '\0', NULL, NULL, NULL, 0, 0, 0, NULL, NULL, NULL \
-  }
+        {                                                   \
+          '\0', NULL, NULL, NULL, 0, 0, 0, NULL, NULL, NULL \
+        }
 
 
 /**
diff --git a/src/include/gnunet_helper_lib.h b/src/include/gnunet_helper_lib.h
index c329c4a33..57630c45c 100644
--- a/src/include/gnunet_helper_lib.h
+++ b/src/include/gnunet_helper_lib.h
@@ -173,7 +173,7 @@ struct GNUNET_HELPER_SendHandle;
 struct GNUNET_HELPER_SendHandle *
 GNUNET_HELPER_send (struct GNUNET_HELPER_Handle *h,
                     const struct GNUNET_MessageHeader *msg,
-                    int can_drop,
+                    bool can_drop,
                     GNUNET_HELPER_Continuation cont,
                     void *cont_cls);
 
diff --git a/src/include/gnunet_json_lib.h b/src/include/gnunet_json_lib.h
index e9c17eef9..2059e127f 100644
--- a/src/include/gnunet_json_lib.h
+++ b/src/include/gnunet_json_lib.h
@@ -441,6 +441,28 @@ GNUNET_JSON_spec_blinded_message (const char *name,
                                   struct GNUNET_CRYPTO_BlindedMessage **msg);
 
 
+/**
+ * Specification for parsing a blinded signature.
+ *
+ * @param name name of the JSON field
+ * @param sig where to store the blinded signature found under @a name
+ */
+struct GNUNET_JSON_Specification
+GNUNET_JSON_spec_blinded_signature (const char *field,
+                                    struct GNUNET_CRYPTO_BlindedSignature **b_sig);
+
+
+/**
+ * Specification for parsing a unblinded signature.
+ *
+ * @param name name of the JSON field
+ * @param sig where to store the unblinded signature found under @a name
+ */
+struct GNUNET_JSON_Specification
+GNUNET_JSON_spec_unblinded_signature (const char *field,
+                                     struct GNUNET_CRYPTO_UnblindedSignature **ub_sig);
+
+
 /* ****************** Generic generator interface ******************* */
 
 
diff --git a/src/include/gnunet_mq_lib.h b/src/include/gnunet_mq_lib.h
index 3eca71f0f..b40693cdb 100644
--- a/src/include/gnunet_mq_lib.h
+++ b/src/include/gnunet_mq_lib.h
@@ -19,7 +19,7 @@
  */
 
 #include "gnunet_common.h"
-#if !defined (__GNUNET_UTIL_LIB_H_INSIDE__)
+#if ! defined (__GNUNET_UTIL_LIB_H_INSIDE__)
 #error "Only <gnunet_util_lib.h> can be included directly."
 #endif
 
@@ -61,9 +61,9 @@
  * @return the MQ message
  */
 #define GNUNET_MQ_msg_extra(mvar, esize, type)                \
-  GNUNET_MQ_msg_ (((struct GNUNET_MessageHeader **) &(mvar)), \
-                  (esize) + sizeof *(mvar),                   \
-                  (type))
+        GNUNET_MQ_msg_ (((struct GNUNET_MessageHeader **) &(mvar)), \
+                        (esize) + sizeof *(mvar),                   \
+                        (type))
 
 /**
  * Allocate a GNUNET_MQ_Envelope.
@@ -85,7 +85,7 @@
  * @param type type of the message
  */
 #define GNUNET_MQ_msg_header(type) \
-  GNUNET_MQ_msg_ (NULL, sizeof(struct GNUNET_MessageHeader), type)
+        GNUNET_MQ_msg_ (NULL, sizeof(struct GNUNET_MessageHeader), type)
 
 
 /**
@@ -97,7 +97,8 @@
  * @param type type of the message
  */
 #define GNUNET_MQ_msg_header_extra(mh, esize, type) \
-  GNUNET_MQ_msg_ (&mh, (esize) + sizeof(struct GNUNET_MessageHeader), type)
+        GNUNET_MQ_msg_ (&mh, (esize) + sizeof(struct GNUNET_MessageHeader), type \
+                        )
 
 
 /**
@@ -111,7 +112,7 @@
  * @return a newly allocated 'struct GNUNET_MQ_Envelope *'
  */
 #define GNUNET_MQ_msg_nested_mh(mvar, type, mh)                               \
-  ({                                                                          \
+        ({                                                                          \
     struct GNUNET_MQ_Envelope *_ev;                                           \
     _ev = GNUNET_MQ_msg_nested_mh_ ((struct GNUNET_MessageHeader **) &(mvar), \
                                     sizeof(*(mvar)),                         \
@@ -131,8 +132,8 @@
  *         or NULL if the given message in @a var does not have any space after the message struct
  */
 #define GNUNET_MQ_extract_nested_mh(var)                               \
-  GNUNET_MQ_extract_nested_mh_ ((struct GNUNET_MessageHeader *) (var), \
-                                sizeof(*(var)))
+        GNUNET_MQ_extract_nested_mh_ ((struct GNUNET_MessageHeader *) (var), \
+                                      sizeof(*(var)))
 
 
 /**
@@ -330,7 +331,7 @@ typedef void
  * @return #GNUNET_OK if the message is well-formed,
  *         #GNUNET_SYSERR if not
  */
-typedef int
+typedef enum GNUNET_GenericReturnValue
 (*GNUNET_MQ_MessageValidationCallback) (
   void *cls,
   const struct GNUNET_MessageHeader *msg);
@@ -530,9 +531,9 @@ struct GNUNET_MQ_MessageHandler
  * End-marker for the handlers array
  */
 #define GNUNET_MQ_handler_end() \
-  {                             \
-    NULL, NULL, NULL, 0, 0      \
-  }
+        {                             \
+          NULL, NULL, NULL, 0, 0      \
+        }
 
 
 /**
@@ -564,7 +565,7 @@ struct GNUNET_MQ_MessageHandler
  * @param ctx context for the callbacks
  */
 #define GNUNET_MQ_hd_fixed_size(name, code, str, ctx)                   \
-  ({                                                                    \
+        ({                                                                    \
     void (*_cb)(void *cls, const str *msg) = &handle_ ## name;           \
     ((struct GNUNET_MQ_MessageHandler){ NULL,                            \
                                         (GNUNET_MQ_MessageCallback) _cb, \
@@ -616,7 +617,7 @@ struct GNUNET_MQ_MessageHandler
  * @param ctx context for the callbacks
  */
 #define GNUNET_MQ_hd_var_size(name, code, str, ctx)                          \
-  __extension__ ({                                                            \
+        __extension__ ({                                                            \
     int (*_mv)(void *cls, const str *msg) = &check_ ## name;                  \
     void (*_cb)(void *cls, const str *msg) = &handle_ ## name;                \
     ((struct GNUNET_MQ_MessageHandler){ (GNUNET_MQ_MessageValidationCallback) \
@@ -639,17 +640,17 @@ struct GNUNET_MQ_MessageHandler
  *  the size, starting with a `struct GNUNET_MessageHeader`
  */
 #define GNUNET_MQ_check_zero_termination(m)                       \
-  {                                                               \
-    const char *str = (const char *) &m[1];                       \
-    const struct GNUNET_MessageHeader *hdr =                      \
-      (const struct GNUNET_MessageHeader *) m;                    \
-    uint16_t slen = ntohs (hdr->size) - sizeof(*m);              \
-    if ((0 == slen) || (memchr (str, 0, slen) != &str[slen - 1])) \
-    {                                                             \
-      GNUNET_break (0);                                           \
-      return GNUNET_NO;                                           \
-    }                                                             \
-  }
+        {                                                               \
+          const char *str = (const char *) &m[1];                       \
+          const struct GNUNET_MessageHeader *hdr =                      \
+            (const struct GNUNET_MessageHeader *) m;                    \
+          uint16_t slen = ntohs (hdr->size) - sizeof(*m);              \
+          if ((0 == slen) || (memchr (str, 0, slen) != &str[slen - 1])) \
+          {                                                             \
+            GNUNET_break (0);                                           \
+            return GNUNET_NO;                                           \
+          }                                                             \
+        }
 
 
 /**
@@ -665,19 +666,19 @@ struct GNUNET_MQ_MessageHandler
  *  the size, starting with a `struct GNUNET_MessageHeader`
  */
 #define GNUNET_MQ_check_boxed_message(m)                 \
-  {                                                      \
-    const struct GNUNET_MessageHeader *inbox =           \
-      (const struct GNUNET_MessageHeader *) &m[1];       \
-    const struct GNUNET_MessageHeader *hdr =             \
-      (const struct GNUNET_MessageHeader *) m;           \
-    uint16_t slen = ntohs (hdr->size) - sizeof(*m);     \
-    if ((slen < sizeof(struct GNUNET_MessageHeader)) || \
-        (slen != ntohs (inbox->size)))                   \
-    {                                                    \
-      GNUNET_break (0);                                  \
-      return GNUNET_NO;                                  \
-    }                                                    \
-  }
+        {                                                      \
+          const struct GNUNET_MessageHeader *inbox =           \
+            (const struct GNUNET_MessageHeader *) &m[1];       \
+          const struct GNUNET_MessageHeader *hdr =             \
+            (const struct GNUNET_MessageHeader *) m;           \
+          uint16_t slen = ntohs (hdr->size) - sizeof(*m);     \
+          if ((slen < sizeof(struct GNUNET_MessageHeader)) || \
+              (slen != ntohs (inbox->size)))                   \
+          {                                                    \
+            GNUNET_break (0);                                  \
+            return GNUNET_NO;                                  \
+          }                                                    \
+        }
 
 
 /**
diff --git a/src/include/gnunet_os_lib.h b/src/include/gnunet_os_lib.h
index c1e193720..93296c96b 100644
--- a/src/include/gnunet_os_lib.h
+++ b/src/include/gnunet_os_lib.h
@@ -403,6 +403,10 @@ void
 GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc,
                                    void *proc_cls);
 
+#ifndef HAVE_SYSCONF
+#define HAVE_SYSCONF 0
+#endif
+
 /**
  * @brief Get maximum string length returned by gethostname()
  */
@@ -473,12 +477,13 @@ GNUNET_OS_process_get_pid (struct GNUNET_OS_Process *proc);
  * @return pointer to process structure of the new process, NULL on error
  */
 struct GNUNET_OS_Process *
-GNUNET_OS_start_process_vap (enum GNUNET_OS_InheritStdioFlags std_inheritance,
-                             struct GNUNET_DISK_PipeHandle *pipe_stdin,
-                             struct GNUNET_DISK_PipeHandle *pipe_stdout,
-                             struct GNUNET_DISK_PipeHandle *pipe_stderr,
-                             const char *filename,
-                             char *const argv[]);
+GNUNET_OS_start_process_vap (
+  enum GNUNET_OS_InheritStdioFlags std_inheritance,
+  struct GNUNET_DISK_PipeHandle *pipe_stdin,
+  struct GNUNET_DISK_PipeHandle *pipe_stdout,
+  struct GNUNET_DISK_PipeHandle *pipe_stderr,
+  const char *filename,
+  char *const argv[]);
 
 
 /**
@@ -493,11 +498,13 @@ GNUNET_OS_start_process_vap (enum GNUNET_OS_InheritStdioFlags std_inheritance,
  * @return pointer to process structure of the new process, NULL on error
  */
 struct GNUNET_OS_Process *
-GNUNET_OS_start_process (enum GNUNET_OS_InheritStdioFlags std_inheritance,
-                         struct GNUNET_DISK_PipeHandle *pipe_stdin,
-                         struct GNUNET_DISK_PipeHandle *pipe_stdout,
-                         struct GNUNET_DISK_PipeHandle *pipe_stderr,
-                         const char *filename, ...);
+GNUNET_OS_start_process (
+  enum GNUNET_OS_InheritStdioFlags std_inheritance,
+  struct GNUNET_DISK_PipeHandle *pipe_stdin,
+  struct GNUNET_DISK_PipeHandle *pipe_stdout,
+  struct GNUNET_DISK_PipeHandle *pipe_stderr,
+  const char *filename,
+  ...);
 
 
 /**
@@ -512,11 +519,14 @@ GNUNET_OS_start_process (enum GNUNET_OS_InheritStdioFlags std_inheritance,
  * @return pointer to process structure of the new process, NULL on error
  */
 struct GNUNET_OS_Process *
-GNUNET_OS_start_process_va (enum GNUNET_OS_InheritStdioFlags std_inheritance,
-                            struct GNUNET_DISK_PipeHandle *pipe_stdin,
-                            struct GNUNET_DISK_PipeHandle *pipe_stdout,
-                            struct GNUNET_DISK_PipeHandle *pipe_stderr,
-                            const char *filename, va_list va);
+GNUNET_OS_start_process_va (
+  enum GNUNET_OS_InheritStdioFlags std_inheritance,
+  struct GNUNET_DISK_PipeHandle *pipe_stdin,
+  struct GNUNET_DISK_PipeHandle *pipe_stdout,
+  struct GNUNET_DISK_PipeHandle *pipe_stderr,
+  const char *filename,
+  va_list va);
+
 
 /**
  * Start a process.
@@ -530,10 +540,11 @@ GNUNET_OS_start_process_va (enum GNUNET_OS_InheritStdioFlags std_inheritance,
  * @return pointer to process structure of the new process, NULL on error
  */
 struct GNUNET_OS_Process *
-GNUNET_OS_start_process_v (enum GNUNET_OS_InheritStdioFlags std_inheritance,
-                           const int *lsocks,
-                           const char *filename,
-                           char *const argv[]);
+GNUNET_OS_start_process_v (
+  enum GNUNET_OS_InheritStdioFlags std_inheritance,
+  const int *lsocks,
+  const char *filename,
+  char *const argv[]);
 
 
 /**
@@ -554,9 +565,11 @@ GNUNET_OS_start_process_v (enum GNUNET_OS_InheritStdioFlags std_inheritance,
  * @return pointer to process structure of the new process, NULL on error
  */
 struct GNUNET_OS_Process *
-GNUNET_OS_start_process_s (enum GNUNET_OS_InheritStdioFlags std_inheritance,
-                           const int *lsocks,
-                           const char *filename, ...);
+GNUNET_OS_start_process_s (
+  enum GNUNET_OS_InheritStdioFlags std_inheritance,
+  const int *lsocks,
+  const char *filename,
+  ...);
 
 
 /**
@@ -596,11 +609,12 @@ GNUNET_OS_command_stop (struct GNUNET_OS_CommandHandle *cmd);
  * @return NULL on error
  */
 struct GNUNET_OS_CommandHandle *
-GNUNET_OS_command_run (GNUNET_OS_LineProcessor proc,
-                       void *proc_cls,
-                       struct GNUNET_TIME_Relative timeout,
-                       const char *binary,
-                       ...);
+GNUNET_OS_command_run (
+  GNUNET_OS_LineProcessor proc,
+  void *proc_cls,
+  struct GNUNET_TIME_Relative timeout,
+  const char *binary,
+  ...);
 
 
 /**
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index 6ab008d16..9fce48386 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -2778,19 +2778,6 @@ extern "C" {
  */
 #define GNUNET_MESSAGE_TYPE_XDHT_P2P_NOTIFY_SUCCESSOR_CONFIRMATION 892
 
-#if ENABLE_MALICIOUS
-/**
- * Turn X-VINE DHT service malicious
- */
-#define GNUNET_MESSAGE_TYPE_DHT_ACT_MALICIOUS 893
-
-/**
- * Acknowledge receiving ACT MALICIOUS request
- */
-#define GNUNET_MESSAGE_TYPE_DHT_CLIENT_ACT_MALICIOUS_OK 894
-
-#endif
-
 
 /*******************************************************************************
  * Whanau DHT messages
@@ -2875,6 +2862,10 @@ extern "C" {
  */
 #define GNUNET_MESSAGE_TYPE_RPS_CS_SEED 954
 
+#ifndef ENABLE_MALICIOUS
+#define ENABLE_MALICIOUS 0
+#endif
+
 #if ENABLE_MALICIOUS
 /**
  * Turn RPS service malicious
diff --git a/src/include/gnunet_testbed_lib.h b/src/include/gnunet_testbed_lib.h
new file mode 100644
index 000000000..e33f31ee1
--- /dev/null
+++ b/src/include/gnunet_testbed_lib.h
@@ -0,0 +1,130 @@
+#ifndef GNUNET_TESTBED_LIB_H
+#define GNUNET_TESTBED_LIB_H
+
+/**
+ * FIXME.
+ */
+struct GNUNET_TESTBED_System;
+
+#define GNUNET_TESTBED_PREFIX "GNUNET_TESTBED_PREFIX"
+
+/**
+ * Create a system handle.  There must only be one system
+ * handle per operating system.
+ *
+ * @param testdir only the directory name without any path. This is used for
+ *          all service homes; the directory will be created in a temporary
+ *          location depending on the underlying OS.  This variable will be
+ *          overridden with the value of the environmental variable
+ *          GNUNET_TESTBED_PREFIX, if it exists.
+ * @param trusted_ip the ip address which will be set as TRUSTED HOST in all
+ *          service configurations generated to allow control connections from
+ *          this ip. This can either be a single ip address or a network address
+ *          in CIDR notation.
+ * @param hostname the hostname of the system we are using for testing; NULL for
+ *          localhost
+ * @param lowport lowest port number this system is allowed to allocate (inclusive)
+ * @param highport highest port number this system is allowed to allocate (exclusive)
+ * @return handle to this system, NULL on error
+ */
+struct GNUNET_TESTBED_System *
+GNUNET_TESTBED_system_create_with_portrange (
+  const char *testdir,
+  const char *trusted_ip,
+  const char *hostname,
+  uint16_t lowport,
+  uint16_t highport);
+
+
+/**
+ * Create a system handle.  There must only be one system handle per operating
+ * system.  Uses a default range for allowed ports.  Ports are still tested for
+ * availability.
+ *
+ * @param testdir only the directory name without any path. This is used for all
+ *          service homes; the directory will be created in a temporary location
+ *          depending on the underlying OS.  This variable will be
+ *          overridden with the value of the environmental variable
+ *          GNUNET_TESTBED_PREFIX, if it exists.
+ * @param trusted_ip the ip address which will be set as TRUSTED HOST in all
+ *          service configurations generated to allow control connections from
+ *          this ip. This can either be a single ip address or a network address
+ *          in CIDR notation.
+ * @param hostname the hostname of the system we are using for testing; NULL for
+ *          localhost
+ * @param shared_services NULL terminated array describing services that are to
+ *          be shared among peers
+ * @return handle to this system, NULL on error
+ */
+struct GNUNET_TESTBED_System *
+GNUNET_TESTBED_system_create (
+  const char *testdir,
+  const char *trusted_ip,
+  const char *hostname);
+
+
+/**
+ * Free system resources.
+ *
+ * @param system system to be freed
+ * @param remove_paths should the 'testdir' and all subdirectories
+ *        be removed (clean up on shutdown)?
+ */
+void
+GNUNET_TESTBED_system_destroy (
+  struct GNUNET_TESTBED_System *system,
+  bool remove_paths);
+
+
+/**
+ * Reserve a TCP or UDP port for a peer.
+ *
+ * @param system system to use for reservation tracking
+ * @return 0 if no free port was available
+ */
+uint16_t
+GNUNET_TESTBED_reserve_port (
+  struct GNUNET_TESTBED_System *system);
+
+
+/**
+ * Release reservation of a TCP or UDP port for a peer
+ * (used during #GNUNET_TESTBED_peer_destroy()).
+ *
+ * @param system system to use for reservation tracking
+ * @param port reserved port to release
+ */
+void
+GNUNET_TESTBED_release_port (
+  struct GNUNET_TESTBED_System *system,
+  uint16_t port);
+
+
+/**
+ * Create a new configuration using the given configuration as a template;
+ * ports and paths will be modified to select available ports on the local
+ * system. The default configuration will be available in PATHS section under
+ * the option DEFAULTCONFIG after the call. GNUNET_HOME is also set in PATHS
+ * section to the temporary directory specific to this configuration. If we run
+ * out of "*port" numbers, return #GNUNET_SYSERR.
+ *
+ * This is primarily a helper function used internally
+ * by 'GNUNET_TESTBED_peer_configure'.
+ *
+ * @param system system to use to coordinate resource usage
+ * @param cfg template configuration to update
+ * @param ports array with port numbers used in the created configuration.
+ *          Will be updated upon successful return.  Can be NULL
+ * @param nports the size of the `ports' array.  Will be updated.
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on error - the configuration will
+ *           be incomplete and should not be used there upon
+ */
+enum GNUNET_GenericReturnValue
+GNUNET_TESTBED_configuration_create (
+  struct GNUNET_TESTBED_System *system,
+  struct GNUNET_CONFIGURATION_Handle *cfg,
+  uint16_t **ports,
+  unsigned int *nports);
+
+
+#endif
diff --git a/src/include/gnunet_testing_arm_lib.h b/src/include/gnunet_testing_arm_lib.h
new file mode 100644
index 000000000..66852b506
--- /dev/null
+++ b/src/include/gnunet_testing_arm_lib.h
@@ -0,0 +1,47 @@
+#ifndef GNUNET_TESTING_ARM_LIB_H
+#define GNUNET_TESTING_ARM_LIB_H
+
+#include "gnunet_arm_service.h"
+
+/**
+ * Create command.
+ *
+ * @param label name for command.
+ * @param system_label Label of the cmd to setup a test environment.
+ * @param cfgname Configuration file name for this peer.
+ * @return command.
+ */
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_ARM_cmd_start_peer (
+  const char *label,
+  const char *system_label,
+  const char *cfgname);
+
+
+/**
+ * Create command.
+ *
+ * @param label name for command.
+ * @param start_label Label of the cmd to start the peer.
+ * @return command.
+ */
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_stop_peer (
+  const char *label,
+  const char *start_label);
+
+
+/**
+ * Call #op on all simple traits.
+ */
+#define GNUNET_TESTING_ARM_SIMPLE_TRAITS(op, prefix) \
+        op (prefix,                                  \
+            arm_handle,                              \
+            struct GNUNET_ARM_Handle)
+
+
+GNUNET_TESTING_ARM_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_DECL_SIMPLE_TRAIT,
+                                  GNUNET_TESTING_ARM)
+
+
+#endif
diff --git a/src/include/gnunet_testing_barrier.h b/src/include/gnunet_testing_barrier.h
deleted file mode 100644
index b0f4e1c03..000000000
--- a/src/include/gnunet_testing_barrier.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2022 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file include/gnunet_testing_barrier.h
- * @brief API to manage barriers.
- * @author t3sserakt
- */
-
-#ifndef GNUNET_TESTING_BARRIER_LIB_H
-#define GNUNET_TESTING_BARRIER_LIB_H
-
-#include "gnunet_testing_plugin.h"
-
-
-struct GNUNET_TESTING_Barrier;
-
-
-#define GNUNET_TESTING_BARRIER_MAX 32
-
-/**
- * An entry for a barrier list
- * FIXME: why is this in the public API!??!
- */
-struct GNUNET_TESTING_BarrierListEntry
-{
-  /* DLL */
-  struct GNUNET_TESTING_BarrierListEntry *next;
-
-  /* DLL */
-  struct GNUNET_TESTING_BarrierListEntry *prev;
-
-  /* The barrier name*/
-  char *barrier_name;
-
-  /**
-   * Number of commands attached to the barrier.
-   */
-  unsigned int expected_reaches;
-  };
-
-/**
- * A list to hold barriers provided by plugins
- * FIXME: why is this in the public API!??!
- */
-struct GNUNET_TESTING_BarrierList
-{
-  /** List head **/
-  struct GNUNET_TESTING_BarrierListEntry *head;
-
-  /** List tail **/
-  struct GNUNET_TESTING_BarrierListEntry *tail;
-};
-
-
-/**
- * Command to create a barrier.
- *
- * FIXME: high-level it is baffling how we need both the GNUNET_TESTING_Barrier
- * and the Command that creates barriers. Conceptually this seems to be
- * very much separate. Can we move _Barrier completely into testing as private?
- *
- * @param label The label of this command.
- * @param percentage_to_be_reached If this percentage of processes reached
- *                                 this barrier, all processes waiting at
- *                                 this barrier can pass it. Must not be
- *                                 used together with number_to_be_reached.
- * @param number_to_be_reached If this number of processes reached
- *                             this barrier, all processes waiting at
- *                             this barrier can pass it. Must not be
- *                             used together with percentage_to_be_reached.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_barrier_create (
- const char *label,
- double percentage_to_be_reached,
- unsigned int number_to_be_reached);
-
-
-/**
- * If this command is executed the the process is signaling the master process
- * that it reached a barrier. If this command is synchronous it will block.
- *
- * FIXME: Now this, as it returns a Command, seems to me like it should be
- * part of the public API?
- *
- * @param label name for command.
- * @param barrier_label The name of the barrier we waited for and which was reached.
- * @param asynchronous_finish If #GNUNET_YES this command will not block.
- * @param node_number The global number of the node the cmd runs on.
- * @param running_on_master Is this cmd running on the master loop?
- * @param write_message Callback to write messages to the master loop.
- * @return command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_barrier_reached (
-  const char *label,
-  const char *barrier_label,
-  unsigned int asynchronous_finish, /* FIXME: why not a bool? */
-  unsigned int node_number,
-  unsigned int running_on_master, /* FIXME: why not a bool? */
-  GNUNET_TESTING_cmd_helper_write_cb write_message); /* FIXME: no 'cls' closure argument!? */
-
-#endif
-/* end of testing_barrier.h */
diff --git a/src/include/gnunet_core_testing_lib.h b/src/include/gnunet_testing_core_lib.h
index bf6f416d9..cf96b395d 100644
--- a/src/include/gnunet_core_testing_lib.h
+++ b/src/include/gnunet_testing_core_lib.h
@@ -22,12 +22,12 @@
  * @brief API for cmds working with core sub system provided by libgnunetcoretesting
  * @author t3sserakt
  */
-#ifndef GNUNET_CORE_TESTING_LIB_H
-#define GNUNET_CORE_TESTING_LIB_H
+#ifndef GNUNET_TESTING_CORE_LIB_H
+#define GNUNET_TESTING_CORE_LIB_H
 
 
 #include "gnunet_util_lib.h"
-#include "gnunet_testing_ng_lib.h"
+#include "gnunet_testing_lib.h"
 
 
 /**
@@ -149,10 +149,11 @@ GNUNET_CORE_cmd_connect_peers (
  * Call #op on all simple traits.
  */
 #define GNUNET_CORE_TESTING_SIMPLE_TRAITS(op, prefix)   \
-  op (prefix, connect_peer_state, const struct GNUNET_TESTING_ConnectPeersState) 
-
-GNUNET_CORE_TESTING_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_DECL_SIMPLE_TRAIT, GNUNET_CORE_TESTING)
+        op (prefix, connect_peer_state, const struct \
+            GNUNET_TESTING_ConnectPeersState)
 
+GNUNET_CORE_TESTING_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_DECL_SIMPLE_TRAIT,
+                                   GNUNET_CORE_TESTING)
 
 
 #endif
diff --git a/src/include/gnunet_testing_lib.h b/src/include/gnunet_testing_lib.h
index 0d74de8c2..95961b640 100644
--- a/src/include/gnunet_testing_lib.h
+++ b/src/include/gnunet_testing_lib.h
@@ -1,6 +1,6 @@
 /*
       This file is part of GNUnet
-      Copyright (C) 2008, 2009, 2012 GNUnet e.V.
+      Copyright (C) 2021, 2023, 2024 GNUnet e.V.
 
       GNUnet is free software: you can redistribute it and/or modify it
       under the terms of the GNU Affero General Public License as published
@@ -19,445 +19,959 @@
  */
 
 /**
- * @addtogroup Testing
- * @{
- *
- * @author Christian Grothoff
- *
- * @file
- * Convenience API for writing testcases for GNUnet
+ * @brief Central interpreter and command loop for writing an interpreter to test asynchronous systems
+ * @author Christian Grothoff <christian@grothoff.org>
+ * @author Marcello Stanisci
+ * @author t3sserakt
+ */
+#ifndef GNUNET_TESTING_LIB_H
+#define GNUNET_TESTING_LIB_H
+
+#include "gnunet_util_lib.h"
+
+/**
+ * Maximum length of label in command
+ */
+#define GNUNET_TESTING_CMD_MAX_LABEL_LENGTH 127
+
+/* ********************* Helper functions ********************* */
+
+/**
+ * Print failing line number and trigger shutdown.  Useful
+ * quite any time after the command "run" method has been called.
+ * Returns from the current function.
+ */
+#define GNUNET_TESTING_FAIL(is)                 \
+        do {                                    \
+          GNUNET_break (0);                     \
+          GNUNET_TESTING_interpreter_fail (is); \
+          return;                               \
+        } while (0)
+
+
+/**
+ * Log an error message about a command not having run to completion.
  *
- * @defgroup testing  Testing library
- * Library for writing testcases for GNUnet.
+ * @param is interpreter
+ * @param label command label of the incomplete command
+ */
+#define GNUNET_TESTING_command_incomplete(is,label)                       \
+        do {                                                              \
+          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,                            \
+                      "Command %s (%s:%u) did not complete (at %s)\n",    \
+                      label,                                              \
+                      __FILE__,                                           \
+                      __LINE__,                                           \
+                      GNUNET_TESTING_interpreter_current_cmd_get_label (is)); \
+        } while (0)
+
+
+/* ******************* Generic interpreter logic ************ */
+
+/**
+ * Global state of the interpreter, used by a command
+ * to access information about other commands.
+ */
+struct GNUNET_TESTING_Interpreter;
+
+/**
+ * State each asynchronous command must have in its closure.
+ */
+struct GNUNET_TESTING_AsyncContext
+{
+
+  /**
+   * Interpreter we are part of.  Initialized when
+   * the global interpreter starts.
+   */
+  struct GNUNET_TESTING_Interpreter *is;
+
+  /**
+   * Function to call when async operation is done.
+   */
+  GNUNET_SCHEDULER_TaskCallback notify_finished;
+
+  /**
+   * Closure for @e notify_finished.
+   */
+  void *notify_finished_cls;
+
+  /**
+   * Indication if the command finished (#GNUNET_OK).
+   * #GNUNET_NO if it did not finish,
+   * #GNUNET_SYSERR if it failed.
+   */
+  enum GNUNET_GenericReturnValue finished;
+
+  /**
+   * Set to true if interpreter_next() has already been
+   * called for this command.
+   */
+  bool next_called;
+};
+
+
+/**
+ * The asynchronous command of @a ac has failed.
  *
- * It can start/stop one or more peers on a system; testing is responsible for
- * managing private keys, ports and paths; it is a low-level library that does
- * not support higher-level functions such as P2P connection, topology
- * management or distributed testbed maintenance (those are provided by the
- * [Testbed service](@ref testbed))
+ * @param ac command-specific context
+ */
+void
+GNUNET_TESTING_async_fail (
+  struct GNUNET_TESTING_AsyncContext *ac);
+
+
+/**
+ * The asynchronous command of @a ac has finished.
  *
- * @see [Documentation](https://gnunet.org/writing_testcases)
+ * @param ac command-specific context
+ */
+void
+GNUNET_TESTING_async_finish (
+  struct GNUNET_TESTING_AsyncContext *ac);
+
+
+/**
+ * Signature of a function used to start executing a command of a test.  Runs
+ * the command.  Note that upon return, the interpreter will not automatically
+ * run the next command if this is an asynchronous command unless the command
+ * was wrapped in #GNUNET_TESTING_cmd_make_unblocking(), as the command may
+ * then continue asynchronously in other scheduler tasks.  In this case,
+ * #GNUNET_TESTING_async_finish() must be called to run the next task.
  *
- * @{
+ * @param cls closure
+ * @param is interpreter running the command
  */
+typedef void
+(*GNUNET_TESTING_CommandRunRoutine)(
+  void *cls,
+  struct GNUNET_TESTING_Interpreter *is);
 
-#ifndef GNUNET_TESTING_LIB_H
-#define GNUNET_TESTING_LIB_H
 
+/**
+ * Signature of a function used to clean up resources allocated
+ * by a command.
+ *
+ * @param cls closure
+ */
+typedef void
+(*GNUNET_TESTING_CommandCleanupRoutine)(void *cls);
 
-#include "gnunet_util_lib.h"
-#include "gnunet_statistics_service.h"
-#include "gnunet_arm_service.h"
 
-#ifdef __cplusplus
-extern "C"
-{
-#if 0                           /* keep Emacsens' auto-indent happy */
-}
-#endif
-#endif
+/**
+ * Signature of a function used to extract traits exposed by a
+ * command.
+ *
+ * @param cls closure
+ * @param[out] ret where to return the trait data
+ * @param trait name of the trait to return
+ * @param index index of the trait (for traits that are indexed)
+ * @return #GNUNET_OK on success
+ */
+typedef enum GNUNET_GenericReturnValue
+(*GNUNET_TESTING_CommandGetTraits) (void *cls,
+                                    const void **ret,
+                                    const char *trait,
+                                    unsigned int index);
 
 /**
- * Size of each hostkey in the hostkey file (in BYTES).
+ * Create a new command that may be asynchronous.
+ *
+ * @param cls the closure
+ * @param label the Label. Maximum length is #GNUNET_TESTING_CMD_MAX_LABEL_LENGTH
+ * @param run the run routing
+ * @param cleanup the cleanup function
+ * @param traits the traits function (optional)
+ * @param ac the async context, NULL if command is always
+ *           synchronous
+ * @return the command the function cannot fail
  */
-#define GNUNET_TESTING_HOSTKEYFILESIZE sizeof(struct \
-                                              GNUNET_CRYPTO_EddsaPrivateKey)
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_command_new_ac (
+  void *cls,
+  const char *label,
+  GNUNET_TESTING_CommandRunRoutine run,
+  GNUNET_TESTING_CommandCleanupRoutine cleanup,
+  GNUNET_TESTING_CommandGetTraits traits,
+  struct GNUNET_TESTING_AsyncContext *ac);
+
 
 /**
- * The environmental variable, if set, that dictates where testing should place
- * generated peer configurations
+ * Create a new command
+ *
+ * @param cls the closure
+ * @param label the Label. Maximum length is #GNUNET_TESTING_CMD_MAX_LABEL_LENGTH
+ * @param run the run routing
+ * @param cleanup the cleanup function
+ * @param traits the traits function (optional)
+ * @return the command the function cannot fail
  */
-#define GNUNET_TESTING_PREFIX "GNUNET_TESTING_PREFIX"
+#define GNUNET_TESTING_command_new(cls,label,run,cleanup,traits) \
+        GNUNET_TESTING_command_new_ac (cls,label,run,cleanup,traits,NULL)
 
 
 /**
- * Handle for a system on which GNUnet peers are executed;
- * a system is used for reserving unique paths and ports.
+ * Structure with storage space for a label.
  */
-struct GNUNET_TESTING_System;
+struct GNUNET_TESTING_CommandLabel
+{
+  char value[GNUNET_TESTING_CMD_MAX_LABEL_LENGTH + 1];
+};
 
 
 /**
- * Handle for a GNUnet peer controlled by testing.
+ * Set @a label to @a value. Asserts that @a value is
+ * not longer than #GNUNET_TESTING_CMD_MAX_LABEL_LENGTH.
+ *
+ * @param[out] label label to initialize
+ * @param value value to store into @a label
  */
-struct GNUNET_TESTING_Peer;
+void
+GNUNET_TESTING_set_label (
+  struct GNUNET_TESTING_CommandLabel *label,
+  const char *value);
 
 
 /**
- * Specification of a service that is to be shared among peers
+ * A command to be run by the interpreter.
  */
-struct GNUNET_TESTING_SharedService
+struct GNUNET_TESTING_Command
 {
+
+  /**
+   * Label for the command.
+   */
+  struct GNUNET_TESTING_CommandLabel label;
+
+  /**
+   * Closure for all commands with command-specific context information.
+   */
+  void *cls;
+
+  /**
+   * Variable name for the command, NULL for none.
+   */
+  const char *name;
+
+  /**
+   * Runs the command.  Note that upon return, the interpreter
+   * will not automatically run the next command, as the command
+   * may continue asynchronously in other scheduler tasks.  Thus,
+   * the command must ensure to eventually call
+   * #GNUNET_TESTING_interpreter_next() or
+   * #GNUNET_TESTING_interpreter_fail().
+   *
+   * If this function creates some asynchronous activity, it should
+   * initialize @e finish to a function that can be used to wait for
+   * the asynchronous activity to terminate.
+   *
+   * @param cls closure
+   * @param is interpreter state
+   */
+  GNUNET_TESTING_CommandRunRoutine run;
+
+  /**
+   * Pointer to the asynchronous context in the command's
+   * closure. Used by the
+   * #GNUNET_TESTING_async_finish() and
+   * #GNUNET_TESTING_async_fail() functions.
+   *
+   * Must be NULL if a command is synchronous.
+   */
+  struct GNUNET_TESTING_AsyncContext *ac;
+
   /**
-   * The name of the service.
+   * Clean up after the command.  Run during forced termination
+   * (CTRL-C) or test failure or test success.
+   *
+   * @param cls closure
    */
-  const char *service;
+  GNUNET_TESTING_CommandCleanupRoutine cleanup;
 
   /**
-   * The configuration template for the service.  Cannot be NULL
+   * Extract information from a command that is useful for other
+   * commands. Can be NULL if a command has no traits.
+   *
+   * @param cls closure
+   * @param[out] ret result (could be anything)
+   * @param trait name of the trait
+   * @param index index number of the object to extract.
+   * @return #GNUNET_OK on success,
+   *         #GNUNET_NO if no trait was found
    */
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
+  GNUNET_TESTING_CommandGetTraits traits;
 
   /**
-   * The number of peers which share an instance of the service.  0 for sharing
-   * among all peers
+   * When did the execution of this command start?
    */
-  unsigned int share;
+  struct GNUNET_TIME_Absolute start_time;
+
+  /**
+   * When did the execution of this command finish?
+   */
+  struct GNUNET_TIME_Absolute finish_time;
+
+  /**
+   * When did we start the last run of this command?  Delta to @e finish_time
+   * gives the latency for the last successful run.  Useful in case @e
+   * num_tries was positive and the command was run multiple times.  In that
+   * case, the @e start_time gives the time when we first tried to run the
+   * command, so the difference between @e start_time and @e finish_time would
+   * be the time all of the @e num_tries took, while the delta to @e
+   * last_req_time is the time the last (successful) execution took.
+   */
+  struct GNUNET_TIME_Absolute last_req_time;
+
+  /**
+   * How often did we try to execute this command? (In case it is a request
+   * that is repated.)  Note that a command must have some built-in retry
+   * mechanism for this value to be useful.
+   */
+  unsigned int num_tries;
+
+  /**
+   * If "true", the interpreter should not immediately run the next command,
+   * even if this command did not complete via #GNUNET_TESTING_async_finish().
+   * Otherwise, #GNUNET_TESTING_cmd_finish() must be used to ensure that a
+   * command actually completed.
+   */
+  bool asynchronous_finish;
+
 };
 
 
 /**
- * Create a system handle.  There must only be one system handle per operating
- * system.  Uses a default range for allowed ports.  Ports are still tested for
- * availability.
- *
- * @param testdir only the directory name without any path. This is used for all
- *          service homes; the directory will be created in a temporary location
- *          depending on the underlying OS.  This variable will be
- *          overridden with the value of the environmental variable
- *          GNUNET_TESTING_PREFIX, if it exists.
- * @param trusted_ip the ip address which will be set as TRUSTED HOST in all
- *          service configurations generated to allow control connections from
- *          this ip. This can either be a single ip address or a network address
- *          in CIDR notation.
- * @param hostname the hostname of the system we are using for testing; NULL for
- *          localhost
- * @param shared_services NULL terminated array describing services that are to
- *          be shared among peers
- * @return handle to this system, NULL on error
- */
-struct GNUNET_TESTING_System *
-GNUNET_TESTING_system_create (const char *testdir,
-                              const char *trusted_ip,
-                              const char *hostname,
-                              const struct GNUNET_TESTING_SharedService *
-                              shared_services);
-
-
-/**
- * Create a system handle.  There must only be one system
- * handle per operating system.  Use this function directly
- * if multiple system objects are created for the same host
- * (only really useful when testing --- or to make the port
- * range configurable).
- *
- * @param testdir only the directory name without any path. This is used for
- *          all service homes; the directory will be created in a temporary
- *          location depending on the underlying OS.  This variable will be
- *          overridden with the value of the environmental variable
- *          GNUNET_TESTING_PREFIX, if it exists.
- * @param trusted_ip the ip address which will be set as TRUSTED HOST in all
- *          service configurations generated to allow control connections from
- *          this ip. This can either be a single ip address or a network address
- *          in CIDR notation.
- * @param hostname the hostname of the system we are using for testing; NULL for
- *          localhost
- * @param shared_services NULL terminated array describing services that are to
- *          be shared among peers
- * @param lowport lowest port number this system is allowed to allocate (inclusive)
- * @param highport highest port number this system is allowed to allocate (exclusive)
- * @return handle to this system, NULL on error
- */
-struct GNUNET_TESTING_System *
-GNUNET_TESTING_system_create_with_portrange (const char *testdir,
-                                             const char *trusted_ip,
-                                             const char *hostname,
-                                             const struct
-                                             GNUNET_TESTING_SharedService *
-                                             shared_services,
-                                             uint16_t lowport,
-                                             uint16_t highport);
-
-
-/**
- * Free system resources.
- *
- * @param system system to be freed
- * @param remove_paths should the 'testdir' and all subdirectories
- *        be removed (clean up on shutdown)?
+ * Lookup command by label.
+ *
+ * @param is interpreter to lookup command in
+ * @param label label of the command to lookup.
+ * @return the command, if it is found, or NULL.
+ */
+const struct GNUNET_TESTING_Command *
+GNUNET_TESTING_interpreter_lookup_command (
+  struct GNUNET_TESTING_Interpreter *is,
+  const char *label);
+
+
+/**
+ * Get command from hash map by variable name.
+ *
+ * @param is interpreter state.
+ * @param name name of the variable to get command by
+ * @return the command, if it is found, or NULL.
+ */
+const struct GNUNET_TESTING_Command *
+GNUNET_TESTING_interpreter_get_command (
+  struct GNUNET_TESTING_Interpreter *is,
+  const char *name);
+
+
+/**
+ * Update the last request time of the current command
+ * to the current time.
+ *
+ * @param[in,out] is interpreter state where to show
+ *       that we are doing something
  */
 void
-GNUNET_TESTING_system_destroy (struct GNUNET_TESTING_System *system,
-                               int remove_paths);
+GNUNET_TESTING_interpreter_current_cmd_touch (
+  struct GNUNET_TESTING_Interpreter *is);
 
 
 /**
- * Testing includes a number of pre-created hostkeys for
- * faster peer startup.  This function can be used to
- * access the n-th key of those pre-created hostkeys; note
- * that these keys are ONLY useful for testing and not
- * secure as the private keys are part of the public
- * GNUnet source code.
+ * Increment the 'num_tries' counter for the current command.
  *
- * This is primarily a helper function used internally
- * by #GNUNET_TESTING_peer_configure().
+ * @param[in,out] is interpreter state where to
+ *   increment the counter
+ */
+void
+GNUNET_TESTING_interpreter_current_cmd_inc_tries (
+  struct GNUNET_TESTING_Interpreter *is);
+
+
+/**
+ * Obtain label of the command being now run.
  *
- * @param system the testing system handle
- * @param key_number desired pre-created hostkey to obtain
- * @param id set to the peer's identity (hash of the public
- *        key; if NULL, #GNUNET_SYSERR is returned immediately
- * @return NULL on error (not enough keys)
+ * @param is interpreter state.
+ * @return the label.
  */
-struct GNUNET_CRYPTO_EddsaPrivateKey *
-GNUNET_TESTING_hostkey_get (const struct GNUNET_TESTING_System *system,
-                            uint32_t key_number,
-                            struct GNUNET_PeerIdentity *id);
+const char *
+GNUNET_TESTING_interpreter_current_cmd_get_label (
+  struct GNUNET_TESTING_Interpreter *is);
 
 
 /**
- * Reserve a port for a peer.
+ * Current command failed, clean up and fail the test case.
  *
- * @param system system to use for reservation tracking
- * @return 0 if no free port was available
+ * @param is interpreter state.
  */
-uint16_t
-GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system);
+void
+GNUNET_TESTING_interpreter_fail (
+  struct GNUNET_TESTING_Interpreter *is);
 
 
 /**
- * Release reservation of a TCP or UDP port for a peer
- * (used during GNUNET_TESTING_peer_destroy).
+ * Skips the current test, the environment is
+ * not prepared correctly.
  *
- * @param system system to use for reservation tracking
- * @param port reserved port to release
+ * @param is interpreter state.
  */
 void
-GNUNET_TESTING_release_port (struct GNUNET_TESTING_System *system,
-                             uint16_t port);
+GNUNET_TESTING_interpreter_skip (
+  struct GNUNET_TESTING_Interpreter *is);
 
 
 /**
- * Create a new configuration using the given configuration as a template;
- * ports and paths will be modified to select available ports on the local
- * system. The default configuration will be available in PATHS section under
- * the option DEFAULTCONFIG after the call. SERVICE_HOME is also set in PATHS
- * section to the temporary directory specific to this configuration. If we run
- * out of "*port" numbers, return #GNUNET_SYSERR.
+ * Callback over commands of an interpreter.
  *
- * This is primarily a helper function used internally
- * by #GNUNET_TESTING_peer_configure().
+ * @param cls closure
+ * @param cmd a command to process
+ */
+typedef void
+(*GNUNET_TESTING_CommandIterator)(
+  void *cls,
+  const struct GNUNET_TESTING_Command *cmd);
+
+
+/**
+ * Iterates over all of the top-level commands of an
+ * interpreter.
  *
- * @param system system to use to coordinate resource usage
- * @param cfg template configuration to update
- * @return #GNUNET_OK on success,
- *         #GNUNET_SYSERR on error - the configuration will
- *           be incomplete and should not be used there upon
+ * @param[in] is interpreter to iterate over
+ * @param asc true in execution order, false for reverse execution order
+ * @param cb function to call on each command
+ * @param cb_cls closure for cb
  */
-int
-GNUNET_TESTING_configuration_create (struct GNUNET_TESTING_System *system,
-                                     struct GNUNET_CONFIGURATION_Handle *cfg);
+void
+GNUNET_TESTING_interpreter_commands_iterate (
+  struct GNUNET_TESTING_Interpreter *is,
+  bool asc,
+  GNUNET_TESTING_CommandIterator cb,
+  void *cb_cls);
 
-// FIXME: add dual to 'release' ports again...
+
+/* ************** Fundamental interpreter commands ************ */
 
 
 /**
- * Configure a GNUnet peer.  GNUnet must be installed on the local
- * system and available in the PATH.
+ * Create command array terminator.
  *
- * @param system system to use to coordinate resource usage
- * @param cfg configuration to use; will be UPDATED (to reflect needed
- *            changes in port numbers and paths)
- * @param key_number number of the hostkey to use for the peer
- * @param id identifier for the daemon, will be set, can be NULL
- * @param emsg set to freshly allocated error message (set to NULL on success),
- *          can be NULL
- * @return handle to the peer, NULL on error
+ * @return a end-command.
  */
-struct GNUNET_TESTING_Peer *
-GNUNET_TESTING_peer_configure (struct GNUNET_TESTING_System *system,
-                               struct GNUNET_CONFIGURATION_Handle *cfg,
-                               uint32_t key_number,
-                               struct GNUNET_PeerIdentity *id,
-                               char **emsg);
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_end (void);
 
 
 /**
- * Obtain the peer identity from a peer handle.
+ * Create a "batch" command.  Such command takes a end_CMD-terminated array of
+ * CMDs and executed them.  Once it hits the end CMD, it passes the control to
+ * the next top-level CMD, regardless of it being another batch or ordinary
+ * CMD.
  *
- * @param peer peer handle for which we want the peer's identity
- * @param id identifier for the daemon, will be set
+ * @param label the command label.
+ * @param batch array of CMDs to execute.
+ * @return the command.
  */
-void
-GNUNET_TESTING_peer_get_identity (struct GNUNET_TESTING_Peer *peer,
-                                  struct GNUNET_PeerIdentity *id);
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_batch (
+  const char *label,
+  struct GNUNET_TESTING_Command *batch);
+
+
+/**
+ * Performance counter.
+ */
+struct GNUNET_TESTING_Timer
+{
+  /**
+   * For which type of commands.
+   */
+  const char *prefix;
+
+  /**
+   * Total time spend in all commands of this type.
+   */
+  struct GNUNET_TIME_Relative total_duration;
+
+  /**
+   * Total time spend waiting for the *successful* exeuction
+   * in all commands of this type.
+   */
+  struct GNUNET_TIME_Relative success_latency;
+
+  /**
+   * Number of commands summed up.
+   */
+  unsigned int num_commands;
 
+  /**
+   * Number of retries summed up.
+   */
+  unsigned int num_retries;
+};
 
 /**
- * Start the peer.
+ * Obtain performance data from the interpreter.
  *
- * @param peer peer to start
- * @return #GNUNET_OK on success,
- *         #GNUNET_SYSERR on error (i.e. peer already running)
+ * @param label command label.
+ * @param[in,out] timers NULL-prefix terminated array that specifies what commands (by label) to obtain runtimes for
+ * @return the command
  */
-int
-GNUNET_TESTING_peer_start (struct GNUNET_TESTING_Peer *peer);
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_stat (
+  const char *label,
+  struct GNUNET_TESTING_Timer *timers);
 
 
 /**
- * Stop the peer. This call is blocking as it kills the peer's main ARM process
- * by sending a SIGTERM and waits on it.  For asynchronous shutdown of peer, see
- * GNUNET_TESTING_peer_stop_async().
+ * Set variable to command as side-effect of
+ * running a command.
  *
- * @param peer peer to stop
- * @return #GNUNET_OK on success,
- *         #GNUNET_SYSERR on error (i.e. peer not running)
+ * @param name name of the variable to set
+ * @param cmd command to set to variable when run
+ * @return modified command
  */
-int
-GNUNET_TESTING_peer_stop (struct GNUNET_TESTING_Peer *peer);
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_set_var (
+  const char *name,
+  struct GNUNET_TESTING_Command cmd);
 
 
 /**
- * Destroy the peer.  Releases resources locked during peer configuration.
- * If the peer is still running, it will be stopped AND a warning will be
- * printed (users of the API should stop the peer explicitly first).
+ * Command to create a barrier.
  *
- * @param peer peer to destroy
+ * @param label The label of this command.
+ * @param number_to_be_reached If this number of processes reached
+ *                             this barrier, all processes waiting at
+ *                             this barrier can pass it.
  */
-void
-GNUNET_TESTING_peer_destroy (struct GNUNET_TESTING_Peer *peer);
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_barrier_create (
+  const char *label,
+  unsigned int number_to_be_reached);
 
 
 /**
- * Sends SIGTERM to the peer's main process
+ * If this command is executed the the process is signaling the master process
+ * that it reached a barrier. If this command is synchronous it will block.
  *
- * @param peer the handle to the peer
- * @return #GNUNET_OK if successful; #GNUNET_SYSERR if the main process is NULL
- *           or upon any error while sending SIGTERM
+ * @param label name for command.
+ * @param barrier_label The name of the barrier we waited for and which was reached.
+ * @return command.
  */
-int
-GNUNET_TESTING_peer_kill (struct GNUNET_TESTING_Peer *peer);
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_barrier_reached (
+  const char *label,
+  const char *barrier_label);
+
 
+#define GNUNET_TESTING_NETJAIL_START_SCRIPT "netjail_start_new.sh"
+
+#define GNUNET_TESTING_NETJAIL_STOP_SCRIPT "netjail_stop.sh"
 
 /**
- * Waits for a peer to terminate. The peer's main process will also be destroyed.
+ * Create command.
  *
- * @param peer the handle to the peer
- * @return #GNUNET_OK if successful; #GNUNET_SYSERR if the main process is NULL
- *           or upon any error while waiting
+ * @param label Name for the command.
+ * @param topology_data topology data
+ * @param timeout Before this timeout is reached this cmd MUST finish.
+ * @return command.
  */
-int
-GNUNET_TESTING_peer_wait (struct GNUNET_TESTING_Peer *peer);
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_netjail_start_helpers (
+  const char *label,
+  const char *topology_cmd_label,
+  struct GNUNET_TIME_Relative timeout);
 
 
 /**
- * Callback to inform whether the peer is running or stopped.
+ * This command executes a shell script to setup the netjail environment.
  *
- * @param cls the closure given to GNUNET_TESTING_peer_stop_async()
- * @param peer the respective peer whose status is being reported
- * @param success #GNUNET_YES if the peer is stopped; #GNUNET_SYSERR upon any
- *          error
+ * @param label name for command.
+ * @param script which script to run, e.g. #GNUNET_TESTING_NETJAIL_START_SCRIPT
+ * @param topology_config Configuration file for the test topology.
+ * @param read_file Flag indicating if the the name of the topology file is send to the helper, or a string with the topology data.
+ * @return command.
  */
-typedef void
-(*GNUNET_TESTING_PeerStopCallback) (void *cls,
-                                    struct GNUNET_TESTING_Peer *peer,
-                                    int success);
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_netjail_setup (
+  const char *label,
+  const char *script,
+  const char *topology_cmd_label);
+
+
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_load_topology_from_file (
+  const char *label,
+  const char *filename);
+
+
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_load_topology_from_string (
+  const char *label,
+  const char *topology_data);
 
 
 /**
- * Stop a peer asynchronously using ARM API.  Peer's shutdown is signaled
- * through the GNUNET_TESTING_PeerStopCallback().
+ * Turn asynchronous command into non-blocking command by setting
+ * asynchronous_finish to true.  Modifies (and then returns) @a cmd simply
+ * setting the bit. By default, most commands are blocking, and by wrapping
+ * the command construction in this function a blocking command can be turned
+ * into an asynchronous command where the interpreter continues after
+ * initiating the asynchronous action. Does nothing if the command is
+ * fundamentally synchronous.
  *
- * @param peer the peer to stop
- * @param cb the callback to signal peer shutdown
- * @param cb_cls closure for the @a cb
- * @return #GNUNET_OK upon successfully giving the request to the ARM API (this
- *           does not mean that the peer is successfully stopped); #GNUNET_SYSERR
- *           upon any error.
+ * @param[in,out] cmd command to make non-blocking
+ * @return a finish-command.
  */
-int
-GNUNET_TESTING_peer_stop_async (struct GNUNET_TESTING_Peer *peer,
-                                GNUNET_TESTING_PeerStopCallback cb,
-                                void *cb_cls);
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_make_unblocking (
+  struct GNUNET_TESTING_Command cmd);
 
 
 /**
- * Cancel a previous asynchronous peer stop request.
- * GNUNET_TESTING_peer_stop_async() should have been called before on the given
- * peer.  It is an error to call this function if the peer stop callback was
- * already called
+ * Create (synchronous) command that waits for another command to finish.
+ * If @a cmd_ref did not finish after @a timeout, this command will fail
+ * the test case.
  *
- * @param peer the peer on which GNUNET_TESTING_peer_stop_async() was called
- *          before.
+ * @param finish_label label for this command
+ * @param cmd_ref reference to a previous command which we should
+ *        wait for (call `finish()` on)
+ * @param timeout how long to wait at most for @a cmd_ref to finish
+ * @return a finish-command.
  */
-void
-GNUNET_TESTING_peer_stop_async_cancel (struct GNUNET_TESTING_Peer *peer);
+const struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_finish (
+  const char *finish_label,
+  const char *cmd_ref,
+  struct GNUNET_TIME_Relative timeout);
+
+
+/**
+ * Create a "signal" CMD.
+ *
+ * @param label command label.
+ * @param process_label label of a command that has a process trait
+ * @param signal signal to send to @a process.
+ * @return the command.
+ */
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_signal (
+  const char *label,
+  const char *process_label,
+  int signal);
+
+
+/**
+ * Sleep for @a duration.
+ *
+ * @param label command label.
+ * @param duration time to sleep
+ * @return the command.
+ */
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_sleep (
+  const char *label,
+  struct GNUNET_TIME_Relative duration);
+
+
+/**
+ * Command to execute a command.
+ *
+ * @param label Label of the command.
+*/
+const struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_exec (
+  const char *label,
+  enum GNUNET_OS_ProcessStatusType expected_type,
+  unsigned long int expected_exit_code,
+  char *const script_argv[]);
+
+
+/**
+ * Command to execute a command.
+ *
+ * @param label Label of the command.
+*/
+const struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_exec_va (
+  const char *label,
+  enum GNUNET_OS_ProcessStatusType expected_type,
+  unsigned long int expected_exit_code,
+  ...);
 
 
 /**
- * Signature of the 'main' function for a (single-peer) testcase that
- * is run using #GNUNET_TESTING_peer_run().
+ * Make the instruction pointer point to @a target_label
+ * only if @a counter is greater than zero.  Note that
+ * the command that will be executed next in this case
+ * is the one AFTER @a target_label, as the command we
+ * jump to is skipped by the advancing IP after the
+ * rewind.
+ *
+ * @param label command label
+ * @param target_label label of the new instruction pointer's destination after the jump;
+ *                     must be before the current instruction (and the command at the @a target_label itself will not be run, but the one afterwards)
+ * @param counter counts how many times the rewinding is to happen.
+ */
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_rewind_ip (
+  const char *label,
+  const char *target_label,
+  unsigned int counter);
+
+
+/* ***************** main loop logic ************* */
+
+/**
+ * Function called with the final result of the test.
  *
  * @param cls closure
- * @param cfg configuration of the peer that was started
- * @param peer identity of the peer that was created
+ * @param rv #GNUNET_OK if the test passed
  */
 typedef void
-(*GNUNET_TESTING_TestMain) (void *cls,
-                            const struct GNUNET_CONFIGURATION_Handle *cfg,
-                            struct GNUNET_TESTING_Peer *peer);
+(*GNUNET_TESTING_ResultCallback)(
+  void *cls,
+  enum GNUNET_GenericReturnValue rv);
 
 
 /**
- * Start a single peer and run a test using the testing library.
- * Starts a peer using the given configuration and then invokes the
- * given callback.  This function ALSO initializes the scheduler loop
- * and should thus be called directly from "main".  The testcase
- * should self-terminate by invoking #GNUNET_SCHEDULER_shutdown().
+ * Run the testsuite.  Note, CMDs are copied into the interpreter state
+ * because they are _usually_ defined into the "run" method that returns after
+ * having scheduled the test interpreter.
  *
- * @param testdir only the directory name without any path. This is used for
- *          all service homes; the directory will be created in a temporary
- *          location depending on the underlying OS
- * @param cfgfilename name of the configuration file to use;
- *         use NULL to only run with defaults
- * @param tm main function of the testcase
- * @param tm_cls closure for @a tm
- * @return 0 on success, 1 on error
+ * @param commands the array of command to execute
+ * @param timeout how long to wait for each command to execute
+ * @param rc function to call with the final result
+ * @param rc_cls closure for @a rc
+ * @return The interpreter.
  */
-int
-GNUNET_TESTING_peer_run (const char *testdir,
-                         const char *cfgfilename,
-                         GNUNET_TESTING_TestMain tm,
-                         void *tm_cls);
+struct GNUNET_TESTING_Interpreter *
+GNUNET_TESTING_run (
+  const struct GNUNET_TESTING_Command *commands,
+  struct GNUNET_TIME_Relative timeout,
+  GNUNET_TESTING_ResultCallback rc,
+  void *rc_cls);
 
 
 /**
- * Start a single service (no ARM, except of course if the given
- * service name is 'arm') and run a test using the testing library.
- * Starts a service using the given configuration and then invokes the
- * given callback.  This function ALSO initializes the scheduler loop
- * and should thus be called directly from "main".  The testcase
- * should self-terminate by invoking #GNUNET_SCHEDULER_shutdown().
+ * Start a GNUnet scheduler event loop and run the testsuite.  Return 0 upon
+ * success.  Expected to be called directly from main().
  *
- * This function is useful if the testcase is for a single service
- * and if that service doesn't itself depend on other services.
- *
- * @param testdir only the directory name without any path. This is used for
- *          all service homes; the directory will be created in a temporary
- *          location depending on the underlying OS
- * @param service_name name of the service to run
- * @param cfgfilename name of the configuration file to use;
- *         use NULL to only run with defaults
- * @param tm main function of the testcase
- * @param tm_cls closure for @a tm
- * @return 0 on success, 1 on error
+ * @param commands the list of command to execute
+ * @param timeout how long to wait for each command to execute
+ * @return EXIT_SUCCESS on success, EXIT_FAILURE on failure
  */
 int
-GNUNET_TESTING_service_run (const char *testdir,
-                            const char *service_name,
-                            const char *cfgfilename,
-                            GNUNET_TESTING_TestMain tm,
-                            void *tm_cls);
+GNUNET_TESTING_main (
+  const struct GNUNET_TESTING_Command *commands,
+  struct GNUNET_TIME_Relative timeout);
+
+
+/* ***************** plugin logic ************* */
+
+
+/**
+ * The plugin API every test case plugin has to implement.
+ */
+struct GNUNET_TESTING_PluginFunctions;
+
+
+struct GNUNET_TESTING_PluginFunctions *
+GNUNET_TESTING_make_plugin (
+  const struct GNUNET_TESTING_Command *commands);
+
+#define GNUNET_TESTING_MAKE_PLUGIN(prefix,name,...)            \
+        void *                                                 \
+        prefix ## _plugin_ ## name ## _init (void *cls) { \
+          const char *my_node_id = cls; (void) my_node_id;     \
+          struct GNUNET_TESTING_Command commands[] = {         \
+            __VA_ARGS__,                                       \
+            GNUNET_TESTING_cmd_end ()                          \
+          };                                                   \
+          return GNUNET_TESTING_make_plugin (commands);        \
+        }                                                      \
+        void *                                                 \
+        prefix ## _plugin_ ## name ## _done (void *cls) {      \
+          struct GNUNET_TESTING_PluginFunctions *api = cls;    \
+          GNUNET_free (api);                                   \
+          return NULL;                                         \
+        }
 
 
-#if 0                           /* keep Emacsens' auto-indent happy */
+/* *** Generic trait logic for implementing traits ********* */
+
+/**
+ * A `struct GNUNET_TESTING_Trait` can be used to exchange data between cmds.
+ *
+ * Therefor the cmd which like to provide data to other cmds has to implement
+ * the trait function, where an array of traits is defined with the help of
+ * the #GNUNET_TESTING_make_trait_ macro. The data can be retrieved with the
+ * help of the #GNUNET_TESTING_get_trait_ macro. Traits name and type must be
+ * defined to make use of the macros.
+ */
+struct GNUNET_TESTING_Trait
 {
-#endif
-#ifdef __cplusplus
-}
-#endif
+  /**
+   * Index number associated with the trait.  This gives the
+   * possibility to have _multiple_ traits on offer under the
+   * same name.
+   */
+  unsigned int index;
+
+  /**
+   * Trait type, for example "reserve-pub" or "coin-priv".
+   */
+  const char *trait_name;
+
+  /**
+   * Pointer to the piece of data to offer.
+   */
+  const void *ptr;
+};
 
-#endif
 
-/** @} */  /* end of group */
+/**
+ * "end" of traits array.  Because traits are offered into arrays, this type
+ * of trait is used to mark the end of such arrays; useful when iterating over
+ * those.
+ */
+struct GNUNET_TESTING_Trait
+GNUNET_TESTING_trait_end (void);
 
-/** @} */ /* end of group addition */
+
+/**
+ * Obtain value of a trait from a command.
+ *
+ * @param traits the array of all the traits.
+ * @param[out] ret where to store the result.
+ * @param trait type of the trait to extract.
+ * @param index index number of the trait to extract.
+ * @return #GNUNET_OK when the trait is found.
+ */
+enum GNUNET_GenericReturnValue
+GNUNET_TESTING_get_trait (
+  const struct GNUNET_TESTING_Trait *traits,
+  const void **ret,
+  const char *trait,
+  unsigned int index);
+
+
+/**
+ * Create headers for a trait with name @a name for
+ * statically allocated data of type @a type.
+ *
+ * @param prefix symbol prefix to use
+ * @param name name of the trait
+ * @param type data type for the trait
+ */
+#define GNUNET_TESTING_MAKE_DECL_SIMPLE_TRAIT(prefix,name,type)  \
+        enum GNUNET_GenericReturnValue                           \
+        prefix ## _get_trait_ ## name (                          \
+          const struct GNUNET_TESTING_Command *cmd,              \
+          type * *ret);                                          \
+        struct GNUNET_TESTING_Trait                              \
+        prefix ## _make_trait_ ## name (                         \
+          type * value);
+
+
+/**
+ * Create C implementation for a trait with name @a name for statically
+ * allocated data of type @a type.
+ *
+ * @param prefix symbol prefix to use
+ * @param name name of the trait
+ * @param type data type for the trait
+ */
+#define GNUNET_TESTING_MAKE_IMPL_SIMPLE_TRAIT(prefix,name,type) \
+        enum GNUNET_GenericReturnValue                          \
+        prefix ## _get_trait_ ## name (                         \
+          const struct GNUNET_TESTING_Command *cmd,             \
+          type * *ret)                                          \
+        {                                                       \
+          if (NULL == cmd->traits) return GNUNET_SYSERR;        \
+          return cmd->traits (cmd->cls,                         \
+                              (const void **) ret,              \
+                              GNUNET_S (name),                  \
+                              0);                               \
+        }                                                       \
+        struct GNUNET_TESTING_Trait                             \
+        prefix ## _make_trait_ ## name (                        \
+          type * value)                                         \
+        {                                                       \
+          struct GNUNET_TESTING_Trait ret = {                   \
+            .trait_name = GNUNET_S (name),                      \
+            .ptr = (const void *) value                         \
+          };                                                    \
+          return ret;                                           \
+        }
+
+
+/**
+ * Create headers for a trait with name @a name for
+ * statically allocated data of type @a type.
+ *
+ * @param prefix symbol prefix to use
+ * @param name name of the trait
+ * @param type data type for the trait
+ */
+#define GNUNET_TESTING_MAKE_DECL_INDEXED_TRAIT(prefix,name,type) \
+        enum GNUNET_GenericReturnValue                           \
+        prefix ## _get_trait_ ## name (                          \
+          const struct GNUNET_TESTING_Command *cmd,              \
+          unsigned int index,                                    \
+          type * *ret);                                          \
+        struct GNUNET_TESTING_Trait                              \
+        prefix ## _make_trait_ ## name (                         \
+          unsigned int index,                                    \
+          type * value);
+
+
+/**
+ * Create C implementation for a trait with name @a name for statically
+ * allocated data of type @a type.
+ */
+#define GNUNET_TESTING_MAKE_IMPL_INDEXED_TRAIT(prefix,name,type)    \
+        enum GNUNET_GenericReturnValue                          \
+        prefix ## _get_trait_ ## name (                         \
+          const struct GNUNET_TESTING_Command *cmd,             \
+          unsigned int index,                                   \
+          type * *ret)                                          \
+        {                                                       \
+          if (NULL == cmd->traits) return GNUNET_SYSERR;        \
+          return cmd->traits (cmd->cls,                         \
+                              (const void **) ret,              \
+                              GNUNET_S (name),                  \
+                              index);                           \
+        }                                                       \
+        struct GNUNET_TESTING_Trait                             \
+        prefix ## _make_trait_ ## name (                        \
+          unsigned int index,                                   \
+          type * value)                                         \
+        {                                                       \
+          struct GNUNET_TESTING_Trait ret = {                   \
+            .index = index,                                     \
+            .trait_name = GNUNET_S (name),                      \
+            .ptr = (const void *) value                         \
+          };                                                    \
+          return ret;                                           \
+        }
+
+
+/**
+ * Call #op on all simple traits needed by testing core logic.
+ *
+ * @param op operation to perform
+ * @param prefix prefix to pass to @e op
+ */
+#define GNUNET_TESTING_SIMPLE_TRAITS(op,prefix)                  \
+        op (prefix, process, struct GNUNET_OS_Process *)         \
+        op (prefix, cmd, const struct GNUNET_TESTING_Command)    \
+        op (prefix, batch_cmds, struct GNUNET_TESTING_Command *)
+
+
+GNUNET_TESTING_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_DECL_SIMPLE_TRAIT,
+                              GNUNET_TESTING)
+
+
+#endif
diff --git a/src/include/gnunet_testing_loop_lib.h b/src/include/gnunet_testing_loop_lib.h
deleted file mode 100644
index 7e13edfab..000000000
--- a/src/include/gnunet_testing_loop_lib.h
+++ /dev/null
@@ -1,697 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2021, 2023 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @brief Central interpreter and command loop for writing an interpreter to test asynchronous systems
- * @author Christian Grothoff <christian@grothoff.org>
- * @author Marcello Stanisci
- * @author t3sserakt
- */
-#ifndef GNUNET_TESTING_LOOP_LIB_H
-#define GNUNET_TESTING_LOOP_LIB_H
-
-/**
- * Maximum length of label in command
- */
-#define GNUNET_TESTING_CMD_MAX_LABEL_LENGTH 127
-
-/* ********************* Helper functions ********************* */
-
-/**
- * Print failing line number and trigger shutdown.  Useful
- * quite any time after the command "run" method has been called.
- */
-#define GNUNET_TESTING_FAIL(is) \
-  do \
-  { \
-    GNUNET_break (0); \
-    GNUNET_TESTING_interpreter_fail (is); \
-    return; \
-  } while (0)
-
-
-/* ******************* Generic interpreter logic ************ */
-
-/**
- * Global state of the interpreter, used by a command
- * to access information about other commands.
- */
-struct GNUNET_TESTING_Interpreter;
-
-/**
- * State each asynchronous command must have in its closure.
- */
-struct GNUNET_TESTING_AsyncContext
-{
-
-  /**
-   * Interpreter we are part of.
-   */
-  struct GNUNET_TESTING_Interpreter *is; // FIXME: Why needed? When available?
-
-  /**
-   * Function to call when done.
-   */
-  GNUNET_SCHEDULER_TaskCallback cont;
-
-  /**
-   * Closure for @e cont.
-   */
-  void *cont_cls;
-
-  /**
-   * Indication if the command finished (#GNUNET_OK).
-   * #GNUNET_NO if it did not finish,
-   * #GNUNET_SYSERR if it failed.
-   */
-  enum GNUNET_GenericReturnValue finished;
-};
-
-
-/**
- * The asynchronous command of @a ac has failed.
- *
- * @param ac command-specific context
- */
-void
-GNUNET_TESTING_async_fail (struct GNUNET_TESTING_AsyncContext *ac);
-
-
-/**
- * The asynchronous command of @a ac has finished.
- *
- * @param ac command-specific context
- */
-void
-GNUNET_TESTING_async_finish (struct GNUNET_TESTING_AsyncContext *ac);
-
-
-/**
- * Signature of a function used to start executing a command
- * of a test.
- *
- * @param cls closure
- * @param is interpreter running the command
- */
-typedef void
-(*GNUNET_TESTING_CommandRunRoutine)(void *cls,
-                                    struct GNUNET_TESTING_Interpreter *is);
-
-
-/**
- * Signature of a function used to clean up resources allocated
- * by a command.
- *
- * @param cls closure
- */
-typedef void
-(*GNUNET_TESTING_CommandCleanupRoutine)(void *cls);
-
-
-/**
- * Signature of a function used to extract traits exposed by a
- * command.
- *
- * @param cls closure
- * @param[out] ret where to return the trait data
- * @param trait name of the trait to return
- * @param index index of the trait (for traits that are indexed)
- * @return #GNUNET_OK on success
- */
-typedef enum GNUNET_GenericReturnValue
-(*GNUNET_TESTING_CommandGetTraits) (void *cls,
-                                    const void **ret,
-                                    const char *trait,
-                                    unsigned int index);
-
-/**
- * Create a new command
- *
- * @param cls the closure
- * @param label the Label. Maximum length is GNUNET_TESTING_CMD_MAX_LABEL_LENGTH
- * @param run the run routing
- * @param cleanup the cleanup function
- * @param traits the traits function (optional)
- * @param the async context
- * @return the command the function cannot fail
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_command_new (void *cls,
-                            const char *label,
-                            GNUNET_TESTING_CommandRunRoutine run,
-                            GNUNET_TESTING_CommandCleanupRoutine cleanup,
-                            GNUNET_TESTING_CommandGetTraits traits,
-                            struct GNUNET_TESTING_AsyncContext *ac);
-
-
-/**
- * Structure with storage space for a label.
- */ 
-struct GNUNET_TESTING_CommandLabel
-{
-  char value[GNUNET_TESTING_CMD_MAX_LABEL_LENGTH + 1];
-};
-
-
-/**
- * Set @a label to @a value. Asserts that @a value is
- * not longer than #GNUNET_TESTING_CMD_MAX_LABEL_LENGTH.
- *
- * @param[out] label label to initialize
- * @param value value to store into @a label
- */
-void
-GNUNET_TESTING_set_label (struct GNUNET_TESTING_CommandLabel *label,
-                          const char *value);
-
-
-/**
- * A command to be run by the interpreter.
- */
-struct GNUNET_TESTING_Command
-{
-  /**
-   * Closure for all commands with command-specific context information.
-   */
-  void *cls;
-
-  /**
-   * Label for the command.
-   */
-  struct GNUNET_TESTING_CommandLabel label;
-
-  /**
-   * Runs the command.  Note that upon return, the interpreter
-   * will not automatically run the next command, as the command
-   * may continue asynchronously in other scheduler tasks.  Thus,
-   * the command must ensure to eventually call
-   * #GNUNET_TESTING_interpreter_next() or
-   * #GNUNET_TESTING_interpreter_fail().
-   *
-   * If this function creates some asynchronous activity, it should
-   * initialize @e finish to a function that can be used to wait for
-   * the asynchronous activity to terminate.
-   *
-   * @param cls closure
-   * @param is interpreter state
-   */
-  GNUNET_TESTING_CommandRunRoutine run;
-
-  /**
-   * Pointer to the asynchronous context in the command's
-   * closure. Used by the
-   * #GNUNET_TESTING_async_finish() and
-   * #GNUNET_TESTING_async_fail() functions.
-   *
-   * Must be NULL if a command is synchronous.
-   */
-  struct GNUNET_TESTING_AsyncContext *ac;
-
-  /**
-   * Clean up after the command.  Run during forced termination
-   * (CTRL-C) or test failure or test success.
-   *
-   * @param cls closure
-   */
-  GNUNET_TESTING_CommandCleanupRoutine cleanup;
-
-  /**
-   * Extract information from a command that is useful for other
-   * commands. Can be NULL if a command has no traits.
-   *
-   * @param cls closure
-   * @param[out] ret result (could be anything)
-   * @param trait name of the trait
-   * @param index index number of the object to extract.
-   * @return #GNUNET_OK on success,
-   *         #GNUNET_NO if no trait was found
-   */
-  GNUNET_TESTING_CommandGetTraits traits;
-
-  /**
-   * When did the execution of this command start?
-   */
-  struct GNUNET_TIME_Absolute start_time;
-
-  /**
-   * When did the execution of this command finish?
-   */
-  struct GNUNET_TIME_Absolute finish_time;
-
-  /**
-   * When did we start the last run of this command?  Delta to @e finish_time
-   * gives the latency for the last successful run.  Useful in case @e
-   * num_tries was positive and the command was run multiple times.  In that
-   * case, the @e start_time gives the time when we first tried to run the
-   * command, so the difference between @e start_time and @e finish_time would
-   * be the time all of the @e num_tries took, while the delta to @e
-   * last_req_time is the time the last (successful) execution took.
-   */
-  struct GNUNET_TIME_Absolute last_req_time;
-
-  /**
-   * In case @e asynchronous_finish is true, how long should we wait for this
-   * command to complete? If @e finish did not complete after this amount of
-   * time, the interpreter will fail.  Should be set generously to ensure
-   * tests do not fail on slow systems.
-   */
-  struct GNUNET_TIME_Relative default_timeout;
-
-  /**
-   * How often did we try to execute this command? (In case it is a request
-   * that is repated.)  Note that a command must have some built-in retry
-   * mechanism for this value to be useful.
-   */
-  unsigned int num_tries;
-
-  /**
-   * If "true", the interpreter should not immediately call
-   * @e finish, even if @e finish is non-NULL.  Otherwise,
-   * #GNUNET_TESTING_cmd_finish() must be used
-   * to ensure that a command actually completed.
-   */
-  bool asynchronous_finish;
-
-};
-
-
-/**
- * Lookup command by label.
- * Only future commands are looked up.
- *
- * @param is interpreter to lookup command in
- * @param label label of the command to lookup.
- * @return the command, if it is found, or NULL.
- * @deprecated (still in use in a very odd way)
- */
-// FIXME: think harder about whether this is actually needed, likely not.
-const struct GNUNET_TESTING_Command *
-GNUNET_TESTING_interpreter_lookup_future_command (
-  struct GNUNET_TESTING_Interpreter *is,
-  const char *label);
-
-
-/**
- * Lookup command by label.
- *
- * @param is interpreter to lookup command in
- * @param label label of the command to lookup.
- * @return the command, if it is found, or NULL.
- */
-const struct GNUNET_TESTING_Command *
-GNUNET_TESTING_interpreter_lookup_command (
-  struct GNUNET_TESTING_Interpreter *is,
-  const char *label);
-
-
-/**
- * Lookup command by label.
- * All commands, first into the past, then into the future are looked up.
- *
- * @param is interpreter to lookup command in
- * @param label label of the command to lookup.
- * @return the command, if it is found, or NULL.
- * @deprecated (still in use in a very odd way)
- */
-const struct GNUNET_TESTING_Command *
-GNUNET_TESTING_interpreter_lookup_command_all (
-  struct GNUNET_TESTING_Interpreter *is,
-  const char *label);
-
-
-/**
- * Current command failed, clean up and fail the test case.
- *
- * @param is interpreter state.
- */
-void
-GNUNET_TESTING_interpreter_fail (struct GNUNET_TESTING_Interpreter *is);
-
-
-/**
- * Turn asynchronous command into non-blocking command by setting
- * asynchronous_finish to true.  Modifies (and then returns) @a cmd simply
- * setting the bit. By default, most commands are blocking, and by wrapping
- * the command construction in this function a blocking command can be turned
- * into an asynchronous command where the interpreter continues after
- * initiating the asynchronous action. Does nothing if the command is
- * fundamentally synchronous.
- *
- * @param[in,out] cmd command to make non-blocking
- * @return a finish-command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_make_unblocking (struct GNUNET_TESTING_Command cmd);
-
-
-/**
- * Create (synchronous) command that waits for another command to finish.
- * If @a cmd_ref did not finish after @a timeout, this command will fail
- * the test case.
- *
- * @param finish_label label for this command
- * @param cmd_ref reference to a previous command which we should
- *        wait for (call `finish()` on)
- * @param timeout how long to wait at most for @a cmd_ref to finish
- * @return a finish-command.
- */
-const struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_finish (const char *finish_label,
-                           const char *cmd_ref,
-                           struct GNUNET_TIME_Relative timeout);
-
-
-/**
- * Make the instruction pointer point to @a target_label
- * only if @a counter is greater than zero.
- *
- * @param label command label
- * @param target_label label of the new instruction pointer's destination after the jump;
- *                     must be before the current instruction
- * @param counter counts how many times the rewinding is to happen.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_rewind_ip (const char *label,
-                              const char *target_label,
-                              unsigned int counter);
-
-
-/**
- * Function called with the final result of the test.
- * FIXME: This may want to use a GNUNET_ErrorCode (namespaced, e.g.
- * GNUNET_EC_TESTING_*)
- *
- * @param cls closure
- * @param rv #GNUNET_OK if the test passed
- */
-typedef void
-(*GNUNET_TESTING_ResultCallback)(void *cls,
-                                 enum GNUNET_GenericReturnValue rv);
-
-
-/**
- * Run the testsuite.  Note, CMDs are copied into
- * the interpreter state because they are _usually_
- * defined into the "run" method that returns after
- * having scheduled the test interpreter.
- *
- * @param commands the array of command to execute
- * @param timeout how long to wait for each command to execute
- * @param rc function to call with the final result
- * @param rc_cls closure for @a rc
- * @return The interpreter.
- */
-struct GNUNET_TESTING_Interpreter *
-GNUNET_TESTING_run (const struct GNUNET_TESTING_Command *commands,
-                    struct GNUNET_TIME_Relative timeout,
-                    GNUNET_TESTING_ResultCallback rc,
-                    void *rc_cls);
-
-
-/**
- * Start a GNUnet scheduler event loop and
- * run the testsuite.  Return 0 upon success.
- * Expected to be called directly from main().
- * FIXME: Why is this commands array here not const?
- *
- * @param commands the list of command to execute
- * @param timeout how long to wait for each command to execute
- * @return EXIT_SUCCESS on success, EXIT_FAILURE on failure
- */
-int
-GNUNET_TESTING_main (struct GNUNET_TESTING_Command *commands,
-                     struct GNUNET_TIME_Relative timeout);
-
-
-
-/* ************** Fundamental interpreter commands ************ */
-
-
-/**
- * Create command array terminator.
- *
- * @return a end-command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_end (void);
-
-
-/**
- * Create a "batch" command.  Such command takes a end_CMD-terminated array of
- * CMDs and executed them.  Once it hits the end CMD, it passes the control to
- * the next top-level CMD, regardless of it being another batch or ordinary
- * CMD.
- *
- * @param label the command label.
- * @param batch array of CMDs to execute.
- * @return the command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_batch (const char *label,
-                          struct GNUNET_TESTING_Command *batch);
-
-
-/**
- * Performance counter.
- */
-struct GNUNET_TESTING_Timer
-{
-  /**
-   * For which type of commands.
-   */
-  const char *prefix;
-
-  /**
-   * Total time spend in all commands of this type.
-   */
-  struct GNUNET_TIME_Relative total_duration;
-
-  /**
-   * Total time spend waiting for the *successful* exeuction
-   * in all commands of this type.
-   */
-  struct GNUNET_TIME_Relative success_latency;
-
-  /**
-   * Number of commands summed up.
-   */
-  unsigned int num_commands;
-
-  /**
-   * Number of retries summed up.
-   */
-  unsigned int num_retries;
-};
-
-/**
- * Obtain performance data from the interpreter.
- *
- * @param[in,out] timers what commands (by label) to obtain runtimes for
- * @return the command
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_stat (struct GNUNET_TESTING_Timer *timers);
-
-
-/* *** Generic trait logic for implementing traits ********* */
-
-/**
- * A `struct GNUNET_TESTING_Trait` can be used to exchange data between cmds.
- *
- * Therefor the cmd which like to provide data to other cmds has to implement
- * the trait function, where an array of traits is defined with the help of the
- * #GNUNET_TESTING_make_trait_ macro. The data can be retrieved with the help of the
- * #GNUNET_TESTING_get_trait_ macro. Traits name and type must be defined to make
- * use of the macros.
- */
-struct GNUNET_TESTING_Trait
-{
-  /**
-   * Index number associated with the trait.  This gives the
-   * possibility to have _multiple_ traits on offer under the
-   * same name.
-   */
-  unsigned int index;
-
-  /**
-   * Trait type, for example "reserve-pub" or "coin-priv".
-   */
-  const char *trait_name;
-
-  /**
-   * Pointer to the piece of data to offer.
-   */
-  const void *ptr;
-};
-
-
-/**
- * "end" of traits array.  Because traits are offered into arrays, this type
- * of trait is used to mark the end of such arrays; useful when iterating over
- * those.
- */
-struct GNUNET_TESTING_Trait
-GNUNET_TESTING_trait_end (void);
-
-
-/**
- * Obtain value of a trait from a command.
- *
- * @param traits the array of all the traits.
- * @param[out] ret where to store the result.
- * @param trait type of the trait to extract.
- * @param index index number of the trait to extract.
- * @return #GNUNET_OK when the trait is found.
- */
-enum GNUNET_GenericReturnValue
-GNUNET_TESTING_get_trait (const struct GNUNET_TESTING_Trait *traits,
-                          const void **ret,
-                          const char *trait,
-                          unsigned int index);
-
-
-
-/**
- * Create headers for a trait with name @a name for
- * statically allocated data of type @a type.
- *
- * @param prefix symbol prefix to use
- * @param name name of the trait
- * @param type data type for the trait
- */
-#define GNUNET_TESTING_MAKE_DECL_SIMPLE_TRAIT(prefix,name,type) \
-  enum GNUNET_GenericReturnValue                           \
-  prefix ## _get_trait_ ## name (                          \
-    const struct GNUNET_TESTING_Command *cmd,              \
-    type **ret);                                           \
-  struct GNUNET_TESTING_Trait                              \
-  prefix ## _make_trait_ ## name (                         \
-    type * value);
-
-
-/**
- * Create C implementation for a trait with name @a name for statically
- * allocated data of type @a type.
- *
- * @param prefix symbol prefix to use
- * @param name name of the trait
- * @param type data type for the trait
- */
-#define GNUNET_TESTING_MAKE_IMPL_SIMPLE_TRAIT(prefix,name,type) \
-  enum GNUNET_GenericReturnValue                          \
-  prefix ## _get_trait_ ## name (                         \
-    const struct GNUNET_TESTING_Command *cmd,             \
-    type * *ret)                                          \
-  {                                                       \
-    if (NULL == cmd->traits) return GNUNET_SYSERR;        \
-    return cmd->traits (cmd->cls,                         \
-                        (const void **) ret,              \
-                        GNUNET_S (name),                  \
-                        0);                               \
-  }                                                       \
-  struct GNUNET_TESTING_Trait                             \
-  prefix ## _make_trait_ ## name (                        \
-    type * value)                                         \
-  {                                                       \
-    struct GNUNET_TESTING_Trait ret = {                   \
-      .trait_name = GNUNET_S (name),                      \
-      .ptr = (const void *) value                         \
-    };                                                    \
-    return ret;                                           \
-  }
-
-
-/**
- * Create headers for a trait with name @a name for
- * statically allocated data of type @a type.
- *
- * @param prefix symbol prefix to use
- * @param name name of the trait
- * @param type data type for the trait
- */
-#define GNUNET_TESTING_MAKE_DECL_INDEXED_TRAIT(prefix,name,type)    \
-  enum GNUNET_GenericReturnValue                           \
-  prefix ## _get_trait_ ## name (                          \
-    const struct GNUNET_TESTING_Command *cmd,              \
-    unsigned int index,                                    \
-    type **ret);                                           \
-  struct GNUNET_TESTING_Trait                              \
-  prefix ## _make_trait_ ## name (                         \
-    unsigned int index,                                    \
-    type *value);
-
-
-/**
- * Create C implementation for a trait with name @a name for statically
- * allocated data of type @a type.
- */
-#define GNUNET_TESTING_MAKE_IMPL_INDEXED_TRAIT(prefix,name,type)    \
-  enum GNUNET_GenericReturnValue                          \
-  prefix ## _get_trait_ ## name (                         \
-    const struct GNUNET_TESTING_Command *cmd,             \
-    unsigned int index,                                   \
-    type * *ret)                                          \
-  {                                                       \
-    if (NULL == cmd->traits) return GNUNET_SYSERR;        \
-    return cmd->traits (cmd->cls,                         \
-                        (const void **) ret,              \
-                        GNUNET_S (name),                  \
-                        index);                           \
-  }                                                       \
-  struct GNUNET_TESTING_Trait                             \
-  prefix ## _make_trait_ ## name (                        \
-    unsigned int index,                                   \
-    type * value)                                         \
-  {                                                       \
-    struct GNUNET_TESTING_Trait ret = {                   \
-      .index = index,                                     \
-      .trait_name = GNUNET_S (name),                      \
-      .ptr = (const void *) value                         \
-    };                                                    \
-    return ret;                                           \
-  }
-
-
-/**
- * Call #op on all simple traits needed by loop logic.
- *
- * @param op operation to perform
- * @param prefix prefix to pass to @e op
- */
-#define GNUNET_TESTING_LOOP_SIMPLE_TRAITS(op,prefix)      \
-  op (prefix, batch_cmds, struct GNUNET_TESTING_Command *)
-
-
-GNUNET_TESTING_LOOP_SIMPLE_TRAITS(GNUNET_TESTING_MAKE_DECL_SIMPLE_TRAIT, GNUNET_TESTING)
-
-
-/**
- * Call #op on all indexed traits needed by loop logic.
- *
- * @param op operation to perform
- * @param prefix prefix to pass to @e op
- */
-#define GNUNET_TESTING_LOOP_INDEXED_TRAITS(op,prefix) \
-  op (prefix, cmd, const struct GNUNET_TESTING_Command)
-
-GNUNET_TESTING_LOOP_INDEXED_TRAITS (GNUNET_TESTING_MAKE_DECL_INDEXED_TRAIT, GNUNET_TESTING)
-
-
-#endif
diff --git a/src/include/gnunet_testing_ng_lib.h b/src/include/gnunet_testing_ng_lib.h
deleted file mode 100644
index 407f50bb7..000000000
--- a/src/include/gnunet_testing_ng_lib.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2021, 2023 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @brief Meta-header for next-generation testing logic
- * @author Christian Grothoff <christian@grothoff.org>
- * @author Marcello Stanisci
- * @author t3sserakt
- */
-#ifndef GNUNET_TESTING_NG_LIB_H
-#define GNUNET_TESTING_NG_LIB_H
-
-
-#include "gnunet_util_lib.h"
-
-/* FIXME: legacy test header, to be removed!! */
-#include "gnunet_testing_lib.h"
-
-#include "gnunet_testing_plugin.h"
-#include "gnunet_testing_loop_lib.h"
-#include "gnunet_testing_netjail_lib.h"
-
-
-/**
- * Create a "signal" CMD.
- *
- * @param label command label.
- * @param process_label label of a command that has a process trait
- * @param signal signal to send to @a process.
- * @return the command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_signal (const char *label,
-                           const char *process_label,
-                           int signal);
-
-
-/**
- * Sleep for @a duration.
- *
- * @param label command label.
- * @param duration time to sleep
- * @return the command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_sleep (const char *label,
-                          struct GNUNET_TIME_Relative duration);
-
-
-/**
- * Command to execute a script synchronously.
- *
- * FIXME: is this accurate? How is this limited to BASH scripts or even scripts?
- *
- * @param label Label of the command.
- * @param script The name of the script.
- * @param script_argv The arguments of the script. 
-*/
-const struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_exec_bash_script (const char *label,
-                                     const char *script,
-                                     char *const script_argv[],
-                                     // FIXME: wtf are these two args here for!?
-                                     int argc,
-                                     GNUNET_ChildCompletedCallback cb);
-
-
-
-/* ****** Specific traits needed by this component ******* */
-
-
-/**
- * Call #op on all simple traits.
- */
-#define GNUNET_TESTING_SIMPLE_TRAITS(op, prefix)       \
-  op (prefix, process, struct GNUNET_OS_Process *) 
-
-
-GNUNET_TESTING_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_DECL_SIMPLE_TRAIT, GNUNET_TESTING)
-
-/**
- * Call #op on all indexed traits.
- */
-#define GNUNET_TESTING_INDEXED_TRAITS(op, prefix)               \
-  op (prefix, uint32, const uint32_t)                           \
-  op (prefix, uint64, const uint64_t)                           \
-  op (prefix, int64, const int64_t)                             \
-  op (prefix, uint, const unsigned int)                         \
-  op (prefix, string, const char)                               \
-  op (prefix, uuid, const struct GNUNET_Uuid)                   \
-  op (prefix, time, const struct GNUNET_TIME_Absolute)          \
-  op (prefix, absolute_time, const struct GNUNET_TIME_Absolute) \
-  op (prefix, relative_time, const struct GNUNET_TIME_Relative)
-
-GNUNET_TESTING_INDEXED_TRAITS (GNUNET_TESTING_MAKE_DECL_INDEXED_TRAIT, GNUNET_TESTING)
-
-
-#endif
diff --git a/src/include/gnunet_testing_plugin.h b/src/include/gnunet_testing_plugin.h
deleted file mode 100644
index b030bc8a8..000000000
--- a/src/include/gnunet_testing_plugin.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2021 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- *
- * @author t3sserakt
- *
- * Plugin API to start test cases.
- *
- */
-#ifndef GNUNET_TESTING_PLUGIN_H
-#define GNUNET_TESTING_PLUGIN_H
-
-#include "gnunet_common.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#if 0                           /* keep Emacsens' auto-indent happy */
-}
-#endif
-#endif
-
-
-/**
- * Callback function to write messages from the helper process running on a netjail node to the master process.
- *
- * @param message The message to write.
- * @param msg_length The length of the message.
- */
-typedef void
-(*GNUNET_TESTING_cmd_helper_write_cb) (struct GNUNET_MessageHeader *message,
-                                       size_t msg_length);
-
-/**
- * Callback function which writes a message from the helper process running on a netjail node to the master process * signaling that the test case running on the netjail node finished.
- */
-typedef void
-(*GNUNET_TESTING_cmd_helper_finish_cb) ();
-
-
-/**
- * Function to be implemented for each test case plugin which starts the test case on a netjail node.
- *
- * @param write_message Callback function to write messages from the helper process running on a
- * netjail node to the master process.
- * @param router_ip Global address of the network namespace, if the helper process is for a node in a subnet.
- * @param node_ip The IP address of the node.
- * @param m The number of the node in a network namespace.
- * @param n The number of the network namespace.
- * @param local_m The number of nodes in a network namespace.
- * @param topology_data A file name for the file containing the topology configuration, or a string containing
- *        the topology configuration.
- * @param read_file If read_file is GNUNET_YES this string is the filename for the topology configuration,
- *        if read_file is GNUNET_NO the string contains the topology configuration.
- * @param finish_cb Callback function which writes a message from the helper process running on a netjail
- *                  node to the master process * signaling that the test case running on the netjail node finished.
- * @return Returns The struct GNUNET_TESTING_Interpreter of the command loop running on this netjail node.
- */
-typedef struct GNUNET_TESTING_Interpreter *
-(*GNUNET_TESTING_PLUGIN_StartTestCase) (
-  GNUNET_TESTING_cmd_helper_write_cb write_message,
-  const char *router_ip,
-  const char *node_ip,
-  const char *n,
-  const char *m,
-  const char *local_m,
-  const char *topology_data,
-  unsigned int *read_file,
-  GNUNET_TESTING_cmd_helper_finish_cb
-  finish_cb);
-
-/**
- * DEPRECATED
- * The helper process received a message of type
- * GNUNET_MESSAGE_TYPE_CMDS_HELPER_ALL_PEERS_STARTED. This will finish the blocking command
- * GNUNET_TESTING_cmd_block_until_external_trigger which was execute right after the command
- * GNUNET_TESTING_cmd_send_peer_ready.
- */
-typedef void
-(*GNUNET_TESTING_PLUGIN_ALL_PEERS_STARTED) ();
-
-/**
- * DEPRECATED
- * The helper process received a message of type
- * GNUNET_MESSAGE_TYPE_CMDS_HELPER_ALL_LOCAL_TESTS_PREPARED. This will finish the blocking command
- * GNUNET_TESTING_cmd_local_test_prepared which was execute right after the command
- * GNUNET_TRANSPORT_cmd_connect_peers.
- * FIXME: do not use ALL CAPS
- */
-typedef void
-(*GNUNET_TESTING_PLUGIN_ALL_LOCAL_TESTS_PREPARED) ();
-
-
-/**
- * This function returns a struct GNUNET_TESTING_BarrierList, which is a list of all barriers
- * this test case will wait for.
- *
- * @return A struct GNUNET_TESTING_BarrierList.
- * FIXME: do not use ALL CAPS
- */
-typedef struct GNUNET_TESTING_BarrierList*
-(*GNUNET_TESTING_PLUGIN_GET_WAITING_FOR_BARRIERS) (void);
-
-
-/**
- * The plugin API every test case plugin has to implement.
- */
-struct GNUNET_TESTING_PluginFunctions
-{
-
-  GNUNET_TESTING_PLUGIN_StartTestCase start_testcase;
-
-  GNUNET_TESTING_PLUGIN_ALL_PEERS_STARTED all_peers_started;
-
-  GNUNET_TESTING_PLUGIN_ALL_LOCAL_TESTS_PREPARED all_local_tests_prepared;
-
-  GNUNET_TESTING_PLUGIN_GET_WAITING_FOR_BARRIERS get_waiting_for_barriers;
-};
-
-#if 0                           /* keep Emacsens' auto-indent happy */
-{
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/include/gnunet_testing_testbed_lib.h b/src/include/gnunet_testing_testbed_lib.h
new file mode 100644
index 000000000..872382706
--- /dev/null
+++ b/src/include/gnunet_testing_testbed_lib.h
@@ -0,0 +1,42 @@
+#ifndef GNUNET_TESTING_TESTBED_LIB_H
+#define GNUNET_TESTING_TESTBED_LIB_H
+
+#include "gnunet_testing_lib.h"
+#include "gnunet_testbed_lib.h"
+
+/**
+ * This command destroys the ressources allocated for the test system setup.
+ *
+ * @param label Name for command.
+ * @param create_label Label of the cmd which started the test system.
+ * @param write_message Callback to write messages to the master loop.
+ * @return command.
+ */
+struct GNUNET_TESTING_Command
+GNUNET_TESTBED_cmd_system_destroy (const char *label,
+                                   const char *create_label);
+
+/**
+ * This command is setting up a test environment for a peer to start.
+ *
+ * @param label Name for command.
+ * @param testdir Only the directory name without any path. Temporary
+ *                directory used for all service homes.
+ */
+struct GNUNET_TESTING_Command
+GNUNET_TESTBED_cmd_system_create (const char *label,
+                                  const char *testdir);
+
+
+/**
+ * Call #op on all simple traits.
+ */
+#define GNUNET_TESTING_TESTBED_SIMPLE_TRAITS(op, prefix)                            \
+        op (prefix, test_system, struct GNUNET_TESTBED_System)
+
+
+GNUNET_TESTING_TESTBED_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_DECL_SIMPLE_TRAIT,
+                                      GNUNET_TESTING_TESTBED)
+
+
+#endif
diff --git a/src/include/gnunet_transport_testing_ng_lib.h b/src/include/gnunet_testing_transport_lib.h
index be904cf4c..db2749661 100644
--- a/src/include/gnunet_transport_testing_ng_lib.h
+++ b/src/include/gnunet_testing_transport_lib.h
@@ -27,18 +27,13 @@
 
 
 #include "gnunet_util_lib.h"
-#include "gnunet_testing_ng_lib.h"
+#include "gnunet_testing_lib.h"
 
 /**
  * Application handle; FIXME: what exactly is this?
  */
 struct GNUNET_TRANSPORT_ApplicationHandle;
 
-/**
- * FIXME: what is this?
- */
-struct GNUNET_TESTING_StartPeerState;
-
 
 // FIXME: breaks naming conventions
 typedef void *
@@ -46,7 +41,6 @@ typedef void *
                                      const struct GNUNET_PeerIdentity *peer);
 
 
-
 // FIXME: breaks naming conventions! Needed public?
 struct GNUNET_TESTING_StartPeerState
 {
@@ -153,7 +147,6 @@ struct GNUNET_TESTING_StartPeerState
 };
 
 
-
 /**
  * Create command.
  *
@@ -191,21 +184,22 @@ GNUNET_TESTING_get_peer (unsigned int num,
                          const struct GNUNET_TESTING_System *tl_system);
 
 
-
-
 /**
  * Call #op on all simple traits.
  */
 #define GNUNET_TRANSPORT_TESTING_SIMPLE_TRAITS(op, prefix)                         \
-  op (prefix, connected_peers_map, const struct GNUNET_CONTAINER_MultiShortmap)    \
-  op (prefix, peer_id, const struct GNUNET_PeerIdentity)                           \
-  op (prefix, hello_size, const size_t)                                            \
-  op (prefix, hello, const char)                                                   \
-  op (prefix, application_handle, const struct GNUNET_TRANSPORT_ApplicationHandle) \
-  op (prefix, state, const struct GNUNET_TESTING_StartPeerState)                   \
-  op (prefix, broadcast, const enum GNUNET_GenericReturnValue)
-
-
-GNUNET_TRANSPORT_TESTING_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_DECL_SIMPLE_TRAIT, GNUNET_TRANSPORT_TESTING)
+        op (prefix, connected_peers_map, const struct \
+            GNUNET_CONTAINER_MultiShortmap)    \
+        op (prefix, peer_id, const struct GNUNET_PeerIdentity)                           \
+        op (prefix, hello_size, const size_t)                                            \
+        op (prefix, hello, const char)                                                   \
+        op (prefix, application_handle, const struct \
+            GNUNET_TRANSPORT_ApplicationHandle) \
+        op (prefix, state, const struct GNUNET_TESTING_StartPeerState)                   \
+        op (prefix, broadcast, const enum GNUNET_GenericReturnValue)
+
+
+GNUNET_TRANSPORT_TESTING_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_DECL_SIMPLE_TRAIT,
+                                        GNUNET_TRANSPORT_TESTING)
 
 #endif
diff --git a/src/include/gnunet_transport_application_service.h b/src/include/gnunet_transport_application_service.h
index 66512089a..c093ad96a 100644
--- a/src/include/gnunet_transport_application_service.h
+++ b/src/include/gnunet_transport_application_service.h
@@ -36,8 +36,6 @@
 
 #include "gnunet_constants.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_testing_lib.h"
-#include "gnunet_testing_ng_lib.h"
 
 /**
  * Handle to the TRANSPORT subsystem for making suggestions about
diff --git a/src/include/gnunet_util_lib.h b/src/include/gnunet_util_lib.h
index ee850bc3c..86a1204bb 100644
--- a/src/include/gnunet_util_lib.h
+++ b/src/include/gnunet_util_lib.h
@@ -63,7 +63,7 @@ extern "C"
  * this service available to anyone but yourself.
  */
 #define GNUNET_AGPL_URL "https://git.gnunet.org/gnunet.git/tag/?h=v" \
-  GNUNET_VERSION
+        GNUNET_VERSION
 
 #include "gnunet_config.h"
 #include "gnunet_common.h"
@@ -79,7 +79,6 @@ extern "C"
 #include "gnunet_mq_lib.h"
 #include "gnunet_nt_lib.h"
 #include "gnunet_nc_lib.h"
-#include "gnunet_op_lib.h"
 #include "gnunet_os_lib.h"
 #include "gnunet_peer_lib.h"
 #include "gnunet_plugin_lib.h"
@@ -103,42 +102,6 @@ extern "C"
  */
 #define GNUNET_S(a) #a
 
-/**
- * Try to compress the given block of data using libz.  Only returns
- * the compressed block if compression worked and the new block is
- * actually smaller.  Decompress using #GNUNET_decompress().
- *
- * @param data block to compress; if compression
- *        resulted in a smaller block, the first
- *        bytes of data are updated to the compressed
- *        data
- * @param old_size number of bytes in data
- * @param[out] result set to the compressed data, if compression worked
- * @param[out] new_size set to size of result, if compression worked
- * @return #GNUNET_YES if compression reduce the size,
- *         #GNUNET_NO if compression did not help
- */
-int
-GNUNET_try_compression (const char *data,
-                        size_t old_size,
-                        char **result,
-                        size_t *new_size);
-
-/**
- * Decompress input, return the decompressed data as output.  Dual to
- * #GNUNET_try_compression(). Caller must set @a output_size to the
- * number of bytes that were originally compressed.
- *
- * @param input compressed data
- * @param input_size number of bytes in input
- * @param output_size expected size of the output
- * @return NULL on error, buffer of @a output_size decompressed bytes otherwise
- */
-char *
-GNUNET_decompress (const char *input,
-                   size_t input_size,
-                   size_t output_size);
-
 
 #if 0                           /* keep Emacsens' auto-indent happy */
 {
diff --git a/src/include/meson.build b/src/include/meson.build
index 3127a6a40..51a8009af 100644
--- a/src/include/meson.build
+++ b/src/include/meson.build
@@ -104,11 +104,11 @@ install_headers(
   'gnunet_sq_lib.h',
   'gnunet_statistics_service.h',
   'gnunet_strings_lib.h',
-  'gnunet_testing_barrier.h',
   'gnunet_testing_lib.h',
-  'gnunet_testing_plugin.h',
-  'gnunet_testing_ng_lib.h',
-  'gnunet_testing_netjail_lib.h',
+  'gnunet_testing_arm_lib.h',
+  'gnunet_testing_core_lib.h',
+  'gnunet_testing_testbed_lib.h',
+  'gnunet_testing_transport_lib.h',
   'gnunet_time_lib.h',
   'gnunet_transport_application_service.h',
   'gnunet_transport_communication_service.h',
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index c9871d8c7..89a34b299 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -4,10 +4,11 @@ endif
 
 SUBDIRS = \
         util \
-        hello \
-        block \
-        gnsrecord \
         curl \
         json \
         sq \
-        $(POSTGRES_DIR)
+        $(POSTGRES_DIR) \
+        hello \
+        block \
+        gnsrecord \
+        testing
diff --git a/src/lib/gnsrecord/Makefile.am b/src/lib/gnsrecord/Makefile.am
index ab79de900..dc375133e 100644
--- a/src/lib/gnsrecord/Makefile.am
+++ b/src/lib/gnsrecord/Makefile.am
@@ -75,7 +75,6 @@ EXTRA_DIST = \
 test_gnsrecord_lsd0001testvectors_SOURCES = \
  test_gnsrecord_testvectors.c
 test_gnsrecord_lsd0001testvectors_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
   libgnunetgnsrecord.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
@@ -83,14 +82,12 @@ test_gnsrecord_lsd0001testvectors_LDADD = \
 test_gnsrecord_serialization_SOURCES = \
  test_gnsrecord_serialization.c
 test_gnsrecord_serialization_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
   libgnunetgnsrecord.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_gnsrecord_block_expiration_SOURCES = \
  test_gnsrecord_block_expiration.c
 test_gnsrecord_block_expiration_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
   libgnunetgnsrecord.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
@@ -98,7 +95,6 @@ test_gnsrecord_block_expiration_LDADD = \
 test_gnsrecord_crypto_SOURCES = \
  test_gnsrecord_crypto.c
 test_gnsrecord_crypto_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
   libgnunetgnsrecord.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
@@ -106,6 +102,5 @@ test_gnsrecord_crypto_LDADD = \
 perf_gnsrecord_crypto_SOURCES = \
  perf_gnsrecord_crypto.c
 perf_gnsrecord_crypto_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
   libgnunetgnsrecord.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
diff --git a/src/lib/json/json_helper.c b/src/lib/json/json_helper.c
index ce73fb316..5c2f8ae05 100644
--- a/src/lib/json/json_helper.c
+++ b/src/lib/json/json_helper.c
@@ -1344,4 +1344,268 @@ GNUNET_JSON_spec_blinded_message (const char *name,
 }
 
 
+/**
+ * Parse given JSON object to a blinded signature.
+ *
+ * @param cls closure, NULL
+ * @param root the json object representing data
+ * @param[out] spec where to write the data
+ * @return #GNUNET_OK upon successful parsing; #GNUNET_SYSERR upon error
+ */
+static enum GNUNET_GenericReturnValue
+parse_blinded_sig (void *cls,
+                   json_t *root,
+                   struct GNUNET_JSON_Specification *spec)
+{
+  struct GNUNET_CRYPTO_BlindedSignature **target = spec->ptr;
+  struct GNUNET_CRYPTO_BlindedSignature *blinded_sig;
+  const char *cipher;
+  struct GNUNET_JSON_Specification dspec[] = {
+    GNUNET_JSON_spec_string ("cipher",
+                             &cipher),
+    GNUNET_JSON_spec_end ()
+  };
+  const char *emsg;
+  unsigned int eline;
+
+  (void) cls;
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (root,
+                         dspec,
+                         &emsg,
+                         &eline))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  blinded_sig = GNUNET_new (struct GNUNET_CRYPTO_BlindedSignature);
+  blinded_sig->cipher = string_to_cipher (cipher);
+  blinded_sig->rc = 1;
+  switch (blinded_sig->cipher)
+  {
+  case GNUNET_CRYPTO_BSA_INVALID:
+    break;
+  case GNUNET_CRYPTO_BSA_RSA:
+    {
+      struct GNUNET_JSON_Specification ispec[] = {
+        GNUNET_JSON_spec_rsa_signature (
+          "blinded_rsa_signature",
+          &blinded_sig->details.blinded_rsa_signature),
+        GNUNET_JSON_spec_end ()
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_JSON_parse (root,
+                             ispec,
+                             &emsg,
+                             &eline))
+      {
+        GNUNET_break_op (0);
+        GNUNET_free (blinded_sig);
+        return GNUNET_SYSERR;
+      }
+      *target = blinded_sig;
+      return GNUNET_OK;
+    }
+  case GNUNET_CRYPTO_BSA_CS:
+    {
+      struct GNUNET_JSON_Specification ispec[] = {
+        GNUNET_JSON_spec_uint32 ("b",
+                                 &blinded_sig->details.blinded_cs_answer.b),
+        GNUNET_JSON_spec_fixed_auto ("s",
+                                     &blinded_sig->details.blinded_cs_answer.
+                                     s_scalar),
+        GNUNET_JSON_spec_end ()
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_JSON_parse (root,
+                             ispec,
+                             &emsg,
+                             &eline))
+      {
+        GNUNET_break_op (0);
+        GNUNET_free (blinded_sig);
+        return GNUNET_SYSERR;
+      }
+      *target = blinded_sig;
+      return GNUNET_OK;
+    }
+  }
+  GNUNET_break_op (0);
+  GNUNET_free (blinded_sig);
+  return GNUNET_SYSERR;
+}
+
+
+/**
+ * Cleanup data left from parsing blinded sig.
+ *
+ * @param cls closure, NULL
+ * @param[out] spec where to free the data
+ */
+static void
+clean_blinded_sig (void *cls,
+                   struct GNUNET_JSON_Specification *spec)
+{
+  struct GNUNET_CRYPTO_BlindedSignature **b_sig = spec->ptr;
+
+  (void) cls;
+
+  if (NULL != *b_sig)
+  {
+    GNUNET_CRYPTO_blinded_sig_decref (*b_sig);
+    *b_sig = NULL;
+  }
+}
+
+
+struct GNUNET_JSON_Specification
+GNUNET_JSON_spec_blinded_signature (const char *field,
+                                    struct GNUNET_CRYPTO_BlindedSignature **b_sig)
+{
+  struct GNUNET_JSON_Specification ret = {
+    .parser = &parse_blinded_sig,
+    .cleaner = &clean_blinded_sig,
+    .field = field,
+    .ptr = b_sig
+  };
+
+  *b_sig = NULL;
+  return ret;
+}
+
+/**
+ * Parse given JSON object to unblinded signature.
+ *
+ * @param cls closure, NULL
+ * @param root the json object representing data
+ * @param[out] spec where to write the data
+ * @return #GNUNET_OK upon successful parsing; #GNUNET_SYSERR upon error
+ */
+static enum GNUNET_GenericReturnValue
+parse_unblinded_sig (void *cls,
+                     json_t *root,
+                     struct GNUNET_JSON_Specification *spec)
+{
+  struct GNUNET_CRYPTO_UnblindedSignature **target = spec->ptr;
+  struct GNUNET_CRYPTO_UnblindedSignature *unblinded_sig;
+  const char *cipher;
+  struct GNUNET_JSON_Specification dspec[] = {
+    GNUNET_JSON_spec_string ("cipher",
+                             &cipher),
+    GNUNET_JSON_spec_end ()
+  };
+  const char *emsg;
+  unsigned int eline;
+
+  (void) cls;
+  if (GNUNET_OK !=
+      GNUNET_JSON_parse (root,
+                         dspec,
+                         &emsg,
+                         &eline))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  unblinded_sig = GNUNET_new (struct GNUNET_CRYPTO_UnblindedSignature);
+  unblinded_sig->cipher = string_to_cipher (cipher);
+  unblinded_sig->rc = 1;
+  switch (unblinded_sig->cipher)
+  {
+  case GNUNET_CRYPTO_BSA_INVALID:
+    break;
+  case GNUNET_CRYPTO_BSA_RSA:
+    {
+      struct GNUNET_JSON_Specification ispec[] = {
+        GNUNET_JSON_spec_rsa_signature (
+          "rsa_signature",
+          &unblinded_sig->details.rsa_signature),
+        GNUNET_JSON_spec_end ()
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_JSON_parse (root,
+                             ispec,
+                             &emsg,
+                             &eline))
+      {
+        GNUNET_break_op (0);
+        GNUNET_free (unblinded_sig);
+        return GNUNET_SYSERR;
+      }
+      *target = unblinded_sig;
+      return GNUNET_OK;
+    }
+  case GNUNET_CRYPTO_BSA_CS:
+    {
+      struct GNUNET_JSON_Specification ispec[] = {
+        GNUNET_JSON_spec_fixed_auto ("cs_signature_r",
+                                     &unblinded_sig->details.cs_signature.
+                                     r_point),
+        GNUNET_JSON_spec_fixed_auto ("cs_signature_s",
+                                     &unblinded_sig->details.cs_signature.
+                                     s_scalar),
+        GNUNET_JSON_spec_end ()
+      };
+
+      if (GNUNET_OK !=
+          GNUNET_JSON_parse (root,
+                             ispec,
+                             &emsg,
+                             &eline))
+      {
+        GNUNET_break_op (0);
+        GNUNET_free (unblinded_sig);
+        return GNUNET_SYSERR;
+      }
+      *target = unblinded_sig;
+      return GNUNET_OK;
+    }
+  }
+  GNUNET_break_op (0);
+  GNUNET_free (unblinded_sig);
+  return GNUNET_SYSERR;
+}
+
+
+/**
+ * Cleanup data left from parsing unblinded signature.
+ *
+ * @param cls closure, NULL
+ * @param[out] spec where to free the data
+ */
+static void
+clean_unblinded_sig (void *cls,
+                     struct GNUNET_JSON_Specification *spec)
+{
+  struct GNUNET_CRYPTO_UnblindedSignature **ub_sig = spec->ptr;
+
+  (void) cls;
+  if (NULL != *ub_sig)
+  {
+    GNUNET_CRYPTO_unblinded_sig_decref (*ub_sig);
+    *ub_sig = NULL;
+  }
+}
+
+
+struct GNUNET_JSON_Specification
+GNUNET_JSON_spec_unblinded_signature (const char *field,
+                                      struct GNUNET_CRYPTO_UnblindedSignature **ub_sig)
+{
+  struct GNUNET_JSON_Specification ret = {
+    .parser = &parse_unblinded_sig,
+    .cleaner = &clean_unblinded_sig,
+    .field = field,
+    .ptr = ub_sig
+  };
+
+  *ub_sig = NULL;
+  return ret;
+}
+
+
+
 /* end of json_helper.c */
diff --git a/src/lib/meson.build b/src/lib/meson.build
index 41c662a4f..93dbf5c4d 100644
--- a/src/lib/meson.build
+++ b/src/lib/meson.build
@@ -6,3 +6,4 @@ subdir('curl', if_found : [curl_dep])
 subdir('sq', if_found : [sqlite_dep])
 subdir('pq', if_found : [pq_dep])
 subdir('gnsrecord')
+subdir('testing')
diff --git a/src/lib/pq/Makefile.am b/src/lib/pq/Makefile.am
index 91014dbfe..299cebccc 100644
--- a/src/lib/pq/Makefile.am
+++ b/src/lib/pq/Makefile.am
@@ -32,7 +32,7 @@ libgnunetpq_la_LIBADD = -lpq \
 libgnunetpq_la_LDFLAGS = \
  $(POSTGRESQL_LDFLAGS) \
  $(GN_LIB_LDFLAGS) \
-  -version-info 7:0:2
+  -version-info 7:1:2
 
 if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
diff --git a/src/lib/pq/pq_result_helper.c b/src/lib/pq/pq_result_helper.c
index cbb1e8e8e..c7d7f9abd 100644
--- a/src/lib/pq/pq_result_helper.c
+++ b/src/lib/pq/pq_result_helper.c
@@ -1264,22 +1264,35 @@ extract_array_generic (
   *((void **) dst) = NULL;
 
   #define FAIL_IF(cond) \
-  do { \
-    if ((cond)) \
-    { \
-      GNUNET_break (! (cond)); \
-      goto FAIL; \
-    } \
-  } while (0)
+          do { \
+            if ((cond)) \
+            { \
+              GNUNET_break (! (cond)); \
+              goto FAIL; \
+            } \
+          } while (0)
 
   col_num = PQfnumber (result, fname);
   FAIL_IF (0 > col_num);
 
   data_sz = PQgetlength (result, row, col_num);
   FAIL_IF (0 > data_sz);
-  FAIL_IF (sizeof(header) > (size_t) data_sz);
-
   data = PQgetvalue (result, row, col_num);
+  if (sizeof(header) > (size_t) data_sz)
+  {
+    uint32_t ndim;
+
+    /* data_sz is shorter than header if the
+       array length is 0, in which case ndim is 0! */
+    FAIL_IF (sizeof(uint32_t) > (size_t) data_sz);
+    memcpy (&ndim,
+            data,
+            sizeof (ndim));
+    FAIL_IF (0 != ndim);
+    *info->num = 0;
+    return GNUNET_OK;
+  }
+  FAIL_IF (sizeof(header) > (size_t) data_sz);
   FAIL_IF (NULL == data);
 
   {
@@ -1391,7 +1404,8 @@ extract_array_generic (
     case array_of_rel_time:
       if (NULL != dst_size)
         *dst_size = sizeof(struct GNUNET_TIME_Relative) * (header.dim);
-      out = GNUNET_new_array (header.dim, struct GNUNET_TIME_Relative);
+      out = GNUNET_new_array (header.dim,
+                              struct GNUNET_TIME_Relative);
       *((void **) dst) = out;
       for (uint32_t i = 0; i < header.dim; i++)
       {
@@ -1408,7 +1422,8 @@ extract_array_generic (
     case array_of_timestamp:
       if (NULL != dst_size)
         *dst_size = sizeof(struct GNUNET_TIME_Timestamp) * (header.dim);
-      out = GNUNET_new_array (header.dim, struct GNUNET_TIME_Timestamp);
+      out = GNUNET_new_array (header.dim,
+                              struct GNUNET_TIME_Timestamp);
       *((void **) dst) = out;
       for (uint32_t i = 0; i < header.dim; i++)
       {
@@ -1920,7 +1935,8 @@ clean_blind_sign_pub (void *cls,
 
 struct GNUNET_PQ_ResultSpec
 GNUNET_PQ_result_spec_blind_sign_pub (const char *name,
-                                      struct GNUNET_CRYPTO_BlindSignPublicKey **pub)
+                                      struct GNUNET_CRYPTO_BlindSignPublicKey **
+                                      pub)
 {
   struct GNUNET_PQ_ResultSpec res = {
     .conv = &extract_blind_sign_pub,
@@ -2040,7 +2056,7 @@ extract_blind_sign_priv (void *cls,
  */
 static void
 clean_blind_sign_priv (void *cls,
-                      void *rd)
+                       void *rd)
 {
   struct GNUNET_CRYPTO_BlindSignPrivateKey **priv = rd;
 
@@ -2052,7 +2068,8 @@ clean_blind_sign_priv (void *cls,
 
 struct GNUNET_PQ_ResultSpec
 GNUNET_PQ_result_spec_blind_sign_priv (const char *name,
-                                       struct GNUNET_CRYPTO_BlindSignPrivateKey **priv)
+                                       struct GNUNET_CRYPTO_BlindSignPrivateKey
+                                       **priv)
 {
   struct GNUNET_PQ_ResultSpec res = {
     .conv = &extract_blind_sign_priv,
@@ -2064,4 +2081,5 @@ GNUNET_PQ_result_spec_blind_sign_priv (const char *name,
   return res;
 }
 
+
 /* end of pq_result_helper.c */
diff --git a/src/service/testing/.gitignore b/src/lib/testing/.gitignore
index a1e77a8e4..2e66a9259 100644
--- a/src/service/testing/.gitignore
+++ b/src/lib/testing/.gitignore
@@ -7,3 +7,5 @@ test_testing_portreservation
 test_testing_servicestartup
 test_testing_sharedservices
 gnunet-cmds-helper
+test_testing_api
+gnunet-testing-netjail-launcher
diff --git a/src/lib/testing/Makefile.am b/src/lib/testing/Makefile.am
new file mode 100644
index 000000000..95fc30f86
--- /dev/null
+++ b/src/lib/testing/Makefile.am
@@ -0,0 +1,92 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+  XLIB = -lgcov
+endif
+
+libexecdir= $(pkglibdir)/libexec/
+
+libexec_PROGRAMS = \
+  gnunet-cmds-helper
+
+plugindir = $(libdir)/gnunet
+
+lib_LTLIBRARIES = \
+  libgnunettesting.la
+
+gnunet_cmds_helper_SOURCES = \
+  gnunet-cmds-helper.c testing_cmds.h
+gnunet_cmds_helper_LDADD = $(XLIB) \
+  libgnunettesting.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(LTLIBINTL)
+
+libgnunettesting_la_SOURCES = \
+  testing_api_barrier.c testing_api_barrier.h \
+  testing_api_cmd_barrier_create.c \
+  testing_api_cmd_barrier_reached.c \
+  testing_api_cmd_batch.c testing_api_cmd_batch.h \
+  testing_api_cmd_exec.c \
+  testing_api_cmd_finish.c \
+  testing_api_cmd_get_topo.c \
+  testing_api_cmd_netjail_start.c \
+  testing_api_cmd_netjail_start_cmds_helper.c \
+  testing_api_cmd_signal.c \
+  testing_api_cmd_stat.c \
+  testing_api_cmds.c testing_cmds.h \
+  testing_api_loop.c testing_api_loop.h \
+  testing_api_main.c \
+  testing_api_traits.c \
+  testing_api_topology.c testing_api_topology.h
+libgnunettesting_la_LIBADD = \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(LTLIBINTL)
+libgnunettesting_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS) \
+  -version-info 3:0:0
+
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+
+
+bin_PROGRAMS = \
+  gnunet-testing-netjail-launcher
+
+gnunet_testing_netjail_launcher_SOURCES = \
+  gnunet-testing-netjail-launcher.c
+gnunet_testing_netjail_launcher_LDADD = $(XLIB) \
+  libgnunettesting.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(LTLIBINTL)
+
+check_PROGRAMS = \
+  test_testing_api
+
+check_SCRIPTS = \
+  test_netjail_api.sh
+
+TESTS = \
+  $(check_PROGRAMS) \
+  $(check_SCRIPTS)
+
+test_testing_api_SOURCES = \
+  test_testing_api.c
+test_testing_api_LDADD = \
+  libgnunettesting.la \
+  -lgnunetutil \
+  $(XLIB)
+
+EXTRA_DIST = \
+  $(check_SCRIPTS) \
+  test_netjail_topo.conf
+
+plugin_LTLIBRARIES = \
+  libgnunet_test_testing_plugin_ping.la
+
+libgnunet_test_testing_plugin_ping_la_SOURCES = \
+ test_testing_plugin_ping.c
+libgnunet_test_testing_plugin_ping_la_LIBADD = \
+  libgnunettesting.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(LTLIBINTL)
diff --git a/src/lib/testing/gnunet-cmds-helper.c b/src/lib/testing/gnunet-cmds-helper.c
new file mode 100644
index 000000000..93d4d96de
--- /dev/null
+++ b/src/lib/testing/gnunet-cmds-helper.c
@@ -0,0 +1,549 @@
+/*
+      This file is part of GNUnet
+      Copyright (C) 2021 GNUnet e.V.
+
+      GNUnet is free software: you can redistribute it and/or modify it
+      under the terms of the GNU Affero General Public License as published
+      by the Free Software Foundation, either version 3 of the License,
+      or (at your option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Affero General Public License for more details.
+
+      You should have received a copy of the GNU Affero General Public License
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+/**
+ * @file testbed/gnunet-cmds-helper.c
+ * @brief Helper binary that is started from a remote interpreter loop to start
+ *        a local interpreter loop.
+ *
+ *        This helper monitors for three termination events.  They are: (1)The
+ *        stdin of the helper is closed for reading; (2)the helper received
+ *        SIGTERM/SIGINT; (3)the local loop crashed.  In case of events 1 and 2
+ *        the helper kills the interpreter loop.  When the interpreter loop
+ *        crashed (event 3), the helper should send a SIGTERM to its own process
+ *        group; this behaviour will help terminate any child processes the loop
+ *        has started and prevents them from leaking and running forever.
+ *
+ * @author t3sserakt
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in>
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testing_lib.h"
+#include "testing_api_loop.h"
+#include "testing_cmds.h"
+#include "testing_api_topology.h"
+
+/**
+ * Generic logging shortcut
+ */
+#define LOG(kind, ...) GNUNET_log (kind, __VA_ARGS__)
+
+/**
+ * Debug logging shorthand
+ */
+#define LOG_DEBUG(...) LOG (GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__)
+
+/**
+ * Context for a single write on a chunk of memory
+ */
+struct WriteContext
+{
+
+  struct WriteContext *next;
+
+  struct WriteContext *prev;
+
+  /**
+   * The data to write
+   */
+  void *data;
+
+  /**
+   * The length of the data
+   */
+  size_t length;
+
+  /**
+   * The current position from where the write operation should begin
+   */
+  size_t pos;
+};
+
+
+static struct WriteContext *wc_head;
+
+static struct WriteContext *wc_tail;
+
+static struct GNUNET_TESTING_Interpreter *is;
+
+static const char *my_node_id;
+
+/**
+ * Plugin to dynamically load a test case.
+ */
+static struct GNUNET_TESTING_PluginFunctions *plugin;
+
+/**
+ * Name of our plugin.
+ */
+static char *plugin_name;
+
+/**
+ * The loaded topology.
+ */
+  struct GNUNET_TESTING_NetjailTopology *njt;
+
+/**
+ * Our message stream tokenizer
+ */
+static struct GNUNET_MessageStreamTokenizer *tokenizer;
+
+/**
+ * Disk handle from stdin
+ */
+static struct GNUNET_DISK_FileHandle *stdin_fd;
+
+/**
+ * Disk handle for stdout
+ */
+static struct GNUNET_DISK_FileHandle *stdout_fd;
+
+/**
+ * Task identifier for the read task
+ */
+static struct GNUNET_SCHEDULER_Task *read_task_id;
+
+/**
+ * Task identifier for the write task
+ */
+static struct GNUNET_SCHEDULER_Task *write_task_id;
+
+/**
+ * Result to return in case we fail
+ */
+static int global_ret;
+
+/**
+ * Set to true once we are finished and should exit
+ * after sending our final message to the parent.
+ */
+static bool finished;
+
+
+/**
+ * Task to shut down cleanly
+ *
+ * @param cls NULL
+ */
+static void
+do_shutdown (void *cls)
+{
+  struct WriteContext *wc;
+
+  if (NULL != read_task_id)
+  {
+    GNUNET_SCHEDULER_cancel (read_task_id);
+    read_task_id = NULL;
+  }
+  if (NULL != write_task_id)
+  {
+    GNUNET_SCHEDULER_cancel (write_task_id);
+    write_task_id = NULL;
+  }
+  while (NULL != (wc = wc_head))
+  {
+    GNUNET_CONTAINER_DLL_remove (wc_head,
+                                 wc_tail,
+                                 wc);
+    GNUNET_free (wc->data);
+    GNUNET_free (wc);
+  }
+  if (NULL != tokenizer)
+  {
+    GNUNET_MST_destroy (tokenizer);
+    tokenizer = NULL;
+  }
+  if (NULL != plugin)
+  {
+    GNUNET_PLUGIN_unload (plugin_name,
+                          plugin);
+  }
+  if (NULL != njt)
+  {
+    GNUNET_TESTING_free_topology (njt);
+    njt = NULL;
+  }
+}
+
+
+/**
+ * Task to write to the standard out
+ *
+ * @param cls the WriteContext
+ */
+static void
+write_task (void *cls)
+{
+  struct WriteContext *wc = wc_head;
+  ssize_t bytes_wrote;
+
+  write_task_id = NULL;
+  if (NULL == wc)
+  {
+    if (finished)
+      GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  bytes_wrote
+    = GNUNET_DISK_file_write (stdout_fd,
+                              wc->data + wc->pos,
+                              wc->length - wc->pos);
+  if (GNUNET_SYSERR == bytes_wrote)
+  {
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
+                         "write");
+    GNUNET_free (wc->data);
+    GNUNET_free (wc);
+    global_ret = EXIT_FAILURE;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  wc->pos += bytes_wrote;
+  if (wc->pos == wc->length)
+  {
+    GNUNET_CONTAINER_DLL_remove (wc_head,
+                                 wc_tail,
+                                 wc);
+    GNUNET_free (wc->data);
+    GNUNET_free (wc);
+  }
+  write_task_id
+    = GNUNET_SCHEDULER_add_write_file (GNUNET_TIME_UNIT_FOREVER_REL,
+                                       stdout_fd,
+                                       &write_task,
+                                       NULL);
+}
+
+
+/**
+ * Callback to write a message to the parent process.
+ *
+ */
+static void
+write_message (const struct GNUNET_MessageHeader *message)
+{
+  struct WriteContext *wc;
+  size_t msg_length = ntohs (message->size);
+
+  wc = GNUNET_new (struct WriteContext);
+  wc->length = msg_length;
+  wc->data = GNUNET_memdup (message,
+                            msg_length);
+  GNUNET_CONTAINER_DLL_insert_tail (wc_head,
+                                    wc_tail,
+                                    wc);
+  if (NULL == write_task_id)
+  {
+    GNUNET_assert (wc_head == wc);
+    write_task_id
+      = GNUNET_SCHEDULER_add_write_file (
+          GNUNET_TIME_UNIT_FOREVER_REL,
+          stdout_fd,
+          &write_task,
+          NULL);
+  }
+}
+
+
+static void
+finished_cb (void *cls,
+             enum GNUNET_GenericReturnValue rv)
+{
+  struct GNUNET_TESTING_CommandLocalFinished reply = {
+    .header.type = htons (GNUNET_MESSAGE_TYPE_CMDS_HELPER_LOCAL_FINISHED),
+    .header.size = htons (sizeof (reply)),
+    .rv = htonl ((uint32_t) rv)
+  };
+
+  (void) cls;
+  finished = true;
+  write_message (&reply.header);
+}
+
+
+static enum GNUNET_GenericReturnValue
+check_helper_init (
+  void *cls,
+  const struct GNUNET_TESTING_CommandHelperInit *msg)
+{
+  uint16_t msize = htons (msg->header.size);
+  uint32_t barrier_count = htonl (msg->barrier_count);
+  size_t bs = barrier_count * sizeof (struct GNUNET_ShortHashCode);
+  size_t left = msize - bs - sizeof (*msg);
+  const struct GNUNET_ShortHashCode *bd
+    = (const struct GNUNET_ShortHashCode *) &msg[1];
+  const char *topo = (const char *) &bd[barrier_count];
+
+  if (msize < bs + sizeof (*msg))
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if ('\0' != topo[left - 1])
+  {
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  return GNUNET_OK;
+}
+
+
+static void
+handle_helper_init (
+  void *cls,
+  const struct GNUNET_TESTING_CommandHelperInit *msg)
+{
+  uint16_t msize = htons (msg->header.size);
+  uint32_t barrier_count = htonl (msg->barrier_count);
+  size_t bs = barrier_count * sizeof (struct GNUNET_ShortHashCode);
+  size_t left = msize - bs - sizeof (*msg);
+  const struct GNUNET_ShortHashCode *bd
+    = (const struct GNUNET_ShortHashCode *) &msg[1];
+  const char *topo = (const char *) &bd[barrier_count];
+
+
+  GNUNET_assert ('\0' == topo[left - 1]);
+  njt = GNUNET_TESTING_get_topo_from_string_ (topo);
+  if (NULL == njt)
+  {
+    GNUNET_break_op (0);
+    global_ret = EXIT_FAILURE;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  plugin_name = GNUNET_TESTING_get_plugin_from_topo (njt,
+                                                     my_node_id);
+  plugin = GNUNET_PLUGIN_load (plugin_name,
+                               (void *) my_node_id);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Starting plugin `%s' for node %s\n",
+              plugin_name,
+              my_node_id);
+  if (NULL == plugin)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Plugin `%s' not found!\n",
+                plugin_name);
+    global_ret = EXIT_FAILURE;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  struct GNUNET_TESTING_Command *commands = plugin->cls;
+  unsigned int i;
+
+  for (i = 0; NULL != commands[i].run; i++)
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "helper %s\n",
+              commands[i].label.value);
+  is = plugin->start_testcase (plugin->cls,
+                               topo,
+                               barrier_count,
+                               bd,
+                               &write_message,
+                               &finished_cb,
+                               NULL);
+}
+
+
+static void
+handle_helper_barrier_crossable (
+  void *cls,
+  const struct GNUNET_TESTING_CommandBarrierSatisfied *cbs)
+{
+  struct GNUNET_TESTING_Barrier *barrier;
+
+  if (NULL == is)
+  {
+    /* Barrier satisfied *before* helper_init?! */
+    GNUNET_break_op (0);
+    global_ret = EXIT_FAILURE;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  barrier = GNUNET_TESTING_get_barrier2_ (is,
+                                          &cbs->barrier_key);
+  if (barrier->satisfied)
+  {
+    /* Barrier satisfied *twice* is strange... */
+    GNUNET_break_op (0);
+    global_ret = EXIT_FAILURE;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  barrier->satisfied = true;
+  GNUNET_TESTING_loop_notify_children_ (is,
+                                        &cbs->header);
+  for (unsigned int i = 0; i<barrier->cnt_waiting; i++)
+    GNUNET_TESTING_async_finish (barrier->waiting[i]);
+  GNUNET_array_grow (barrier->waiting,
+                     barrier->cnt_waiting,
+                     0);
+}
+
+
+/**
+ * Functions with this signature are called whenever a
+ * complete message is received by the tokenizer.
+ *
+ * Do not call #GNUNET_mst_destroy() in this callback
+ *
+ * @param cls identification of the client
+ * @param message the actual message
+ * @return #GNUNET_OK on success,
+ *    #GNUNET_NO to stop further processing (no error)
+ *    #GNUNET_SYSERR to stop further processing with error
+ */
+static enum GNUNET_GenericReturnValue
+tokenizer_cb (void *cls,
+              const struct GNUNET_MessageHeader *message)
+{
+  struct GNUNET_MQ_MessageHandler handlers[] = {
+    GNUNET_MQ_hd_var_size (
+      helper_init,
+      GNUNET_MESSAGE_TYPE_CMDS_HELPER_INIT,
+      struct GNUNET_TESTING_CommandHelperInit,
+      NULL),
+    GNUNET_MQ_hd_fixed_size (
+      helper_barrier_crossable,
+      GNUNET_MESSAGE_TYPE_CMDS_HELPER_BARRIER_CROSSABLE,
+      struct GNUNET_TESTING_CommandBarrierSatisfied,
+      NULL),
+    GNUNET_MQ_handler_end ()
+  };
+
+  return GNUNET_MQ_handle_message (handlers,
+                                   message);
+}
+
+
+/**
+ * Task to read from stdin
+ *
+ * @param cls NULL
+ */
+static void
+read_task (void *cls)
+{
+  char buf[GNUNET_MAX_MESSAGE_SIZE];
+  ssize_t sread;
+
+  read_task_id = NULL;
+  sread = GNUNET_DISK_file_read (stdin_fd,
+                                 buf,
+                                 sizeof(buf));
+  if (GNUNET_SYSERR == sread)
+  {
+    GNUNET_break (0);
+    global_ret = EXIT_FAILURE;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  if (0 == sread)
+  {
+    LOG_DEBUG ("STDIN eof\n");
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  if (GNUNET_OK !=
+      GNUNET_MST_from_buffer (tokenizer,
+                              buf,
+                              sread,
+                              GNUNET_NO,
+                              GNUNET_NO))
+  {
+    GNUNET_break (0);
+    global_ret = EXIT_FAILURE;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
+  read_task_id
+    = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
+                                      stdin_fd,
+                                      &read_task,
+                                      NULL);
+}
+
+
+/**
+ * Main function that will be run.
+ *
+ * @param cls closure
+ * @param args remaining command-line arguments
+ * @param cfgfile name of the configuration file used (for saving, can be NULL!)
+ * @param cfg configuration
+ */
+static void
+run (void *cls,
+     char *const *args,
+     const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  if (NULL == args[0])
+  {
+    /* must be called with our node ID as 1st argument */
+    GNUNET_break_op (0);
+    global_ret = EXIT_INVALIDARGUMENT;
+    return;
+  }
+  my_node_id = args[0];
+  tokenizer = GNUNET_MST_create (&tokenizer_cb,
+                                 NULL);
+  stdin_fd = GNUNET_DISK_get_handle_from_native (stdin);
+  stdout_fd = GNUNET_DISK_get_handle_from_native (stdout);
+  read_task_id = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
+                                                 stdin_fd,
+                                                 &read_task,
+                                                 NULL);
+  GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
+                                 NULL);
+}
+
+
+/**
+ * Main function
+ *
+ * @param argc the number of command line arguments
+ * @param argv command line arg array
+ * @return return code
+ */
+int
+main (int argc,
+      char **argv)
+{
+  struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_OPTION_END
+  };
+  enum GNUNET_GenericReturnValue ret;
+
+  ret = GNUNET_PROGRAM_run (argc,
+                            argv,
+                            "gnunet-cmds-helper",
+                            "Helper for starting a local interpreter loop",
+                            options,
+                            &run,
+                            NULL);
+  if (GNUNET_OK != ret)
+    return 1;
+  return global_ret;
+}
+
+
+/* end of gnunet-cmds-helper.c */
diff --git a/src/lib/testing/gnunet-testing-netjail-launcher.c b/src/lib/testing/gnunet-testing-netjail-launcher.c
new file mode 100644
index 000000000..2d425207e
--- /dev/null
+++ b/src/lib/testing/gnunet-testing-netjail-launcher.c
@@ -0,0 +1,87 @@
+/*
+      This file is part of GNUnet
+      Copyright (C) 2021 GNUnet e.V.
+
+      GNUnet is free software: you can redistribute it and/or modify it
+      under the terms of the GNU Affero General Public License as published
+      by the Free Software Foundation, either version 3 of the License,
+      or (at your option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Affero General Public License for more details.
+
+      You should have received a copy of the GNU Affero General Public License
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+/**
+ * @file testing/gnunet-testing-netjail-launcher.c
+ * @brief Generic program to start testcases in an configurable topology.
+ * @author t3sserakt
+ */
+#include "platform.h"
+#include "gnunet_testing_lib.h"
+#include "gnunet_util_lib.h"
+
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 600)
+
+int
+main (int argc,
+      char *const *argv)
+{
+  char *filename = NULL;
+  char *topology_data = NULL;
+
+  GNUNET_log_setup ("test-netjail",
+                    "INFO",
+                    NULL);
+  if (NULL == argv[1])
+  {
+    GNUNET_break (0);
+    return EXIT_FAILURE;
+  }
+  if (0 == strcmp ("-s", argv[1]))
+  {
+    topology_data = argv[2];
+    if (NULL == topology_data)
+    {
+      GNUNET_break (0);
+      return EXIT_FAILURE;
+    }
+  }
+  else
+  {
+    filename = argv[1];
+  }
+  {
+    struct GNUNET_TESTING_Command commands[] = {
+      NULL == filename
+      ? GNUNET_TESTING_cmd_load_topology_from_string (
+        "load-topology",
+        topology_data)
+      : GNUNET_TESTING_cmd_load_topology_from_file (
+        "load-topology",
+        filename),
+#if FUTURE
+      GNUNET_TESTING_cmd_barrier_create ("peers-started-barrier",
+                                         NUM_PEERS),
+#endif
+      GNUNET_TESTING_cmd_netjail_setup (
+        "netjail-start",
+        GNUNET_TESTING_NETJAIL_START_SCRIPT,
+        "load-topology"),
+      GNUNET_TESTING_cmd_netjail_start_helpers (
+        "netjail-start-testbed",
+        "load-topology",
+        TIMEOUT),
+      GNUNET_TESTING_cmd_end ()
+    };
+
+    return GNUNET_TESTING_main (commands,
+                                TIMEOUT);
+  }
+}
diff --git a/src/lib/testing/meson.build b/src/lib/testing/meson.build
new file mode 100644
index 000000000..83f69b74a
--- /dev/null
+++ b/src/lib/testing/meson.build
@@ -0,0 +1,38 @@
+libgnunettesting_src = [
+                        'testing_api_barrier.c',
+                        'testing_api_cmd_barrier_create.c',
+                        'testing_api_cmd_barrier_reached.c',
+                        'testing_api_cmd_batch.c',
+                        'testing_api_cmd_exec.c',
+                        'testing_api_cmd_finish.c',
+                        'testing_api_cmd_get_topo.c',
+                        'testing_api_cmd_netjail_start.c',
+                        'testing_api_cmd_netjail_start_cmds_helper.c',
+                        'testing_api_cmds.c',
+                        'testing_api_loop.c',
+                        'testing_api_main.c',
+                        'testing_api_traits.c',
+                        'testing_api_topology.c'
+                        ]
+
+libgnunettesting = library('gnunettesting',
+        libgnunettesting_src,
+        soversion: '1',
+        version: '1.1.0',
+        dependencies: [libgnunetutil_dep,
+                       m_dep],
+        include_directories: [incdir, configuration_inc],
+        install: true,
+        install_dir: get_option('libdir'))
+libgnunettesting_dep = declare_dependency(link_with : libgnunettesting)
+pkg.generate(libgnunettesting, url: 'https://www.gnunet.org',
+             description : 'Provides API for gnunet testing')
+
+executable ('gnunet-cmds-helper',
+            ['gnunet-cmds-helper.c'],
+            dependencies: [libgnunettesting_dep,
+                           libgnunetutil_dep,
+                           ],
+            include_directories: [incdir, configuration_inc],
+            install: true,
+            install_dir: get_option('libdir')/'gnunet'/'libexec')
diff --git a/src/lib/testing/test_netjail_api.sh b/src/lib/testing/test_netjail_api.sh
new file mode 100755
index 000000000..d9cb35c28
--- /dev/null
+++ b/src/lib/testing/test_netjail_api.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec ../../../scripts/netjail/netjail_test_master.sh gnunet-testing-netjail-launcher test_netjail_topo.conf # --num-peers=2
diff --git a/src/lib/testing/test_netjail_topo.conf b/src/lib/testing/test_netjail_topo.conf
new file mode 100644
index 000000000..216e3ae7c
--- /dev/null
+++ b/src/lib/testing/test_netjail_topo.conf
@@ -0,0 +1,12 @@
+[DEFAULTS]
+SUBNETS = 1
+CARRIER_SETUP_PROGRAMMS = iptables -A INPUT -p icmp -j DROP;tc qdisc add dev $UPLINK root netm delay 100ms 10ms;
+SUBNET_SETUP_PROGRAMMS = iptables -A INPUT -p icmp -j DROP;tc qdisc add dev $UPLINK root netm delay 100ms 10ms;
+PEER_SETUP_PROGRAMMS = iptables -A INPUT -p icmp -j DROP;tc qdisc add dev $UPLINK root netm delay 100ms 10ms;
+TESTBED_PLUGIN = libgnunet_test_testing_plugin_ping
+CARRIER_PEERS = 1
+SUBNET_PEERS = 1
+
+[BACKBONE]
+CARRIERS = 1
+BACKBONE_PEERS = 1
diff --git a/src/lib/testing/test_testing_api.c b/src/lib/testing/test_testing_api.c
new file mode 100644
index 000000000..bfcc83e74
--- /dev/null
+++ b/src/lib/testing/test_testing_api.c
@@ -0,0 +1,130 @@
+/*
+  This file is part of GNUNET
+  Copyright (C) 2016-2024 GNUnet e.V.
+
+  GNUnet is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 3,
+  or (at your option) any later version.
+
+  GNUnet is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public
+  License along with GNUnet; see the file COPYING.  If not,
+  see <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file testing/test_testing_api.c
+ * @brief testcase to test the testing framework
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testing_lib.h"
+
+
+int
+main (int argc,
+      char *const *argv)
+{
+  struct GNUNET_TESTING_Timer timers[] = {
+    { .prefix = "batch" },
+    { .prefix = NULL }
+  };
+  struct GNUNET_TESTING_Command batch[] = {
+    GNUNET_TESTING_cmd_exec_va ("batch-echo-once",
+                                GNUNET_OS_PROCESS_EXITED,
+                                0,
+                                "echo",
+                                "-n",
+                                "LI",
+                                NULL),
+    GNUNET_TESTING_cmd_exec_va ("batch-echo",
+                                GNUNET_OS_PROCESS_EXITED,
+                                0,
+                                "echo",
+                                "-n",
+                                "LA",
+                                NULL),
+    GNUNET_TESTING_cmd_end ()
+  };
+  struct GNUNET_TESTING_Command netjail[] = {
+    GNUNET_TESTING_cmd_load_topology_from_file (
+      "load-topology",
+      "test_netjail_topo.conf"), // try "M"
+    GNUNET_TESTING_cmd_end ()
+  };
+  struct GNUNET_TESTING_Command commands[] = {
+    GNUNET_TESTING_cmd_batch ("batch",
+                              batch),
+    GNUNET_TESTING_cmd_rewind_ip ("rewind",
+                                  "batch-echo-once",
+                                  2),
+    GNUNET_TESTING_cmd_barrier_create ("barrier",
+                                       1),
+    GNUNET_TESTING_cmd_barrier_reached ("barrier-reached",
+                                        "barrier"),
+    GNUNET_TESTING_cmd_barrier_create ("barrier3",
+                                       3),
+    GNUNET_TESTING_cmd_make_unblocking (
+      GNUNET_TESTING_cmd_barrier_reached ("barrier3a-reached-nonblocking",
+                                          "barrier3")),
+    GNUNET_TESTING_cmd_make_unblocking (
+      GNUNET_TESTING_cmd_barrier_reached ("barrier3b-reached-nonblocking",
+                                          "barrier3")),
+    GNUNET_TESTING_cmd_barrier_reached ("barrier3c-reached-blocking",
+                                        "barrier3"),
+    GNUNET_TESTING_cmd_finish ("barrier3a-reached-nonblocking-finish",
+                               "barrier3a-reached-nonblocking",
+                               GNUNET_TIME_UNIT_SECONDS),
+    GNUNET_TESTING_cmd_finish ("barrier3b-reached-nonblocking-finish",
+                               "barrier3b-reached-nonblocking",
+                               GNUNET_TIME_UNIT_SECONDS),
+    GNUNET_TESTING_cmd_stat ("stat",
+                             timers),
+    GNUNET_TESTING_cmd_exec_va ("sleep",
+                                GNUNET_OS_PROCESS_EXITED,
+                                0,
+                                "sleep",
+                                "0.01",
+                                NULL),
+    GNUNET_TESTING_cmd_make_unblocking (
+      GNUNET_TESTING_cmd_exec_va ("sleep",
+                                  GNUNET_OS_PROCESS_SIGNALED,
+                                  SIGKILL,
+                                  "sleep",
+                                  "5",
+                                  NULL)),
+    GNUNET_TESTING_cmd_signal ("kill-sleep",
+                               "sleep",
+                               SIGKILL),
+    GNUNET_TESTING_cmd_finish ("wait-sleep",
+                               "sleep",
+                               GNUNET_TIME_UNIT_SECONDS),
+    GNUNET_TESTING_cmd_exec_va ("echo",
+                                GNUNET_OS_PROCESS_EXITED,
+                                0,
+                                "echo",
+                                "-n",
+                                "LA",
+                                NULL),
+    GNUNET_TESTING_cmd_rewind_ip ("rewind",
+                                  "wait-sleep",
+                                  4),
+    GNUNET_TESTING_cmd_batch ("netjail",
+                              netjail),
+    GNUNET_TESTING_cmd_end ()
+  };
+
+  GNUNET_log_setup ("test-testing-api",
+                    "DEBUG",
+                    NULL);
+  return GNUNET_TESTING_main (commands,
+                              GNUNET_TIME_UNIT_MINUTES);
+}
+
+
+/* end of test_testing_api.c */
diff --git a/src/lib/testing/test_testing_plugin_ping.c b/src/lib/testing/test_testing_plugin_ping.c
new file mode 100644
index 000000000..5d8f44fa3
--- /dev/null
+++ b/src/lib/testing/test_testing_plugin_ping.c
@@ -0,0 +1,54 @@
+/*
+      This file is part of GNUnet
+      Copyright (C) 2021 GNUnet e.V.
+
+      GNUnet is free software: you can redistribute it and/or modify it
+      under the terms of the GNU Affero General Public License as published
+      by the Free Software Foundation, either version 3 of the License,
+      or (at your option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Affero General Public License for more details.
+
+      You should have received a copy of the GNU Affero General Public License
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+/**
+ * @file testing/test_testing_plugin_ping.c
+ * @brief a plugin to provide the API for running test cases.
+ * @author t3sserakt
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testing_lib.h"
+
+GNUNET_TESTING_MAKE_PLUGIN (
+  libgnunet_test_testing,
+  ping,
+  GNUNET_TESTING_cmd_exec_va ("ping",
+                              GNUNET_OS_PROCESS_EXITED,
+                              0,
+                              "ping",
+                              "-c1",
+                              (0 == strcmp (strchr (my_node_id,
+                                                    '-'),
+                                            "-0001"))
+                              ? "127.0.0.1"
+                              : "127.0.0.2",
+                              NULL),
+  GNUNET_TESTING_cmd_barrier_create ("barrier",
+                                     1)
+#if LATER
+  GNUNET_TESTING_cmd_barrier_reached ("label",
+                                      "peers-started-barrier"
+                                      ),
+  // peer runs here!
+#endif
+  )
+
+/* end of test_testing_plugin_ping.c */
diff --git a/src/service/testing/testing.conf b/src/lib/testing/testing.conf
index 7e25f8c13..7e25f8c13 100644
--- a/src/service/testing/testing.conf
+++ b/src/lib/testing/testing.conf
diff --git a/src/lib/testing/testing_api_barrier.c b/src/lib/testing/testing_api_barrier.c
new file mode 100644
index 000000000..51dd85f91
--- /dev/null
+++ b/src/lib/testing/testing_api_barrier.c
@@ -0,0 +1,51 @@
+/*
+      This file is part of GNUnet
+      Copyright (C) 2024 GNUnet e.V.
+
+      GNUnet is free software: you can redistribute it and/or modify it
+      under the terms of the GNU Affero General Public License as published
+      by the Free Software Foundation, either version 3 of the License,
+      or (at your option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Affero General Public License for more details.
+
+      You should have received a copy of the GNU Affero General Public License
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+/**
+ * @file testing/barrier.c
+ * @brief convenience API for writing testcases for GNUnet
+ *        Many testcases need to start and stop a peer/service
+ *        and this library is supposed to make that easier
+ *        for TESTCASES.  Normal programs should always
+ *        use functions from gnunet_{util,arm}_lib.h.  This API is
+ *        ONLY for writing testcases (or internal use of the testbed).
+ * @author Christian Grothoff
+ *
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testing_lib.h"
+#include "testing_api_barrier.h"
+
+
+void
+GNUNET_TESTING_barrier_name_hash_ (
+  const char *barrier_name,
+  struct GNUNET_ShortHashCode *bkey)
+{
+  struct GNUNET_HashCode hc;
+
+  GNUNET_CRYPTO_hash (barrier_name,
+                      strlen (barrier_name),
+                      &hc);
+  memcpy (bkey,
+          &hc,
+          sizeof (*bkey));
+}
diff --git a/src/lib/testing/testing_api_barrier.h b/src/lib/testing/testing_api_barrier.h
new file mode 100644
index 000000000..4ed25783c
--- /dev/null
+++ b/src/lib/testing/testing_api_barrier.h
@@ -0,0 +1,81 @@
+/*
+      This file is part of GNUnet
+      Copyright (C) 2022 GNUnet e.V.
+
+      GNUnet is free software: you can redistribute it and/or modify it
+      under the terms of the GNU Affero General Public License as published
+      by the Free Software Foundation, either version 3 of the License,
+      or (at your option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Affero General Public License for more details.
+
+      You should have received a copy of the GNU Affero General Public License
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+/**
+ * @file barrier.h
+ * @brief API to manage barriers.
+ * @author t3sserakt
+ */
+
+#ifndef TESTING_API_BARRIER_H
+#define TESTING_API_BARRIER_H
+
+/**
+ * An entry for a barrier list
+ */
+struct GNUNET_TESTING_Barrier
+{
+
+  struct GNUNET_ShortHashCode barrier_id;
+
+  /**
+   * Context of barrier reached commands of our local interpreter that are
+   * currently blocked on this barrier.
+   */
+  struct GNUNET_TESTING_AsyncContext **waiting;
+
+  /**
+   * Length of the @e waiting array.
+   */
+  unsigned int cnt_waiting;
+
+  /**
+   * Number of total commands expected to be reached by the barrier.
+   */
+  unsigned int expected_reaches;
+
+  /**
+   * Number of times the barrier has been reached.
+   * Only used if @e inherited is false.
+   */
+  unsigned int reached;
+
+  /**
+   * Did we inherit the barrier from our parent loop?
+   */
+  bool inherited;
+
+  /**
+   * Did we reach @e expected_reaches? Used in particular if
+   * @e inherited is true and we cannot compute locally.
+   */
+  bool satisfied;
+
+};
+
+
+void
+GNUNET_TESTING_barrier_name_hash_ (
+  const char *barrier_name,
+  struct GNUNET_ShortHashCode *bkey);
+
+
+#endif
+/* end of barrier.h */
diff --git a/src/lib/testing/testing_api_cmd_barrier_create.c b/src/lib/testing/testing_api_cmd_barrier_create.c
new file mode 100644
index 000000000..353dd37bc
--- /dev/null
+++ b/src/lib/testing/testing_api_cmd_barrier_create.c
@@ -0,0 +1,106 @@
+/*
+      This file is part of GNUnet
+      Copyright (C) 2022 GNUnet e.V.
+
+      GNUnet is free software: you can redistribute it and/or modify it
+      under the terms of the GNU Affero General Public License as published
+      by the Free Software Foundation, either version 3 of the License,
+      or (at your option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Affero General Public License for more details.
+
+      You should have received a copy of the GNU Affero General Public License
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+/**
+ * @file testing/testing_api_cmd_barrier.c
+ * @brief Barrier functionality.
+ * @author t3sserakt
+ */
+#include "platform.h"
+#include "gnunet_testing_lib.h"
+#include "testing_api_barrier.h"
+#include "testing_api_loop.h"
+
+
+/**
+ * Offer internal data from a "barrier" CMD, to other commands.
+ *
+ * @param cls closure.
+ * @param[out] ret result.
+ * @param trait name of the trait.
+ * @param index index number of the object to offer.
+ * @return #GNUNET_OK on success.
+ */
+static enum GNUNET_GenericReturnValue
+barrier_traits (void *cls,
+                const void **ret,
+                const char *trait,
+                unsigned int index)
+{
+  struct GNUNET_TESTING_Trait traits[] = {
+    GNUNET_TESTING_trait_end ()
+  };
+
+  return GNUNET_TESTING_get_trait (traits,
+                                   ret,
+                                   trait,
+                                   index);
+}
+
+
+/**
+ * Cleanup the state from a "barrier" CMD, and possibly
+ * cancel a pending operation thereof.
+ *
+ * @param cls closure.
+ */
+static void
+barrier_cleanup (void *cls)
+{
+  struct GNUNET_TESTING_Barrier *barrier = cls;
+
+  GNUNET_free (barrier);
+}
+
+
+/**
+ * Run the command.
+ *
+ * @param cls closure.
+ * @param is the interpreter state.
+ */
+static void
+barrier_run (void *cls,
+             struct GNUNET_TESTING_Interpreter *is)
+{
+  struct GNUNET_TESTING_Barrier *barrier = cls;
+
+  GNUNET_TESTING_add_barrier_ (is,
+                               barrier);
+}
+
+
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_barrier_create (
+  const char *label,
+  unsigned int number_to_be_reached)
+{
+  struct GNUNET_TESTING_Barrier *barrier;
+
+  barrier = GNUNET_new (struct GNUNET_TESTING_Barrier);
+  GNUNET_TESTING_barrier_name_hash_ (label,
+                                     &barrier->barrier_id);
+  barrier->expected_reaches = number_to_be_reached;
+  return GNUNET_TESTING_command_new (barrier,
+                                     label,
+                                     &barrier_run,
+                                     &barrier_cleanup,
+                                     &barrier_traits);
+}
diff --git a/src/lib/testing/testing_api_cmd_barrier_reached.c b/src/lib/testing/testing_api_cmd_barrier_reached.c
new file mode 100644
index 000000000..35d3cbcd9
--- /dev/null
+++ b/src/lib/testing/testing_api_cmd_barrier_reached.c
@@ -0,0 +1,189 @@
+/*
+      This file is part of GNUnet
+      Copyright (C) 2022 GNUnet e.V.
+
+      GNUnet is free software: you can redistribute it and/or modify it
+      under the terms of the GNU Affero General Public License as published
+      by the Free Software Foundation, either version 3 of the License,
+      or (at your option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Affero General Public License for more details.
+
+      You should have received a copy of the GNU Affero General Public License
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+/**
+ * @file testing/testing_api_cmd_barrier_reached.c
+ * @brief Command to signal barrier was reached.
+ * @author t3sserakt
+ */
+#include "platform.h"
+#include "gnunet_testing_lib.h"
+#include "testing_api_loop.h"
+#include "testing_cmds.h"
+
+/**
+ * Generic logging shortcut
+ */
+#define LOG(kind, ...) GNUNET_log (kind, __VA_ARGS__)
+
+/**
+ * Struct with information for callbacks.
+ *
+ */
+struct BarrierReachedState
+{
+  /**
+   * Context for our asynchronous completion.
+   */
+  struct GNUNET_TESTING_AsyncContext ac;
+
+  /**
+   * The label of this command.
+   */
+  const char *label;
+
+  /**
+   * The name of the barrier this commands wait (if finishing asynchronous) for or/and reaches.
+   */
+  const char *barrier_name;
+
+};
+
+
+/**
+ * Run the command.
+ *
+ * @param cls closure.
+ * @param is the interpreter state.
+ */
+static void
+barrier_reached_run (void *cls,
+                     struct GNUNET_TESTING_Interpreter *is)
+{
+  struct BarrierReachedState *brs = cls;
+  struct GNUNET_TESTING_Barrier *barrier;
+
+  barrier = GNUNET_TESTING_get_barrier_ (is,
+                                         brs->barrier_name);
+  if (NULL == barrier)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "No barrier `%s'\n",
+                brs->barrier_name);
+    GNUNET_TESTING_async_fail (&brs->ac);
+    return;
+  }
+  if (barrier->satisfied)
+  {
+    GNUNET_TESTING_async_finish (&brs->ac);
+    return;
+  }
+  if (barrier->inherited)
+  {
+    struct GNUNET_TESTING_CommandBarrierReached cbr = {
+      .header.size = htons (sizeof (cbr)),
+      .header.type = htons (GNUNET_MESSAGE_TYPE_CMDS_HELPER_BARRIER_REACHED)
+    };
+
+    GNUNET_TESTING_barrier_name_hash_ (brs->barrier_name,
+                                       &cbr.barrier_key);
+    GNUNET_TESTING_loop_notify_parent_ (is,
+                                        &cbr.header);
+    return;
+  }
+  barrier->reached++;
+  if (barrier->reached == barrier->expected_reaches)
+  {
+    struct GNUNET_TESTING_CommandBarrierSatisfied cbs = {
+      .header.size = htons (sizeof (cbs)),
+      .header.type = htons (GNUNET_MESSAGE_TYPE_CMDS_HELPER_BARRIER_CROSSABLE)
+    };
+
+    GNUNET_TESTING_barrier_name_hash_ (brs->barrier_name,
+                                       &cbs.barrier_key);
+    barrier->satisfied = true;
+    GNUNET_TESTING_loop_notify_children_ (is,
+                                          &cbs.header);
+  }
+  if (barrier->satisfied)
+  {
+    GNUNET_TESTING_async_finish (&brs->ac);
+    for (unsigned int i = 0; i<barrier->cnt_waiting; i++)
+      GNUNET_TESTING_async_finish (barrier->waiting[i]);
+    GNUNET_array_grow (barrier->waiting,
+                       barrier->cnt_waiting,
+                       0);
+    return;
+  }
+  GNUNET_array_append (barrier->waiting,
+                       barrier->cnt_waiting,
+                       &brs->ac);
+}
+
+
+/**
+ * Cleanup the state from a "barrier reached" CMD, and possibly
+ * cancel a pending operation thereof.
+ *
+ * @param cls closure.
+ */
+static void
+barrier_reached_cleanup (void *cls)
+{
+  struct BarrierReachedState *brs = cls;
+
+  GNUNET_free (brs);
+}
+
+
+/**
+ * Offer internal data from a "batch" CMD, to other commands.
+ *
+ * @param cls closure.
+ * @param[out] ret result.
+ * @param trait name of the trait.
+ * @param index index number of the object to offer.
+ * @return #GNUNET_OK on success.
+ */
+static enum GNUNET_GenericReturnValue
+barrier_reached_traits (void *cls,
+                        const void **ret,
+                        const char *trait,
+                        unsigned int index)
+{
+  struct GNUNET_TESTING_Trait traits[] = {
+    GNUNET_TESTING_trait_end ()
+  };
+
+  return GNUNET_TESTING_get_trait (traits,
+                                   ret,
+                                   trait,
+                                   index);
+}
+
+
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_barrier_reached (
+  const char *label,
+  const char *barrier_label)
+{
+  struct BarrierReachedState *brs;
+
+  brs = GNUNET_new (struct BarrierReachedState);
+  brs->label = label;
+  brs->barrier_name = barrier_label;
+  return GNUNET_TESTING_command_new_ac (
+    brs,
+    label,
+    &barrier_reached_run,
+    &barrier_reached_cleanup,
+    &barrier_reached_traits,
+    &brs->ac);
+}
diff --git a/src/service/testing/testing_api_cmd_batch.c b/src/lib/testing/testing_api_cmd_batch.c
index 2f1faf288..f4e866b78 100644
--- a/src/service/testing/testing_api_cmd_batch.c
+++ b/src/lib/testing/testing_api_cmd_batch.c
@@ -25,8 +25,9 @@
  * @author t3sserakt
  */
 #include "platform.h"
-#include "gnunet_testing_ng_lib.h"
-#include "testing.h"
+#include "gnunet_testing_lib.h"
+#include "testing_api_cmd_batch.h"
+#include "testing_api_loop.h"
 
 /**
  * State for a "batch" CMD.
@@ -61,26 +62,25 @@ batch_run (void *cls,
            struct GNUNET_TESTING_Interpreter *is)
 {
   struct BatchState *bs = cls;
+  struct GNUNET_TESTING_Command *cmd;
 
-  if (NULL != bs->batch[bs->batch_ip].run)
+  cmd = &bs->batch[bs->batch_ip];
+  if (NULL != cmd->run)
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Running batched command: %s\n",
-                bs->batch[bs->batch_ip].label.value);
+                cmd->label.value);
 
   /* hit end command, leap to next top-level command.  */
-  if (NULL == bs->batch[bs->batch_ip].run)
+  if (NULL == cmd->run)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Exiting from batch: %s\n",
                 bs->label.value);
+    GNUNET_TESTING_interpreter_next_ (is);
     return;
   }
-  bs->batch[bs->batch_ip].start_time
-    = bs->batch[bs->batch_ip].last_req_time
-      = GNUNET_TIME_absolute_get ();
-  bs->batch[bs->batch_ip].num_tries = 1;
-  bs->batch[bs->batch_ip].run (bs->batch[bs->batch_ip].cls,
-                               is);
+  GNUNET_TESTING_interpreter_run_cmd_ (is,
+                                       cmd);
 }
 
 
@@ -120,14 +120,9 @@ batch_traits (void *cls,
               unsigned int index)
 {
   struct BatchState *bs = cls;
-  // FIXME: these constants should be more global!
-#define CURRENT_CMD_INDEX 0
-#define BATCH_INDEX 1
   struct GNUNET_TESTING_Trait traits[] = {
-    GNUNET_TESTING_make_trait_cmd (CURRENT_CMD_INDEX,
-                                   &bs->batch[bs->batch_ip]),
-    GNUNET_TESTING_make_trait_cmd (BATCH_INDEX,
-                                   bs->batch),
+    GNUNET_TESTING_make_trait_cmd (&bs->batch[bs->batch_ip]),
+    GNUNET_TESTING_make_trait_batch_cmds (&bs->batch),
     GNUNET_TESTING_trait_end ()
   };
 
@@ -175,7 +170,7 @@ GNUNET_TESTING_cmd_batch (const char *label,
                                      label,
                                      &batch_run,
                                      &batch_cleanup,
-                                     &batch_traits, NULL);
+                                     &batch_traits);
 }
 
 
@@ -183,13 +178,24 @@ bool
 GNUNET_TESTING_cmd_batch_next_ (void *cls)
 {
   struct BatchState *bs = cls;
+  struct GNUNET_TESTING_Command *bcmd = &bs->batch[bs->batch_ip];
 
-  if (NULL == bs->batch[bs->batch_ip].run)
-    return false;
-  bs->batch[bs->batch_ip].finish_time
-    = GNUNET_TIME_absolute_get ();
+  if (NULL == bcmd->run)
+    return true; /* this batch is done */
+  if (GNUNET_TESTING_cmd_is_batch_ (bcmd))
+  {
+    if (GNUNET_TESTING_cmd_batch_next_ (bcmd->cls))
+    {
+      /* sub-batch is done */
+      bcmd->finish_time = GNUNET_TIME_absolute_get ();
+      bs->batch_ip++;
+      return false;
+    }
+  }
+  /* Simple command is done */
+  bcmd->finish_time = GNUNET_TIME_absolute_get ();
   bs->batch_ip++;
-  return true;
+  return false;
 }
 
 
@@ -211,13 +217,16 @@ GNUNET_TESTING_cmd_batch_get_current_ (const struct GNUNET_TESTING_Command *cmd)
 
 
 void
-GNUNET_TESTING_cmd_batch_set_current_ (const struct GNUNET_TESTING_Command *cmd,
-                                       unsigned int new_ip)
+GNUNET_TESTING_cmd_batch_set_current_ (
+  const struct GNUNET_TESTING_Command *cmd,
+  unsigned int new_ip)
 {
   struct BatchState *bs = cmd->cls;
 
   /* sanity checks */
-  GNUNET_assert (GNUNET_TESTING_cmd_is_batch_ (cmd));
+  GNUNET_assert (cmd->run == &batch_run);
+  for (unsigned int i = 0; i < new_ip; i++)
+    GNUNET_assert (NULL != bs->batch[i].run);
   /* actual logic */
   bs->batch_ip = new_ip;
 }
diff --git a/src/lib/testing/testing_api_cmd_batch.h b/src/lib/testing/testing_api_cmd_batch.h
new file mode 100644
index 000000000..f9f54c6cb
--- /dev/null
+++ b/src/lib/testing/testing_api_cmd_batch.h
@@ -0,0 +1,72 @@
+/*
+      This file is part of GNUnet
+      Copyright (C) 2022 GNUnet e.V.
+
+      GNUnet is free software: you can redistribute it and/or modify it
+      under the terms of the GNU Affero General Public License as published
+      by the Free Software Foundation, either version 3 of the License,
+      or (at your option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Affero General Public License for more details.
+
+      You should have received a copy of the GNU Affero General Public License
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+/**
+ * @file testing_api_cmd_batch.h
+ * @brief
+ * @author t3sserakt
+ */
+#ifndef TESTING_API_CMD_BATCH_H
+#define TESTING_API_CMD_BATCH_H
+
+
+/**
+ * Test if this command is a batch command.
+ *
+ * @return false if not, true if it is a batch command
+ */
+bool
+GNUNET_TESTING_cmd_is_batch_ (
+  const struct GNUNET_TESTING_Command *cmd);
+
+
+/**
+ * Advance internal pointer to next command.
+ *
+ * @param cls batch internal state
+ * @return true if we could advance, false if the batch
+ *         has completed and cannot advance anymore
+ */
+bool
+GNUNET_TESTING_cmd_batch_next_ (void *cls);
+
+
+/**
+ * Obtain what command the batch is at.
+ *
+ * @return cmd current batch command
+ */
+struct GNUNET_TESTING_Command *
+GNUNET_TESTING_cmd_batch_get_current_ (
+  const struct GNUNET_TESTING_Command *cmd);
+
+
+/**
+ * Set what command the batch should be at.
+ *
+ * @param cmd current batch command
+ * @param new_ip where to move the IP
+ */
+void
+GNUNET_TESTING_cmd_batch_set_current_ (
+  const struct GNUNET_TESTING_Command *cmd,
+  unsigned int new_ip);
+
+#endif
diff --git a/src/lib/testing/testing_api_cmd_exec.c b/src/lib/testing/testing_api_cmd_exec.c
new file mode 100644
index 000000000..3a931e220
--- /dev/null
+++ b/src/lib/testing/testing_api_cmd_exec.c
@@ -0,0 +1,254 @@
+/*
+      This file is part of GNUnet
+      Copyright (C) 2023 GNUnet e.V.
+
+      GNUnet is free software: you can redistribute it and/or modify it
+      under the terms of the GNU Affero General Public License as published
+      by the Free Software Foundation, either version 3 of the License,
+      or (at your option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Affero General Public License for more details.
+
+      You should have received a copy of the GNU Affero General Public License
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+/**
+ * @file testing_api_cmd_exec.c
+ * @brief cmd to block the interpreter loop until all peers started.
+ * @author t3sserakt
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testing_lib.h"
+
+#define LOG(kind, ...) GNUNET_log (kind, __VA_ARGS__)
+
+struct BashScriptState
+{
+  /**
+   * Context for our asynchronous completion.
+   */
+  struct GNUNET_TESTING_AsyncContext ac;
+
+  /**
+   * Callback handed over to the command, which should
+   * be called upon death or completion of the script.
+   */
+  GNUNET_ChildCompletedCallback cb;
+
+  /**
+   * Wait for death of @e start_proc.
+   */
+  struct GNUNET_ChildWaitHandle *cwh;
+
+  /**
+  * The process id of the script.
+  */
+  struct GNUNET_OS_Process *start_proc;
+
+  /**
+   * NULL-terminated array of command-line arguments.
+   */
+  char **args;
+
+  /**
+   *
+   */
+  enum GNUNET_OS_ProcessStatusType expected_type;
+
+  /**
+   *
+   */
+  unsigned long int expected_exit_code;
+
+};
+
+/**
+ * The cleanup function of this cmd frees resources the cmd allocated.
+ *
+ */
+static void
+exec_bash_script_cleanup (void *cls)
+{
+  struct BashScriptState *bss = cls;
+
+  if (NULL != bss->cwh)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Cancel child\n");
+    GNUNET_wait_child_cancel (bss->cwh);
+    bss->cwh = NULL;
+  }
+  if (NULL != bss->start_proc)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Kill process\n");
+    GNUNET_assert (0 ==
+                   GNUNET_OS_process_kill (bss->start_proc,
+                                           SIGKILL));
+    GNUNET_assert (GNUNET_OK ==
+                   GNUNET_OS_process_wait (bss->start_proc));
+    GNUNET_OS_process_destroy (bss->start_proc);
+    bss->start_proc = NULL;
+  }
+  for (unsigned int i = 0; NULL != bss->args[i]; i++)
+    GNUNET_free (bss->args[i]);
+  GNUNET_free (bss->args);
+  GNUNET_free (bss);
+}
+
+
+/**
+ * Callback which will be called if the setup script finished.
+ *
+ */
+static void
+child_completed_callback (void *cls,
+                          enum GNUNET_OS_ProcessStatusType type,
+                          long unsigned int exit_code)
+{
+  struct BashScriptState *bss = cls;
+
+  bss->cwh = NULL;
+  GNUNET_OS_process_destroy (bss->start_proc);
+  bss->start_proc = NULL;
+  if ( (bss->expected_type != type) ||
+       (bss->expected_exit_code != exit_code) )
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Child failed with error %lu (wanted %lu) %d/%d!\n",
+                exit_code,
+                bss->expected_exit_code,
+                type,
+                bss->expected_type);
+    GNUNET_TESTING_async_fail (&bss->ac);
+    return;
+  }
+  GNUNET_TESTING_async_finish (&bss->ac);
+}
+
+
+/**
+ * Run method of the command created by the interpreter to wait for another
+ * command to finish.
+ *
+ */
+static void
+exec_bash_script_run (void *cls,
+                      struct GNUNET_TESTING_Interpreter *is)
+{
+  struct BashScriptState *bss = cls;
+
+  GNUNET_assert (NULL == bss->cwh);
+  bss->start_proc
+    = GNUNET_OS_start_process_vap (
+        GNUNET_OS_INHERIT_STD_ERR,
+        NULL,
+        NULL,
+        NULL,
+        bss->args[0],
+        bss->args);
+  bss->cwh = GNUNET_wait_child (bss->start_proc,
+                                &child_completed_callback,
+                                bss);
+  GNUNET_break (NULL != bss->cwh);
+}
+
+
+/**
+ * This function prepares an array with traits.
+ */
+static enum GNUNET_GenericReturnValue
+traits (void *cls,
+        const void **ret,
+        const char *trait,
+        unsigned int index)
+{
+  struct BashScriptState *bss = cls;
+  struct GNUNET_TESTING_Trait traits[] = {
+    GNUNET_TESTING_make_trait_process (&bss->start_proc),
+    GNUNET_TESTING_trait_end ()
+  };
+
+  return GNUNET_TESTING_get_trait (traits,
+                                   ret,
+                                   trait,
+                                   index);
+}
+
+
+const struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_exec (
+  const char *label,
+  enum GNUNET_OS_ProcessStatusType expected_type,
+  unsigned long int expected_exit_code,
+  char *const script_argv[])
+{
+  struct BashScriptState *bss;
+  unsigned int cnt;
+
+  cnt = 0;
+  while (NULL != script_argv[cnt])
+    cnt++;
+  bss = GNUNET_new (struct BashScriptState);
+  bss->args = GNUNET_new_array (cnt + 1,
+                                char *);
+  for (unsigned int i = 0; i<cnt; i++)
+    bss->args[i] = GNUNET_strdup (script_argv[i]);
+  bss->expected_type = expected_type;
+  bss->expected_exit_code = expected_exit_code;
+  return GNUNET_TESTING_command_new_ac (
+    bss,
+    label,
+    &exec_bash_script_run,
+    &exec_bash_script_cleanup,
+    &traits,
+    &bss->ac);
+}
+
+
+const struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_exec_va (
+  const char *label,
+  enum GNUNET_OS_ProcessStatusType expected_type,
+  unsigned long int expected_exit_code,
+  ...)
+{
+  struct BashScriptState *bss;
+  va_list ap;
+  const char *arg;
+  unsigned int cnt;
+
+  bss = GNUNET_new (struct BashScriptState);
+  va_start (ap,
+            expected_exit_code);
+  cnt = 1;
+  while (NULL != (arg = va_arg (ap,
+                                const char *)))
+    cnt++;
+  va_end (ap);
+  bss->args = GNUNET_new_array (cnt,
+                                char *);
+  cnt = 0;
+  va_start (ap,
+            expected_exit_code);
+  while (NULL != (arg = va_arg (ap,
+                                const char *)))
+    bss->args[cnt++] = GNUNET_strdup (arg);
+  va_end (ap);
+  bss->expected_type = expected_type;
+  bss->expected_exit_code = expected_exit_code;
+  return GNUNET_TESTING_command_new_ac (
+    bss,
+    label,
+    &exec_bash_script_run,
+    &exec_bash_script_cleanup,
+    &traits,
+    &bss->ac);
+}
diff --git a/src/service/testing/testing_api_cmd_finish.c b/src/lib/testing/testing_api_cmd_finish.c
index e1fc69a09..24642e0b6 100644
--- a/src/service/testing/testing_api_cmd_finish.c
+++ b/src/lib/testing/testing_api_cmd_finish.c
@@ -24,10 +24,7 @@
  */
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_plugin.h"
-#include "gnunet_testing_barrier.h"
-#include "gnunet_testing_netjail_lib.h"
+#include "gnunet_testing_lib.h"
 
 
 /**
@@ -42,12 +39,24 @@ struct FinishState
   void *cls;
 
   /**
-   * Label of the asynchronous command the synchronous command of this closure waits for.
+   * Label of the asynchronous command the synchronous command of this closure
+   * waits for.
    */
   const char *async_label;
 
   /**
-   * Task for running the finish method of the asynchronous task the command is waiting for.
+   * Function to call when async operation is done.
+   */
+  GNUNET_SCHEDULER_TaskCallback old_notify;
+
+  /**
+   * Closure for @e notify_finished.
+   */
+  void *old_notify_cls;
+
+  /**
+   * Task for running the finish method of the asynchronous task the command
+   * is waiting for.
    */
   struct GNUNET_SCHEDULER_Task *finish_task;
 
@@ -77,6 +86,11 @@ done_finish (void *cls)
 
   GNUNET_SCHEDULER_cancel (finish_state->finish_task);
   finish_state->finish_task = NULL;
+  if (NULL != finish_state->old_notify)
+  {
+    finish_state->old_notify (finish_state->old_notify_cls);
+    finish_state->old_notify = NULL;
+  }
   GNUNET_TESTING_async_finish (&finish_state->ac);
 }
 
@@ -106,8 +120,9 @@ timeout_finish (void *cls)
  *
  */
 static void
-run_finish (void *cls,
-            struct GNUNET_TESTING_Interpreter *is)
+run_finish (
+  void *cls,
+  struct GNUNET_TESTING_Interpreter *is)
 {
   struct FinishState *finish_state = cls;
   const struct GNUNET_TESTING_Command *async_cmd;
@@ -121,8 +136,7 @@ run_finish (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Did not find command `%s'\n",
                 finish_state->async_label);
-    GNUNET_TESTING_interpreter_fail (is);
-    return;
+    GNUNET_TESTING_FAIL (is);
   }
   if ( (NULL == (aac = async_cmd->ac)) ||
        (! async_cmd->asynchronous_finish) )
@@ -130,21 +144,24 @@ run_finish (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Cannot finish `%s': not asynchronous\n",
                 finish_state->async_label);
-    GNUNET_TESTING_interpreter_fail (is);
-    return;
+    GNUNET_TESTING_FAIL (is);
   }
-  if (GNUNET_NO != aac->finished)
+  if (aac->finished)
   {
     /* Command is already finished, so are we! */
     GNUNET_TESTING_async_finish (&finish_state->ac);
     return;
   }
+  /* add timeout */
   finish_state->finish_task
     = GNUNET_SCHEDULER_add_delayed (finish_state->timeout,
                                     &timeout_finish,
                                     finish_state);
-  aac->cont = &done_finish;
-  aac->cont_cls = finish_state;
+  /* back up old notification that we will override */
+  finish_state->old_notify = aac->notify_finished;
+  finish_state->old_notify_cls = aac->notify_finished_cls;
+  aac->notify_finished = &done_finish;
+  aac->notify_finished_cls = finish_state;
 }
 
 
@@ -168,24 +185,29 @@ cleanup_finish (void *cls)
 
 
 const struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_finish (const char *finish_label,
-                           const char *cmd_ref,
-                           struct GNUNET_TIME_Relative timeout)
+GNUNET_TESTING_cmd_finish (
+  const char *finish_label,
+  const char *cmd_ref,
+  struct GNUNET_TIME_Relative timeout)
 {
   struct FinishState *finish_state;
 
   finish_state = GNUNET_new (struct FinishState);
   finish_state->async_label = cmd_ref;
   finish_state->timeout = timeout;
-  return GNUNET_TESTING_command_new (finish_state, finish_label,
-                                     &run_finish,
-                                     &cleanup_finish,
-                                     NULL, &finish_state->ac);
+  return GNUNET_TESTING_command_new_ac (
+    finish_state,
+    finish_label,
+    &run_finish,
+    &cleanup_finish,
+    NULL,
+    &finish_state->ac);
 }
 
 
 struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_make_unblocking (struct GNUNET_TESTING_Command cmd)
+GNUNET_TESTING_cmd_make_unblocking (
+  struct GNUNET_TESTING_Command cmd)
 {
   /* do not permit this function to be used on
      a finish command! */
diff --git a/src/lib/testing/testing_api_cmd_get_topo.c b/src/lib/testing/testing_api_cmd_get_topo.c
new file mode 100644
index 000000000..486278489
--- /dev/null
+++ b/src/lib/testing/testing_api_cmd_get_topo.c
@@ -0,0 +1,214 @@
+/*
+      This file is part of GNUnet
+      Copyright (C) 2021 GNUnet e.V.
+
+      GNUnet is free software: you can redistribute it and/or modify it
+      under the terms of the GNU Affero General Public License as published
+      by the Free Software Foundation, either version 3 of the License,
+      or (at your option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Affero General Public License for more details.
+
+      You should have received a copy of the GNU Affero General Public License
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+/**
+ * @file testing/testing_api_cmd_get_topo.c
+ * @brief Command to start the netjail script.
+ * @author t3sserakt
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "testing_api_topology.h"
+
+/**
+ * Generic logging shortcut
+ */
+#define LOG(kind, ...) GNUNET_log_from (kind, "udp-backchannel",__VA_ARGS__)
+
+struct TopologyState
+{
+  /**
+   * The label of the command.
+   */
+  const char *label;
+
+  /**
+   * The topology we parsed.
+   */
+  struct GNUNET_TESTING_NetjailTopology *topology;
+
+  /**
+   * A string with the name of the topology file, if @e read_file is true,
+   * otherwise a string containing the topology data.
+   */
+  const char *topology_string;
+
+  /**
+   * Same as @e topology_string, but set if we need
+   * to release the memory.
+   */
+  char *topology_alloc;
+
+  /**
+   * A string with the name of the topology file.
+   */
+  const char *file_name;
+};
+
+/**
+ * The cleanup function of this cmd frees resources the cmd allocated.
+ *
+ */
+static void
+cleanup (void *cls)
+{
+  struct TopologyState *ts = cls;
+
+  if (NULL != ts->topology)
+  {
+    GNUNET_TESTING_free_topology (ts->topology);
+    ts->topology = NULL;
+  }
+  GNUNET_free (ts->topology_alloc);
+  GNUNET_free (ts);
+}
+
+
+/**
+ * This function prepares an array with traits.
+ */
+static enum GNUNET_GenericReturnValue
+traits (void *cls,
+        const void **ret,
+        const char *trait,
+        unsigned int index)
+{
+  struct TopologyState *ts = cls;
+  struct GNUNET_TESTING_Trait traits[] = {
+    GNUNET_TESTING_make_trait_topology (ts->topology),
+    GNUNET_TESTING_make_trait_topology_string (ts->topology_string),
+    GNUNET_TESTING_trait_end ()
+  };
+
+  return GNUNET_TESTING_get_trait (traits,
+                                   ret,
+                                   trait,
+                                   index);
+}
+
+
+static char *
+get_topo_string_from_file (const char *topology_data_file)
+{
+  uint64_t fs;
+  char *data;
+
+  if (GNUNET_YES !=
+      GNUNET_DISK_file_test (topology_data_file))
+  {
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         "Topology file %s not found\n",
+         topology_data_file);
+    return NULL;
+  }
+  if (GNUNET_OK !=
+      GNUNET_DISK_file_size (topology_data_file,
+                             &fs,
+                             GNUNET_YES,
+                             GNUNET_YES))
+  {
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         "Could not determine size of topology file %s\n",
+         topology_data_file);
+    return NULL;
+  }
+  data = GNUNET_malloc_large (fs + 1);
+  GNUNET_assert (NULL != data);
+  if (fs !=
+      GNUNET_DISK_fn_read (topology_data_file,
+                           data,
+                           fs))
+  {
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         "Topology file %s cannot be read\n",
+         topology_data_file);
+    GNUNET_free (data);
+    return NULL;
+  }
+  return data;
+}
+
+
+/**
+ * The run method starts the script which setup the network namespaces.
+ *
+ * @param cls closure.
+ * @param is interpreter state.
+ */
+static void
+run (void *cls,
+     struct GNUNET_TESTING_Interpreter *is)
+{
+  struct TopologyState *ts = cls;
+
+  if (NULL == ts->topology_string)
+  {
+    ts->topology_alloc
+      = get_topo_string_from_file (ts->file_name);
+    if (NULL == ts->topology_alloc)
+      GNUNET_TESTING_FAIL (is);
+    ts->topology_string = ts->topology_alloc;
+  }
+  ts->topology
+    = GNUNET_TESTING_get_topo_from_string_ (ts->topology_string);
+  if (NULL == ts->topology)
+    GNUNET_TESTING_FAIL (is);
+}
+
+
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_load_topology_from_file (
+  const char *label,
+  const char *file_name)
+{
+  struct TopologyState *ts;
+
+  ts = GNUNET_new (struct TopologyState);
+  ts->label = label;
+  ts->file_name = file_name;
+  return GNUNET_TESTING_command_new_ac (
+    ts,
+    label,
+    &run,
+    &cleanup,
+    traits,
+    NULL);
+}
+
+
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_load_topology_from_string (
+  const char *label,
+  const char *topology_string)
+{
+  struct TopologyState *ts;
+
+  GNUNET_assert (NULL != topology_string);
+  ts = GNUNET_new (struct TopologyState);
+  ts->label = label;
+  ts->topology_string = topology_string;
+  return GNUNET_TESTING_command_new_ac (
+    ts,
+    label,
+    &run,
+    &cleanup,
+    traits,
+    NULL);
+}
diff --git a/src/service/testing/testing_api_cmd_netjail_start.c b/src/lib/testing/testing_api_cmd_netjail_start.c
index f45ab939b..eede2fea6 100644
--- a/src/service/testing/testing_api_cmd_netjail_start.c
+++ b/src/lib/testing/testing_api_cmd_netjail_start.c
@@ -25,12 +25,8 @@
  */
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_plugin.h"
-#include "gnunet_testing_barrier.h"
-#include "gnunet_testing_netjail_lib.h"
-
-#define NETJAIL_START_SCRIPT "netjail_start.sh"
+#include "gnunet_testing_lib.h"
+#include "testing_api_topology.h"
 
 #define LOG(kind, ...) GNUNET_log (kind, __VA_ARGS__)
 
@@ -45,7 +41,6 @@ struct NetJailState
    */
   struct GNUNET_TESTING_AsyncContext ac;
 
-  // Child Wait handle
   struct GNUNET_ChildWaitHandle *cwh;
 
   /**
@@ -56,12 +51,13 @@ struct NetJailState
   /**
    * Configuration file for the test topology.
    */
-  char *topology_config;
+  const char *topology_cmd_label;
 
   /**
-   * Shall we read the topology from file, or from a string.
+   * Start or stop?
    */
-  unsigned int *read_file;
+  const char *script;
+
 };
 
 
@@ -76,18 +72,13 @@ netjail_start_cleanup (void *cls)
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "netjail_start_cleanup!\n");
-
   if (NULL != ns->cwh)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Cancel child\n");
     GNUNET_wait_child_cancel (ns->cwh);
     ns->cwh = NULL;
   }
   if (NULL != ns->start_proc)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Kill process\n");
     GNUNET_assert (0 ==
                    GNUNET_OS_process_kill (ns->start_proc,
                                            SIGKILL));
@@ -102,29 +93,27 @@ netjail_start_cleanup (void *cls)
 
 /**
  * Callback which will be called if the setup script finished.
- *
  */
 static void
 child_completed_callback (void *cls,
                           enum GNUNET_OS_ProcessStatusType type,
-                          long unsigned int exit_code)
+                          unsigned long int exit_code)
 {
   struct NetJailState *ns = cls;
 
   GNUNET_OS_process_destroy (ns->start_proc);
   ns->start_proc = NULL;
   ns->cwh = NULL;
-  if (0 == exit_code)
-  {
-    GNUNET_TESTING_async_finish (&ns->ac);
-  }
-  else
+  if ( (GNUNET_OS_PROCESS_EXITED != type) ||
+       (0 != exit_code) )
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Child failed with error %lu!\n",
                 exit_code);
     GNUNET_TESTING_async_fail (&ns->ac);
+    return;
   }
+  GNUNET_TESTING_async_finish (&ns->ac);
 }
 
 
@@ -139,31 +128,37 @@ netjail_start_run (void *cls,
                    struct GNUNET_TESTING_Interpreter *is)
 {
   struct NetJailState *ns = cls;
+  const struct GNUNET_TESTING_Command *topo_cmd;
   char pid[15];
   enum GNUNET_GenericReturnValue helper_check;
   char *data_dir;
   char *script_name;
-  char *read_file;
-
+  const char *topology_data;
+
+  topo_cmd = GNUNET_TESTING_interpreter_lookup_command (
+    is,
+    ns->topology_cmd_label);
+  if (NULL == topo_cmd)
+    GNUNET_TESTING_FAIL (is);
+  if (GNUNET_OK !=
+      GNUNET_TESTING_get_trait_topology_string (topo_cmd,
+                                                &topology_data))
+    GNUNET_TESTING_FAIL (is);
   data_dir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR);
-  GNUNET_asprintf (&script_name, "%s%s", data_dir, NETJAIL_START_SCRIPT);
-  GNUNET_asprintf (&read_file, "%u", *(ns->read_file));
-
+  GNUNET_asprintf (&script_name,
+                   "%s%s",
+                   data_dir,
+                   ns->script);
   helper_check = GNUNET_OS_check_helper_binary (
     script_name,
-    GNUNET_YES,
+    true,
     NULL);
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "script_name %s\n",
-       script_name);
-
   if (GNUNET_NO == helper_check)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "No SUID for %s!\n",
                 script_name);
-    GNUNET_TESTING_interpreter_fail (is);
+    GNUNET_TESTING_interpreter_skip (is);
     return;
   }
   if (GNUNET_SYSERR == helper_check)
@@ -171,7 +166,7 @@ netjail_start_run (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "%s not found!\n",
                 script_name);
-    GNUNET_TESTING_interpreter_fail (is);
+    GNUNET_TESTING_interpreter_skip (is);
     return;
   }
 
@@ -182,9 +177,9 @@ netjail_start_run (void *cls,
   {
     char *const script_argv[] = {
       script_name,
-      ns->topology_config,
+      (char *) topology_data,
       pid,
-      read_file,
+      "0",
       NULL
     };
 
@@ -201,31 +196,27 @@ netjail_start_run (void *cls,
                                &child_completed_callback,
                                ns);
   GNUNET_break (NULL != ns->cwh);
-  GNUNET_free (read_file);
   GNUNET_free (script_name);
   GNUNET_free (data_dir);
 }
 
 
-/**
- * Create command.
- *
- * @param label name for command.
- * @param topology_config Configuration file for the test topology.
- * @return command.
- */
 struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_netjail_start (const char *label,
-                                  char *topology_config,
-                                  unsigned int *read_file)
+GNUNET_TESTING_cmd_netjail_setup (
+  const char *label,
+  const char *script,
+  const char *topology_cmd_label)
 {
   struct NetJailState *ns;
 
   ns = GNUNET_new (struct NetJailState);
-  ns->topology_config = topology_config;
-  ns->read_file = read_file;
-  return GNUNET_TESTING_command_new (ns, label,
-                                     &netjail_start_run,
-                                     &netjail_start_cleanup,
-                                     NULL, &ns->ac);
+  ns->script = script;
+  ns->topology_cmd_label = topology_cmd_label;
+  return GNUNET_TESTING_command_new_ac (
+    ns,
+    label,
+    &netjail_start_run,
+    &netjail_start_cleanup,
+    NULL,
+    &ns->ac);
 }
diff --git a/src/lib/testing/testing_api_cmd_netjail_start_cmds_helper.c b/src/lib/testing/testing_api_cmd_netjail_start_cmds_helper.c
new file mode 100644
index 000000000..a90447235
--- /dev/null
+++ b/src/lib/testing/testing_api_cmd_netjail_start_cmds_helper.c
@@ -0,0 +1,595 @@
+/*
+      This file is part of GNUnet
+      Copyright (C) 2021 GNUnet e.V.
+
+      GNUnet is free software: you can redistribute it and/or modify it
+      under the terms of the GNU Affero General Public License as published
+      by the Free Software Foundation, either version 3 of the License,
+      or (at your option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Affero General Public License for more details.
+
+      You should have received a copy of the GNU Affero General Public License
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+/**
+ * @file testing/testing_api_cmd_netjail_start_cmds_helper.c
+ * @brief Command to start the netjail peers.
+ * @author t3sserakt
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testing_lib.h"
+#include "testing_api_barrier.h"
+#include "testing_api_loop.h"
+#include "testing_cmds.h"
+#include "testing_api_topology.h"
+
+
+/**
+ * Generic logging shortcut
+ */
+#define LOG(kind, ...) GNUNET_log (kind, __VA_ARGS__)
+
+
+/**
+ * Struct containing the number of the netjail node and the NetJailState which
+ * will be handed to callbacks specific to a test environment.
+ */
+struct TestingSystemCount;
+
+
+/**
+ * Struct to store information handed over to callbacks.
+ */
+struct NetJailState
+{
+  /**
+   * Global state of the interpreter, used by a command
+   * to access information about other commands.
+   */
+  struct GNUNET_TESTING_Interpreter *is;
+
+  /**
+   * Context for our asynchronous completion.
+   */
+  struct GNUNET_TESTING_AsyncContext ac;
+
+  /**
+   * Command with topology data.
+   */
+  const char *topology_cmd_label;
+
+  /**
+   * Array with handles of helper processes.
+   */
+  struct GNUNET_HELPER_Handle **helpers;
+
+  /**
+   * Time after this cmd has to finish.
+   */
+  struct GNUNET_TIME_Relative timeout;
+
+  /**
+   * Timeout task.
+   */
+  struct GNUNET_SCHEDULER_Task *timeout_task;
+
+  /**
+   * Kept in a DLL.
+   */
+  struct TestingSystemCount *tbc_head;
+
+  /**
+   * Kept in a DLL.
+   */
+  struct TestingSystemCount *tbc_tail;
+
+  /**
+   * Data about our topology as a string.
+   */
+  const char *topology_data;
+
+  /**
+   * Size of the array @e helpers.
+   */
+  unsigned int n_helpers;
+
+  /**
+   * Counts number of helpers that finished.
+   */
+  unsigned int n_finished;
+
+  /**
+   * Set to true if we already failed the command.
+   */
+  bool failed;
+};
+
+/**
+ * Struct containing the number of the netjail node and the NetJailState which
+ * will be handed to callbacks specific to a test environment.
+ */
+struct TestingSystemCount
+{
+
+  /**
+   * Kept in a DLL.
+   */
+  struct TestingSystemCount *next;
+
+  /**
+   * Kept in a DLL.
+   */
+  struct TestingSystemCount *prev;
+
+  /**
+   * The send handle for the helper
+   */
+  struct GNUNET_HELPER_SendHandle *shandle;
+
+  /**
+   * Struct to store information handed over to callbacks.
+   */
+  struct NetJailState *ns;
+
+
+};
+
+
+/**
+ * Continuation function from GNUNET_HELPER_send()
+ *
+ * @param cls closure
+ * @param result #GNUNET_OK on success,
+ *               #GNUNET_NO if helper process died
+ *               #GNUNET_SYSERR during GNUNET_HELPER_stop
+ */
+static void
+clear_msg (void *cls,
+           enum GNUNET_GenericReturnValue result)
+{
+  struct TestingSystemCount *tbc = cls;
+  struct NetJailState *ns = tbc->ns;
+
+  GNUNET_assert (NULL != tbc->shandle);
+  tbc->shandle = NULL;
+  GNUNET_CONTAINER_DLL_remove (ns->tbc_head,
+                               ns->tbc_tail,
+                               tbc);
+  GNUNET_free (tbc);
+  if ( (! ns->failed) &&
+       (GNUNET_OK != result) )
+  {
+    ns->failed = true;
+    GNUNET_TESTING_FAIL (ns->is);
+  }
+}
+
+
+static void
+handle_helper_barrier_reached (
+  void *cls,
+  const struct GNUNET_TESTING_CommandBarrierReached *rm)
+{
+  struct NetJailState *ns = cls;
+  struct GNUNET_TESTING_Barrier *barrier;
+
+  barrier = GNUNET_TESTING_get_barrier2_ (ns->is,
+                                          &rm->barrier_key);
+  if (NULL == barrier)
+  {
+    if (! ns->failed)
+    {
+      ns->failed = true;
+      GNUNET_TESTING_async_fail (&ns->ac);
+    }
+    return;
+  }
+  if (barrier->inherited)
+  {
+    /* pass on to parent */
+    GNUNET_TESTING_loop_notify_parent_ (ns->is,
+                                        &rm->header);
+  }
+  else
+  {
+    barrier->reached++;
+    if (barrier->reached == barrier->expected_reaches)
+    {
+      struct GNUNET_TESTING_CommandBarrierSatisfied cbs = {
+        .header.size
+          = htons (sizeof (cbs)),
+        .header.type
+          = htons (GNUNET_MESSAGE_TYPE_CMDS_HELPER_BARRIER_CROSSABLE),
+        .barrier_key
+          = rm->barrier_key
+      };
+
+      GNUNET_assert (! barrier->satisfied);
+      barrier->satisfied = true;
+      /* unblock children */
+      GNUNET_TESTING_loop_notify_children_ (ns->is,
+                                            &cbs.header);
+      /* unblock self */
+      for (unsigned int i = 0; i<barrier->cnt_waiting; i++)
+        GNUNET_TESTING_async_finish (barrier->waiting[i]);
+      GNUNET_array_grow (barrier->waiting,
+                         barrier->cnt_waiting,
+                         0);
+    }
+  }
+}
+
+
+static void
+handle_helper_local_finished (
+  void *cls,
+  const struct GNUNET_TESTING_CommandLocalFinished *lf)
+{
+  struct NetJailState *ns = cls;
+
+  ns->n_finished++;
+  if ( (! ns->failed) &&
+       (GNUNET_OK != ntohl (lf->rv)) )
+  {
+    ns->failed = true;
+    GNUNET_TESTING_async_fail (&ns->ac);
+    return;
+  }
+  if (ns->n_finished == ns->n_helpers)
+  {
+    GNUNET_SCHEDULER_cancel (ns->timeout_task);
+    ns->timeout_task = NULL;
+    GNUNET_TESTING_async_finish (&ns->ac);
+  }
+}
+
+
+/**
+ * Functions with this signature are called whenever a
+ * complete message is received by the tokenizer.
+ *
+ * Do not call GNUNET_SERVER_mst_destroy in callback
+ *
+ * @param cls closure
+ * @param message the actual message
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR to stop further processing
+ */
+static enum GNUNET_GenericReturnValue
+helper_mst (void *cls,
+            const struct GNUNET_MessageHeader *message)
+{
+  struct NetJailState *ns = cls;
+  struct GNUNET_MQ_MessageHandler handlers[] = {
+    GNUNET_MQ_hd_fixed_size (
+      helper_barrier_reached,
+      GNUNET_MESSAGE_TYPE_CMDS_HELPER_BARRIER_REACHED,
+      struct GNUNET_TESTING_CommandBarrierReached,
+      ns),
+    GNUNET_MQ_hd_fixed_size (
+      helper_local_finished,
+      GNUNET_MESSAGE_TYPE_CMDS_HELPER_LOCAL_FINISHED,
+      struct GNUNET_TESTING_CommandLocalFinished,
+      ns),
+    GNUNET_MQ_handler_end ()
+  };
+  enum GNUNET_GenericReturnValue ret;
+
+  ret = GNUNET_MQ_handle_message (handlers,
+                                  message);
+  if (GNUNET_OK != ret)
+  {
+    GNUNET_break (0);
+    if (! ns->failed)
+    {
+      ns->failed = true;
+      GNUNET_TESTING_async_fail (&ns->ac);
+    }
+  }
+  return ret;
+}
+
+
+/**
+ * Callback called if there was an exception during execution of the helper.
+ */
+static void
+exp_cb (void *cls)
+{
+  struct NetJailState *ns = cls;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Called exp_cb.\n");
+  if (NULL != ns->timeout_task)
+  {
+    GNUNET_SCHEDULER_cancel (ns->timeout_task);
+    ns->timeout_task = NULL;
+  }
+  if (! ns->failed)
+    GNUNET_TESTING_async_fail (&ns->ac);
+}
+
+
+static enum GNUNET_GenericReturnValue
+add_barrier (void *cls,
+             const struct GNUNET_ShortHashCode *key,
+             void *value)
+{
+  struct GNUNET_ShortHashCode **bar_posp = cls;
+  struct GNUNET_ShortHashCode *bar_pos = *bar_posp;
+
+  *bar_pos = *key;
+  *bar_posp = bar_pos + 1;
+  return GNUNET_OK;
+}
+
+
+/**
+ * @return true on success
+ */
+static bool
+send_start_messages (struct NetJailState *ns,
+                     struct GNUNET_HELPER_Handle *helper)
+{
+  struct GNUNET_TESTING_CommandHelperInit *msg;
+  struct TestingSystemCount *tbc;
+  struct GNUNET_ShortHashCode *bar;
+  struct GNUNET_ShortHashCode *bar_pos;
+  unsigned int num_barriers = GNUNET_TESTING_barrier_count_ (ns->is);
+  size_t topo_length;
+  size_t msg_len;
+
+  topo_length = strlen (ns->topology_data) + 1;
+  GNUNET_assert (topo_length < SIZE_MAX - sizeof (*msg));
+  GNUNET_assert (SIZE_MAX / sizeof (struct GNUNET_ShortHashCode) >
+                 num_barriers);
+  GNUNET_assert (sizeof (*msg) + topo_length <
+                 SIZE_MAX
+                 - num_barriers * sizeof (struct GNUNET_ShortHashCode));
+  msg_len = sizeof (*msg) + topo_length
+            + num_barriers * sizeof (struct GNUNET_ShortHashCode);
+  if (msg_len > UINT16_MAX)
+  {
+    /* ask a wizzard to enhance the protocol;
+       start with gzip topology_data? multiple
+       init messages for barriers + topo data,
+       etc.*/
+    GNUNET_break (0);
+    return false;
+  }
+  msg = GNUNET_malloc (msg_len);
+  msg->header.size = htons ((uint16_t) msg_len);
+  msg->header.type = htons (GNUNET_MESSAGE_TYPE_CMDS_HELPER_INIT);
+  bar = (struct GNUNET_ShortHashCode *) &msg[1];
+  bar_pos = bar;
+  GNUNET_TESTING_barrier_iterate_ (ns->is,
+                                   &add_barrier,
+                                   &bar_pos);
+  GNUNET_assert (bar_pos == &bar[num_barriers]);
+  memcpy (&bar[num_barriers],
+          ns->topology_data,
+          topo_length);
+  tbc = GNUNET_new (struct TestingSystemCount);
+  tbc->ns = ns;
+  tbc->shandle = GNUNET_HELPER_send (
+    helper,
+    &msg->header,
+    GNUNET_NO,
+    &clear_msg,
+    tbc);
+  GNUNET_free (msg);
+  if (NULL == tbc->shandle)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Send handle is NULL!\n");
+    GNUNET_free (tbc);
+    return false;
+  }
+  GNUNET_CONTAINER_DLL_insert (ns->tbc_head,
+                               ns->tbc_tail,
+                               tbc);
+  return true;
+}
+
+
+/**
+ * Function which start a single helper process.
+ * @return true on success
+ */
+static bool
+start_helper (struct NetJailState *ns,
+              unsigned int script_num)
+{
+  char *gnunet_cmds_helper
+    = GNUNET_OS_get_libexec_binary_path (HELPER_CMDS_BINARY);
+  char node_id[32];
+  char *data_dir;
+  char *script_name;
+  struct GNUNET_HELPER_Handle *helper;
+
+  data_dir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR);
+  GNUNET_asprintf (&script_name,
+                   "%s%s",
+                   data_dir,
+                   NETJAIL_EXEC_SCRIPT);
+  GNUNET_snprintf (node_id,
+                   sizeof (node_id),
+                   "if%06x-%06x\n",
+                   (unsigned int) getpid (),
+                   script_num);
+  {
+    char *const script_argv[] = {
+      script_name,
+      node_id,
+      gnunet_cmds_helper,
+      node_id,
+      NULL
+    };
+    helper = GNUNET_HELPER_start (
+                                  GNUNET_YES,                             /* with control pipe */
+                                  script_argv[0],
+                                  script_argv,
+                                  &helper_mst,
+                                  &exp_cb,
+                                  ns);
+  }
+  GNUNET_free (gnunet_cmds_helper);
+  if (NULL == helper)
+  {
+    GNUNET_break (0);
+    return false;
+  }
+  GNUNET_array_append (ns->helpers,
+                       ns->n_helpers,
+                       helper);
+  GNUNET_TESTING_add_netjail_helper_ (ns->is,
+                                      helper);
+  GNUNET_free (data_dir);
+  GNUNET_free (script_name);
+  return send_start_messages (ns,
+                              helper);
+}
+
+
+/**
+ * Function run when the cmd terminates (good or bad) with timeout.
+ *
+ * @param cls the interpreter state
+ */
+static void
+do_timeout (void *cls)
+{
+  struct NetJailState *ns = cls;
+
+  ns->timeout_task = NULL;
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Terminating cmd due to global timeout\n");
+  GNUNET_TESTING_async_finish (&ns->ac);
+}
+
+
+/**
+ * This function starts a helper process for each node.
+ *
+ * @param cls closure.
+ * @param cmd CMD being run.
+ * @param is interpreter state.
+ */
+static void
+netjail_exec_run (void *cls,
+                  struct GNUNET_TESTING_Interpreter *is)
+{
+  struct NetJailState *ns = cls;
+  struct GNUNET_TESTING_NetjailTopology *topology;
+  bool failed = false;
+  const struct GNUNET_TESTING_Command *topo_cmd;
+
+  ns->is = is;
+  topo_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
+                                                        ns->topology_cmd_label);
+  if (NULL == topo_cmd)
+    GNUNET_TESTING_FAIL (is);
+  if (GNUNET_OK !=
+      GNUNET_TESTING_get_trait_topology_string (topo_cmd,
+                                                &ns->topology_data))
+    GNUNET_TESTING_FAIL (is);
+  topology
+    = GNUNET_TESTING_get_topo_from_string_ (ns->topology_data);
+  for (unsigned int i = 1; i <= topology->total; i++)
+  {
+    if (! start_helper (ns,
+                        i))
+    {
+      failed = true;
+      break;
+    }
+  }
+  GNUNET_TESTING_free_topology (topology);
+  if (failed)
+  {
+    ns->failed = true;
+    GNUNET_TESTING_FAIL (is);
+  }
+  ns->timeout_task
+    = GNUNET_SCHEDULER_add_delayed (ns->timeout,
+                                    &do_timeout,
+                                    ns);
+}
+
+
+/**
+ * Code to clean up resource this cmd used.
+ *
+ * @param cls closure
+ */
+static void
+netjail_exec_cleanup (void *cls)
+{
+  struct NetJailState *ns = cls;
+
+  if (NULL != ns->timeout_task)
+  {
+    GNUNET_SCHEDULER_cancel (ns->timeout_task);
+    ns->timeout_task = NULL;
+  }
+  for (unsigned int i = 0; i<ns->n_helpers; i++)
+    GNUNET_HELPER_stop (ns->helpers[i],
+                        GNUNET_YES);
+  GNUNET_free (ns);
+}
+
+
+/**
+ * This function prepares an array with traits.
+ */
+static enum GNUNET_GenericReturnValue
+netjail_exec_traits (void *cls,
+                     const void **ret,
+                     const char *trait,
+                     unsigned int index)
+{
+  struct NetJailState *ns = cls;
+  struct GNUNET_TESTING_Trait traits[] = {
+    GNUNET_TESTING_trait_end ()
+  };
+
+  (void) ns;
+  return GNUNET_TESTING_get_trait (traits,
+                                   ret,
+                                   trait,
+                                   index);
+}
+
+
+/**
+ * Create command.
+ *
+ * @param label Name for the command.
+ * @param topology_data topology data
+ * @param timeout Before this timeout is reached this cmd MUST finish.
+ * @return command.
+ */
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_netjail_start_helpers (
+  const char *label,
+  const char *topology_cmd_label,
+  struct GNUNET_TIME_Relative timeout)
+{
+  struct NetJailState *ns;
+
+  ns = GNUNET_new (struct NetJailState);
+  ns->topology_cmd_label = topology_cmd_label;
+  ns->timeout = timeout;
+  return GNUNET_TESTING_command_new_ac (ns,
+                                        label,
+                                        &netjail_exec_run,
+                                        &netjail_exec_cleanup,
+                                        &netjail_exec_traits,
+                                        &ns->ac);
+}
diff --git a/src/lib/testing/testing_api_cmd_signal.c b/src/lib/testing/testing_api_cmd_signal.c
new file mode 100644
index 000000000..adbcda946
--- /dev/null
+++ b/src/lib/testing/testing_api_cmd_signal.c
@@ -0,0 +1,120 @@
+/*
+  This file is part of GNUNET
+  (C) 2018 GNUnet e.V.
+
+  GNUNET is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 3, or
+  (at your option) any later version.
+
+  GNUNET is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public
+  License along with GNUNET; see the file COPYING.  If not, see
+  <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file testing/testing_api_cmd_signal.c
+ * @brief command(s) to send signals to processes.
+ * @author Marcello Stanisci
+ */
+#include "platform.h"
+#include "gnunet_testing_lib.h"
+
+
+/**
+ * State for a "signal" CMD.
+ */
+struct SignalState
+{
+  /**
+   * Label of the process to send the signal to.
+   */
+  const char *process_label;
+
+  /**
+   * The signal to send to the process.
+   */
+  int signal;
+};
+
+/**
+ * Run the command.
+ *
+ * @param cls closure.
+ * @param cmd the command to execute.
+ * @param is the interpreter state.
+ */
+static void
+signal_run (void *cls,
+            struct GNUNET_TESTING_Interpreter *is)
+{
+  struct SignalState *ss = cls;
+  const struct GNUNET_TESTING_Command *pcmd;
+  struct GNUNET_OS_Process **process;
+
+  pcmd
+    = GNUNET_TESTING_interpreter_lookup_command (is,
+                                                 ss->process_label);
+  if (NULL == pcmd)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Did not find command `%s'\n",
+                ss->process_label);
+    GNUNET_TESTING_FAIL (is);
+  }
+  if (GNUNET_OK !=
+      GNUNET_TESTING_get_trait_process (pcmd,
+                                        &process))
+    GNUNET_TESTING_FAIL (is);
+  GNUNET_break (0 ==
+                GNUNET_OS_process_kill (*process,
+                                        ss->signal));
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Signaling '%d'..\n",
+              ss->signal);
+}
+
+
+/**
+ * Cleanup the state from a "signal" CMD.
+ *
+ * @param cls closure.
+ */
+static void
+signal_cleanup (void *cls)
+{
+  struct SignalState *ss = cls;
+
+  GNUNET_free (ss);
+}
+
+
+/**
+ * Create a "signal" CMD.
+ *
+ * @param label command label.
+ * @param process handle to the process to signal.
+ * @param signal signal to send.
+ * @return the command.
+ */
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_signal (
+  const char *label,
+  const char *process_label,
+  int signal)
+{
+  struct SignalState *ss;
+
+  ss = GNUNET_new (struct SignalState);
+  ss->process_label = process_label;
+  ss->signal = signal;
+  return GNUNET_TESTING_command_new (ss,
+                                     label,
+                                     &signal_run,
+                                     &signal_cleanup,
+                                     NULL);
+}
diff --git a/src/lib/testing/testing_api_cmd_stat.c b/src/lib/testing/testing_api_cmd_stat.c
new file mode 100644
index 000000000..f751a01d0
--- /dev/null
+++ b/src/lib/testing/testing_api_cmd_stat.c
@@ -0,0 +1,161 @@
+/*
+  This file is part of GNUnet
+  (C) 2018, 2024 GNUnet e.V.
+
+  GNUnet is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 3, or
+  (at your option) any later version.
+
+  GNUnet is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public
+  License along with GNUnet; see the file COPYING.  If not, see
+  <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file testing/testing_api_cmd_stat.c
+ * @brief command(s) to get performance statistics on other commands
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "gnunet_testing_lib.h"
+#include "testing_api_cmd_batch.h"
+
+/**
+ * Run a "stat" CMD.
+ *
+ * @param cls closure.
+ * @param is the interpreter state.
+ */
+static void
+stat_run (void *cls,
+          struct GNUNET_TESTING_Interpreter *is);
+
+
+/**
+ * Add the time @a cmd took to the respective duration in @a timings.
+ *
+ * @param timings where to add up times
+ * @param cmd command to evaluate
+ */
+static void
+stat_cmd (struct GNUNET_TESTING_Timer *timings,
+          const struct GNUNET_TESTING_Command *cmd)
+{
+  struct GNUNET_TIME_Relative duration;
+  struct GNUNET_TIME_Relative lat;
+
+  if (GNUNET_TIME_absolute_cmp (cmd->start_time,
+                                >,
+                                cmd->finish_time))
+  {
+    /* This is a problem, except of course for
+       this command itself, as we clearly did not yet
+       finish... */
+    if (cmd->run != &stat_run)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Bad timings for `%s'\n",
+                  cmd->label.value);
+      GNUNET_break (0);
+    }
+    return;
+  }
+  duration = GNUNET_TIME_absolute_get_difference (cmd->start_time,
+                                                  cmd->finish_time);
+  lat = GNUNET_TIME_absolute_get_difference (cmd->last_req_time,
+                                             cmd->finish_time);
+  for (unsigned int i = 0;
+       NULL != timings[i].prefix;
+       i++)
+  {
+    if (0 == strncmp (timings[i].prefix,
+                      cmd->label.value,
+                      strlen (timings[i].prefix)))
+    {
+      timings[i].total_duration
+        = GNUNET_TIME_relative_add (duration,
+                                    timings[i].total_duration);
+      timings[i].success_latency
+        = GNUNET_TIME_relative_add (lat,
+                                    timings[i].success_latency);
+      timings[i].num_commands++;
+      timings[i].num_retries += cmd->num_tries;
+      break;
+    }
+  }
+}
+
+
+/**
+ * Obtain statistics for @a timings of @a cmd
+ *
+ * @param[in,out] cls what timings to get
+ * @param cmd command to process
+ */
+static void
+do_stat (void *cls,
+         const struct GNUNET_TESTING_Command *cmd)
+{
+  struct GNUNET_TESTING_Timer *timings = cls;
+
+  if (GNUNET_TESTING_cmd_is_batch_ (cmd))
+  {
+    struct GNUNET_TESTING_Command **bcmd;
+
+    if (GNUNET_OK !=
+        GNUNET_TESTING_get_trait_batch_cmds (cmd,
+                                             &bcmd))
+    {
+      GNUNET_break (0);
+      return;
+    }
+    for (unsigned int j = 0;
+         NULL != (*bcmd)[j].run;
+         j++)
+      do_stat (timings,
+               &(*bcmd)[j]);
+    return;
+  }
+  stat_cmd (timings,
+            cmd);
+}
+
+
+/**
+ * Run a "stat" CMD.
+ *
+ * @param cls closure.
+ * @param cmd the command being run.
+ * @param is the interpreter state.
+ */
+static void
+stat_run (void *cls,
+          struct GNUNET_TESTING_Interpreter *is)
+{
+  struct GNUNET_TESTING_Timer *timings = cls;
+
+  GNUNET_TESTING_interpreter_commands_iterate (is,
+                                               true,
+                                               &do_stat,
+                                               timings);
+}
+
+
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_stat (const char *label,
+                         struct GNUNET_TESTING_Timer *timers)
+{
+  return GNUNET_TESTING_command_new ((void *) timers,
+                                     label,
+                                     &stat_run,
+                                     NULL,
+                                     NULL);
+}
+
+
+/* end of testing_api_cmd_stat.c  */
diff --git a/src/lib/testing/testing_api_cmds.c b/src/lib/testing/testing_api_cmds.c
new file mode 100644
index 000000000..31d35f6c4
--- /dev/null
+++ b/src/lib/testing/testing_api_cmds.c
@@ -0,0 +1,92 @@
+/*
+      This file is part of GNUnet
+      Copyright (C) 2021-2024 GNUnet e.V.
+
+      GNUnet is free software: you can redistribute it and/or modify it
+      under the terms of the GNU Affero General Public License as published
+      by the Free Software Foundation, either version 3 of the License,
+      or (at your option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Affero General Public License for more details.
+
+      You should have received a copy of the GNU Affero General Public License
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+/**
+ * @file testing/testing_api_loop.c
+ * @brief main interpreter loop for testcases
+ * @author Christian Grothoff (GNU Taler testing)
+ * @author Marcello Stanisci (GNU Taler testing)
+ * @author t3sserakt
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testing_lib.h"
+
+
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_command_new_ac (
+  void *cls,
+  const char *label,
+  GNUNET_TESTING_CommandRunRoutine run,
+  GNUNET_TESTING_CommandCleanupRoutine cleanup,
+  GNUNET_TESTING_CommandGetTraits traits,
+  struct GNUNET_TESTING_AsyncContext *ac)
+{
+  struct GNUNET_TESTING_Command cmd = {
+    .cls = cls,
+    .run = run,
+    .ac = ac,
+    .cleanup = cleanup,
+    .traits = traits
+  };
+
+  GNUNET_assert (NULL != run);
+  if (NULL != label)
+    GNUNET_TESTING_set_label (&cmd.label,
+                              label);
+  return cmd;
+}
+
+
+void
+GNUNET_TESTING_set_label (
+  struct GNUNET_TESTING_CommandLabel *label,
+  const char *value)
+{
+  size_t len;
+
+  len = strlen (value);
+  GNUNET_assert (len <=
+                 GNUNET_TESTING_CMD_MAX_LABEL_LENGTH);
+  memcpy (label->value,
+          value,
+          len + 1);
+}
+
+
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_set_var (
+  const char *name,
+  struct GNUNET_TESTING_Command cmd)
+{
+  cmd.name = name;
+  return cmd;
+}
+
+
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_end (void)
+{
+  struct GNUNET_TESTING_Command cmd = {
+    .run = NULL
+  };
+
+  return cmd;
+}
diff --git a/src/lib/testing/testing_api_loop.c b/src/lib/testing/testing_api_loop.c
new file mode 100644
index 000000000..098de8a05
--- /dev/null
+++ b/src/lib/testing/testing_api_loop.c
@@ -0,0 +1,1024 @@
+/*
+      This file is part of GNUnet
+      Copyright (C) 2021-2024 GNUnet e.V.
+
+      GNUnet is free software: you can redistribute it and/or modify it
+      under the terms of the GNU Affero General Public License as published
+      by the Free Software Foundation, either version 3 of the License,
+      or (at your option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Affero General Public License for more details.
+
+      You should have received a copy of the GNU Affero General Public License
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+/**
+ * @file testing/testing_api_loop.c
+ * @brief main interpreter loop for testcases
+ * @author Christian Grothoff (GNU Taler testing)
+ * @author Marcello Stanisci (GNU Taler testing)
+ * @author t3sserakt
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testing_lib.h"
+#include "testing_api_loop.h"
+#include "testing_api_cmd_batch.h"
+#include "testing_api_topology.h"
+#include "testing_cmds.h"
+
+
+struct SendContext
+{
+  struct SendContext *next;
+  struct SendContext *prev;
+
+  /**
+   * Handle to a send op
+   */
+  struct GNUNET_HELPER_SendHandle *send_handle;
+
+  struct GNUNET_TESTING_Interpreter *is;
+};
+
+/**
+ * Global state of the interpreter, used by a command
+ * to access information about other commands.
+ */
+struct GNUNET_TESTING_Interpreter
+{
+  /**
+   * Array with handles of helper processes for communication with netjails.
+   */
+  struct GNUNET_HELPER_Handle **helpers;
+
+  /**
+   * Function to call with the test result.
+   */
+  GNUNET_TESTING_ResultCallback rc;
+
+  /**
+   * Closure for @e rc.
+   */
+  void *rc_cls;
+
+  /**
+   * Commands the interpreter will run.
+   */
+  struct GNUNET_TESTING_Command *commands;
+
+  /**
+   * Map with barriers for this loop.
+   */
+  struct GNUNET_CONTAINER_MultiShortmap *barriers;
+
+  /**
+   * Interpreter task (if one is scheduled).
+   */
+  struct GNUNET_SCHEDULER_Task *task;
+
+  /**
+   * Final task that returns the result.
+   */
+  struct GNUNET_SCHEDULER_Task *final_task;
+
+  /**
+   * Task run on timeout.
+   */
+  struct GNUNET_SCHEDULER_Task *timeout_task;
+
+  /**
+   * Hash map mapping variable names to commands.
+   */
+  struct GNUNET_CONTAINER_MultiHashMap *vars;
+
+  struct SendContext *sender_head;
+  struct SendContext *sender_tail;
+
+  /**
+   * Function to call to send messages to our parent.
+   */
+  GNUNET_TESTING_cmd_helper_write_cb parent_writer;
+
+  /**
+   * Number of GNUNET_TESTING_Command in @e commands.
+   */
+  unsigned int cmds_n;
+
+  /**
+   * Size of the array @e helpers.
+   */
+  unsigned int n_helpers;
+
+  /**
+   * Instruction pointer.  Tells #interpreter_run() which instruction to run
+   * next.  Need (signed) int because it gets -1 when rewinding the
+   * interpreter to the first CMD.
+   */
+  int ip;
+
+  /**
+   * Result of the testcases, #GNUNET_OK on success,
+   * #GNUNET_SYSERR on failure, #GNUNET_NO if undecided.
+   */
+  enum GNUNET_GenericReturnValue result;
+
+  /**
+   * Is the interpreter finishing?
+   */
+  bool finishing;
+
+  /**
+   * Is the real result to "skip" because we could not
+   * get the environment working?
+   */
+  bool skip;
+
+};
+
+
+const struct GNUNET_TESTING_Command *
+GNUNET_TESTING_interpreter_lookup_command (
+  struct GNUNET_TESTING_Interpreter *is,
+  const char *label)
+{
+  if (NULL == label)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Attempt to lookup command for empty label\n");
+    return NULL;
+  }
+  for (int i = is->ip; i >= 0; i--)
+  {
+    const struct GNUNET_TESTING_Command *cmd = &is->commands[i];
+
+    /* Give precedence to top-level commands.  */
+    if ( (NULL != cmd->run) &&
+         (0 == strcmp (cmd->label.value,
+                       label)) )
+      return cmd;
+
+    if (GNUNET_TESTING_cmd_is_batch_ (cmd))
+    {
+      struct GNUNET_TESTING_Command **batch;
+      const struct GNUNET_TESTING_Command *current;
+      const struct GNUNET_TESTING_Command *icmd;
+      const struct GNUNET_TESTING_Command *match;
+
+      GNUNET_assert (GNUNET_OK ==
+                     GNUNET_TESTING_get_trait_cmd (cmd,
+                                                   &current));
+      GNUNET_assert (GNUNET_OK ==
+                     GNUNET_TESTING_get_trait_batch_cmds (cmd,
+                                                          &batch));
+      /* We must do the loop forward, but we can find the last match */
+      match = NULL;
+      for (unsigned int j = 0;
+           NULL != (icmd = &(*batch)[j])->run;
+           j++)
+      {
+        if (current == icmd)
+          break; /* do not go past current command */
+        if ( (NULL != icmd->run) &&
+             (0 == strcmp (icmd->label.value,
+                           label)) )
+          match = icmd;
+      }
+      if (NULL != match)
+        return match;
+    }
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Command `%s' not found\n",
+              label);
+  return NULL;
+}
+
+
+const struct GNUNET_TESTING_Command *
+GNUNET_TESTING_interpreter_get_command (
+  struct GNUNET_TESTING_Interpreter *is,
+  const char *name)
+{
+  const struct GNUNET_TESTING_Command *cmd;
+  struct GNUNET_HashCode h_name;
+
+  GNUNET_CRYPTO_hash (name,
+                      strlen (name),
+                      &h_name);
+  cmd = GNUNET_CONTAINER_multihashmap_get (is->vars,
+                                           &h_name);
+  if (NULL == cmd)
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Command not found by variable name: %s\n",
+                name);
+  return cmd;
+}
+
+
+static void
+send_finished (void *cls,
+               enum GNUNET_GenericReturnValue result)
+{
+  struct SendContext *sctx = cls;
+  struct GNUNET_TESTING_Interpreter *is = sctx->is;
+
+  GNUNET_break (GNUNET_OK == result);
+  GNUNET_CONTAINER_DLL_remove (is->sender_head,
+                               is->sender_tail,
+                               sctx);
+  GNUNET_free (sctx);
+}
+
+
+void
+GNUNET_TESTING_loop_notify_children_ (struct GNUNET_TESTING_Interpreter *is,
+                                      const struct GNUNET_MessageHeader *hdr)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Send notification to children of type %u\n",
+              (unsigned int) ntohs (hdr->type));
+  for (unsigned int i = 0; i<is->n_helpers; i++)
+  {
+    struct SendContext *sctx;
+
+    sctx = GNUNET_new (struct SendContext);
+    sctx->is = is;
+    GNUNET_CONTAINER_DLL_insert (is->sender_head,
+                                 is->sender_tail,
+                                 sctx);
+    sctx->send_handle
+      = GNUNET_HELPER_send (is->helpers[i],
+                            hdr,
+                            false, /* never drop */
+                            &send_finished,
+                            sctx);
+  }
+}
+
+
+void
+GNUNET_TESTING_loop_notify_parent_ (struct GNUNET_TESTING_Interpreter *is,
+                                    const struct GNUNET_MessageHeader *hdr)
+{
+  /* We must have a parent */
+  if (NULL == is->parent_writer)
+    GNUNET_TESTING_FAIL (is);
+  is->parent_writer (hdr);
+}
+
+
+/**
+ * Finish the test run, return the final result.
+ *
+ * @param cls the `struct GNUNET_TESTING_Interpreter`
+ */
+static void
+finish_test (void *cls)
+{
+  struct GNUNET_TESTING_Interpreter *is = cls;
+  struct GNUNET_TESTING_Command *cmd;
+  const char *label;
+
+  is->finishing = true;
+  is->final_task = NULL;
+  label = is->commands[is->ip].label.value;
+  if (NULL == is->commands[is->ip].run)
+    label = "END";
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Interpreter finishes at `%s' with status %d\n",
+              label,
+              is->result);
+  for (unsigned int j = 0;
+       NULL != (cmd = &is->commands[j])->run;
+       j++)
+    if (NULL != cmd->cleanup)
+      cmd->cleanup (cmd->cls);
+  if (NULL != is->task)
+  {
+    GNUNET_SCHEDULER_cancel (is->task);
+    is->task = NULL;
+  }
+  if (NULL != is->timeout_task)
+  {
+    GNUNET_SCHEDULER_cancel (is->timeout_task);
+    is->timeout_task = NULL;
+  }
+  {
+    struct SendContext *sctx;
+
+    while (NULL != (sctx = is->sender_head))
+    {
+      GNUNET_CONTAINER_DLL_remove (is->sender_head,
+                                   is->sender_tail,
+                                   sctx);
+      GNUNET_HELPER_send_cancel (sctx->send_handle);
+      GNUNET_free (sctx);
+    }
+  }
+  GNUNET_free (is->commands);
+  is->rc (is->rc_cls,
+          is->skip ? GNUNET_NO : is->result);
+  if (NULL != is->barriers)
+  {
+    GNUNET_CONTAINER_multishortmap_destroy (is->barriers);
+    is->barriers = NULL;
+  }
+  if (NULL != is->vars)
+  {
+    GNUNET_CONTAINER_multihashmap_destroy (is->vars);
+    is->vars = NULL;
+  }
+  GNUNET_free (is->helpers);
+  GNUNET_free (is);
+}
+
+
+/**
+ * Run the main interpreter loop that performs exchange operations.
+ *
+ * @param cls contains the `struct InterpreterState`
+ */
+static void
+interpreter_run (void *cls);
+
+
+void
+GNUNET_TESTING_interpreter_next_ (void *cls)
+{
+  static unsigned long long ipc;
+  static struct GNUNET_TIME_Absolute last_report;
+  struct GNUNET_TESTING_Interpreter *is = cls;
+  struct GNUNET_TESTING_Command *cmd = &is->commands[is->ip];
+
+  if (GNUNET_SYSERR == is->result)
+    return; /* ignore, we already failed! */
+
+  if (GNUNET_TESTING_cmd_is_batch_ (cmd))
+  {
+    if (GNUNET_TESTING_cmd_batch_next_ (cmd->cls))
+    {
+      /* batch is done */
+      cmd->finish_time = GNUNET_TIME_absolute_get ();
+      is->ip++;
+    }
+  }
+  else
+  {
+    cmd->finish_time = GNUNET_TIME_absolute_get ();
+    is->ip++;
+  }
+
+  if (0 == (ipc % 1000))
+  {
+    if (0 != ipc)
+      GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+                  "Interpreter executed 1000 instructions in %s\n",
+                  GNUNET_STRINGS_relative_time_to_string (
+                    GNUNET_TIME_absolute_get_duration (last_report),
+                    true));
+    last_report = GNUNET_TIME_absolute_get ();
+  }
+  ipc++;
+  is->task = GNUNET_SCHEDULER_add_now (&interpreter_run,
+                                       is);
+}
+
+
+void
+GNUNET_TESTING_interpreter_run_cmd_ (
+  struct GNUNET_TESTING_Interpreter *is,
+  struct GNUNET_TESTING_Command *cmd)
+{
+  cmd->last_req_time
+    = GNUNET_TIME_absolute_get ();
+  if (0 == cmd->num_tries)
+    cmd->start_time = cmd->last_req_time;
+  cmd->num_tries = 1;
+  if (NULL != cmd->name)
+  {
+    struct GNUNET_HashCode h_name;
+
+    GNUNET_CRYPTO_hash (cmd->name,
+                        strlen (cmd->name),
+                        &h_name);
+    (void) GNUNET_CONTAINER_multihashmap_put (
+      is->vars,
+      &h_name,
+      cmd,
+      GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE);
+  }
+  if (NULL != cmd->ac)
+  {
+    cmd->ac->is = is;
+    cmd->ac->finished = GNUNET_NO;
+    cmd->ac->next_called = false;
+  }
+  cmd->run (cmd->cls,
+            is);
+  if ( (! GNUNET_TESTING_cmd_is_batch_ (cmd)) &&
+       ( (NULL == cmd->ac) ||
+         (cmd->asynchronous_finish) ) )
+  {
+    if (NULL != cmd->ac)
+      cmd->ac->next_called = true;
+    GNUNET_TESTING_interpreter_next_ (is);
+  }
+}
+
+
+/**
+ * Run the main interpreter loop.
+ *
+ * @param cls contains the `struct GNUNET_TESTING_Interpreter`
+ */
+static void
+interpreter_run (void *cls)
+{
+  struct GNUNET_TESTING_Interpreter *is = cls;
+  struct GNUNET_TESTING_Command *cmd = &is->commands[is->ip];
+
+  is->task = NULL;
+  if (NULL == cmd->run)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Running command END\n");
+    is->result = GNUNET_OK;
+    finish_test (is);
+    return;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Running command `%s'\n",
+              cmd->label.value);
+  GNUNET_TESTING_interpreter_run_cmd_ (is,
+                                       cmd);
+}
+
+
+void
+GNUNET_TESTING_interpreter_fail (struct GNUNET_TESTING_Interpreter *is)
+{
+  struct GNUNET_TESTING_Command *cmd
+    = &is->commands[is->ip];
+
+  if (GNUNET_SYSERR == is->result)
+  {
+    GNUNET_break (0);
+    return; /* ignore, we already failed! */
+  }
+  if (NULL == cmd)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed with CMD being NULL!\n");
+  }
+  else
+  {
+    const struct GNUNET_TESTING_Command *pos = cmd;
+
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Failed during command `%s'\n",
+                cmd->label.value);
+    while (GNUNET_TESTING_cmd_is_batch_ (pos))
+    {
+      GNUNET_assert (GNUNET_OK ==
+                     GNUNET_TESTING_get_trait_cmd (pos,
+                                                   &pos));
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Failed in batch during command `%s'\n",
+                  pos->label.value);
+    }
+  }
+  if (NULL != is->timeout_task)
+  {
+    GNUNET_SCHEDULER_cancel (is->timeout_task);
+    is->timeout_task = NULL;
+  }
+  is->result = GNUNET_SYSERR;
+  GNUNET_assert (NULL == is->final_task);
+  is->final_task = GNUNET_SCHEDULER_add_now (&finish_test,
+                                             is);
+}
+
+
+void
+GNUNET_TESTING_interpreter_skip (
+  struct GNUNET_TESTING_Interpreter *is)
+{
+  is->skip = true;
+  GNUNET_TESTING_interpreter_fail (is);
+}
+
+
+void
+GNUNET_TESTING_async_fail (struct GNUNET_TESTING_AsyncContext *ac)
+{
+  GNUNET_assert (GNUNET_NO == ac->finished);
+  ac->finished = GNUNET_SYSERR;
+  GNUNET_TESTING_interpreter_fail (ac->is);
+}
+
+
+void
+GNUNET_TESTING_async_finish (struct GNUNET_TESTING_AsyncContext *ac)
+{
+  GNUNET_assert (GNUNET_NO == ac->finished);
+  ac->finished = GNUNET_OK;
+  if (NULL != ac->notify_finished)
+  {
+    ac->notify_finished (ac->notify_finished_cls);
+    ac->notify_finished = NULL;
+  }
+  if (! ac->next_called)
+  {
+    ac->next_called = true;
+    GNUNET_TESTING_interpreter_next_ (ac->is);
+  }
+}
+
+
+/**
+ * Function run when the test terminates (good or bad) with timeout.
+ *
+ * @param cls the interpreter state
+ */
+static void
+do_timeout (void *cls)
+{
+  struct GNUNET_TESTING_Interpreter *is = cls;
+
+  is->timeout_task = NULL;
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "Terminating test due to global timeout\n");
+  is->result = GNUNET_SYSERR;
+  finish_test (is);
+}
+
+
+static void
+setup_is (struct GNUNET_TESTING_Interpreter *is,
+          const struct GNUNET_TESTING_Command *bcommand,
+          const struct GNUNET_TESTING_Command *commands)
+{
+  unsigned int i;
+
+  is->vars = GNUNET_CONTAINER_multihashmap_create (1024,
+                                                   false);
+  /* get the number of commands */
+  for (i = 0; NULL != commands[i].run; i++)
+    ;
+  if (NULL != bcommand)
+    i++;
+  is->cmds_n = i + 1;
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Got %u commands\n",
+              i);
+  is->commands = GNUNET_malloc_large (
+    (i + 1)
+    * sizeof (struct GNUNET_TESTING_Command));
+  GNUNET_assert (NULL != is->commands);
+  if (NULL == bcommand)
+  {
+    memcpy (is->commands,
+            commands,
+            sizeof (struct GNUNET_TESTING_Command) * i);
+  }
+  else
+  {
+    is->commands[0] = *bcommand;
+    memcpy (&is->commands[1],
+            commands,
+            sizeof (struct GNUNET_TESTING_Command) * i);
+  }
+  is->task = GNUNET_SCHEDULER_add_now (&interpreter_run,
+                                       is);
+}
+
+
+struct GNUNET_TESTING_Interpreter *
+GNUNET_TESTING_run (const struct GNUNET_TESTING_Command *commands,
+                    struct GNUNET_TIME_Relative timeout,
+                    GNUNET_TESTING_ResultCallback rc,
+                    void *rc_cls)
+{
+  struct GNUNET_TESTING_Interpreter *is;
+
+  is = GNUNET_new (struct GNUNET_TESTING_Interpreter);
+  is->timeout_task
+    = GNUNET_SCHEDULER_add_delayed (timeout,
+                                    &do_timeout,
+                                    is);
+  is->rc = rc;
+  is->rc_cls = rc_cls;
+  setup_is (is,
+            NULL,
+            commands);
+  return is;
+}
+
+
+static struct GNUNET_TESTING_Interpreter *
+start_testcase (
+  void *cls,
+  const char *topology_data,
+  uint32_t inherited_barrier_count,
+  const struct GNUNET_ShortHashCode *inherited_barriers,
+  GNUNET_TESTING_cmd_helper_write_cb parent_writer,
+  GNUNET_TESTING_ResultCallback finish_cb,
+  void *finish_cb_cls)
+{
+  const struct GNUNET_TESTING_Command *commands = cls;
+  struct GNUNET_TESTING_Interpreter *is;
+
+  is = GNUNET_new (struct GNUNET_TESTING_Interpreter);
+  if (0 != inherited_barrier_count)
+  {
+    is->barriers
+      = GNUNET_CONTAINER_multishortmap_create (inherited_barrier_count * 4 / 3,
+                                               true);
+    for (unsigned int j = 0; j<inherited_barrier_count; j++)
+    {
+      struct GNUNET_TESTING_Barrier *barrier;
+
+      barrier = GNUNET_new (struct GNUNET_TESTING_Barrier);
+      barrier->barrier_id = inherited_barriers[j];
+      barrier->inherited = true;
+      (void) GNUNET_CONTAINER_multishortmap_put (
+        is->barriers,
+        &barrier->barrier_id,
+        barrier,
+        GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE);
+    }
+  }
+  is->parent_writer = parent_writer;
+  is->rc = finish_cb;
+  is->rc_cls = finish_cb_cls;
+  {
+    struct GNUNET_TESTING_Command bcmd;
+
+    bcmd = GNUNET_TESTING_cmd_set_var (
+      "topology",
+      GNUNET_TESTING_cmd_load_topology_from_string (
+        "_boot_",
+        topology_data));
+    setup_is (is,
+              &bcmd,
+              commands);
+  }
+  return is;
+
+}
+
+
+struct GNUNET_TESTING_PluginFunctions *
+GNUNET_TESTING_make_plugin (
+  const struct GNUNET_TESTING_Command *commands)
+{
+  struct GNUNET_TESTING_PluginFunctions *api;
+  struct GNUNET_TESTING_Command *commands_copy;
+  unsigned int i;
+
+  for (i = 0; NULL != commands[i].run; i++)
+    ;
+  commands_copy = GNUNET_malloc_large ( (i + 1)
+                                       * sizeof (struct
+                                                 GNUNET_TESTING_Command));
+  memcpy (commands_copy,
+          commands,
+          sizeof (struct GNUNET_TESTING_Command) * i + 1);
+
+  api = GNUNET_new (struct GNUNET_TESTING_PluginFunctions);
+  api->cls = (void *) commands_copy;
+  api->start_testcase = &start_testcase;
+  return api;
+}
+
+
+void
+GNUNET_TESTING_add_netjail_helper_ (struct GNUNET_TESTING_Interpreter *is,
+                                    struct GNUNET_HELPER_Handle *helper)
+{
+  GNUNET_array_append (is->helpers,
+                       is->n_helpers,
+                       helper);
+}
+
+
+struct GNUNET_TESTING_Barrier *
+GNUNET_TESTING_get_barrier2_ (struct GNUNET_TESTING_Interpreter *is,
+                              const struct GNUNET_ShortHashCode *create_key)
+{
+  return GNUNET_CONTAINER_multishortmap_get (is->barriers,
+                                             create_key);
+}
+
+
+struct GNUNET_TESTING_Barrier *
+GNUNET_TESTING_get_barrier_ (struct GNUNET_TESTING_Interpreter *is,
+                             const char *barrier_name)
+{
+  struct GNUNET_ShortHashCode create_key;
+
+  if (NULL == is->barriers)
+    return NULL;
+  GNUNET_TESTING_barrier_name_hash_ (barrier_name,
+                                     &create_key);
+  return GNUNET_TESTING_get_barrier2_ (is,
+                                       &create_key);
+}
+
+
+void
+GNUNET_TESTING_add_barrier_ (struct GNUNET_TESTING_Interpreter *is,
+                             struct GNUNET_TESTING_Barrier *barrier)
+{
+  if (NULL == is->barriers)
+    is->barriers
+      = GNUNET_CONTAINER_multishortmap_create (1,
+                                               true);
+  /* We always use the barrier we encountered
+     most recently under a given label, thus replace */
+  (void) GNUNET_CONTAINER_multishortmap_put (
+    is->barriers,
+    &barrier->barrier_id,
+    barrier,
+    GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE);
+}
+
+
+unsigned int
+GNUNET_TESTING_barrier_count_ (
+  struct GNUNET_TESTING_Interpreter *is)
+{
+  return NULL != is->barriers ? GNUNET_CONTAINER_multishortmap_size (is->barriers) : 0;
+}
+
+
+void
+GNUNET_TESTING_barrier_iterate_ (
+  struct GNUNET_TESTING_Interpreter *is,
+  GNUNET_CONTAINER_ShortmapIterator cb,
+  void *cb_cls)
+{
+  if (NULL != is->barriers)
+    GNUNET_CONTAINER_multishortmap_iterate (is->barriers,
+                                          cb,
+                                          cb_cls);
+}
+
+
+void
+GNUNET_TESTING_interpreter_commands_iterate (
+  struct GNUNET_TESTING_Interpreter *is,
+  bool asc,
+  GNUNET_TESTING_CommandIterator cb,
+  void *cb_cls)
+{
+  unsigned int start;
+  unsigned int end;
+  int inc;
+
+  if (asc)
+  {
+    inc = 1;
+    start = 0;
+    end = is->ip;
+  }
+  else
+  {
+    inc = -1;
+    start = is->ip;
+    end = 0;
+  }
+  for (unsigned int off = start; off != end + inc; off += inc)
+  {
+    const struct GNUNET_TESTING_Command *cmd
+      = &is->commands[off];
+
+    cb (cb_cls,
+        cmd);
+  }
+}
+
+
+void
+GNUNET_TESTING_interpreter_current_cmd_touch (
+  struct GNUNET_TESTING_Interpreter *is)
+{
+  is->commands[is->ip].last_req_time
+    = GNUNET_TIME_absolute_get ();
+}
+
+
+void
+GNUNET_TESTING_interpreter_current_cmd_inc_tries (
+  struct GNUNET_TESTING_Interpreter *is)
+{
+  is->commands[is->ip].num_tries++;
+}
+
+
+const char *
+GNUNET_TESTING_interpreter_current_cmd_get_label (
+  struct GNUNET_TESTING_Interpreter *is)
+{
+  return is->commands[is->ip].label.value;
+}
+
+
+/**
+ * State for a "rewind" CMD.
+ */
+struct RewindIpState
+{
+  /**
+   * Instruction pointer to set into the interpreter.
+   */
+  const char *target_label;
+
+  /**
+   * How many times this set should take place.  However, this value lives at
+   * the calling process, and this CMD is only in charge of checking and
+   * decremeting it.
+   */
+  unsigned int counter;
+};
+
+
+/**
+ * Seek for the @a target command in @a batch (and rewind to it
+ * if successful).
+ *
+ * @param is the interpreter state (for failures)
+ * @param cmd batch to search for @a target
+ * @param target command to search for
+ * @return #GNUNET_OK on success, #GNUNET_NO if target was not found,
+ *         #GNUNET_SYSERR if target is in the future and we failed
+ */
+static enum GNUNET_GenericReturnValue
+seek_batch (struct GNUNET_TESTING_Interpreter *is,
+            const struct GNUNET_TESTING_Command *cmd,
+            const struct GNUNET_TESTING_Command *target)
+{
+  unsigned int new_ip;
+  struct GNUNET_TESTING_Command **batch;
+  const struct GNUNET_TESTING_Command *current;
+  const struct GNUNET_TESTING_Command *icmd;
+  bool found = false;
+
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_TESTING_get_trait_cmd (cmd,
+                                               &current));
+  GNUNET_assert (GNUNET_OK ==
+                 GNUNET_TESTING_get_trait_batch_cmds (cmd,
+                                                      &batch));
+  for (new_ip = 0;
+       NULL != (icmd = &((*batch)[new_ip]))->run;
+       new_ip++)
+  {
+    if (current == target)
+      current = NULL;
+    if (icmd == target)
+    {
+      found = true;
+      break;
+    }
+    if (GNUNET_TESTING_cmd_is_batch_ (icmd))
+    {
+      enum GNUNET_GenericReturnValue ret
+        = seek_batch (is,
+                      icmd,
+                      target);
+      if (GNUNET_SYSERR == ret)
+        return GNUNET_SYSERR; /* failure! */
+      if (GNUNET_OK == ret)
+      {
+        found = true;
+        break;
+      }
+    }
+  }
+  if (! found)
+    return GNUNET_NO; /* not found */
+  if (NULL == current)
+  {
+    /* refuse to jump forward */
+    GNUNET_break (0);
+    GNUNET_TESTING_interpreter_fail (is);
+    return GNUNET_SYSERR;
+  }
+  GNUNET_TESTING_cmd_batch_set_current_ (cmd,
+                                         new_ip);
+  return GNUNET_OK;
+}
+
+
+/**
+ * Run the "rewind" CMD.
+ *
+ * @param cls closure.
+ * @param cmd command being executed now.
+ * @param is the interpreter state.
+ */
+static void
+rewind_ip_run (void *cls,
+               struct GNUNET_TESTING_Interpreter *is)
+{
+  struct RewindIpState *ris = cls;
+  const struct GNUNET_TESTING_Command *target;
+  const struct GNUNET_TESTING_Command *icmd;
+  unsigned int new_ip;
+  bool found = false;
+
+  if (0 == ris->counter)
+    return;
+  target
+    = GNUNET_TESTING_interpreter_lookup_command (is,
+                                                 ris->target_label);
+  if (NULL == target)
+  {
+    GNUNET_break (0);
+    GNUNET_TESTING_interpreter_fail (is);
+    return;
+  }
+  ris->counter--;
+  for (new_ip = 0;
+       NULL != (icmd = &is->commands[new_ip])->run;
+       new_ip++)
+  {
+    if (icmd == target)
+    {
+      found = true;
+      break;
+    }
+    if (GNUNET_TESTING_cmd_is_batch_ (icmd))
+    {
+      enum GNUNET_GenericReturnValue ret
+        = seek_batch (is,
+                      icmd,
+                      target);
+      if (GNUNET_SYSERR == ret)
+      {
+        /* failure! */
+        GNUNET_break (0);
+        GNUNET_TESTING_interpreter_fail (is);
+        return;
+      }
+      if (GNUNET_OK == ret)
+      {
+        /* counter subtraction below for batch */
+        found = true;
+        break;
+      }
+    }
+  }
+  if (! found)
+  {
+    GNUNET_break (0);
+    GNUNET_TESTING_interpreter_fail (is);
+    return;
+  }
+  if (new_ip > (unsigned int) is->ip)
+  {
+    /* refuse to jump forward */
+    GNUNET_break (0);
+    GNUNET_TESTING_interpreter_fail (is);
+    return;
+  }
+  is->ip = new_ip;
+}
+
+
+static void
+rewind_ip_free (void *cls)
+{
+  struct RewindIpState *ris = cls;
+
+  GNUNET_free (ris);
+}
+
+
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_rewind_ip (const char *label,
+                              const char *target_label,
+                              unsigned int counter)
+{
+  struct RewindIpState *ris;
+
+  ris = GNUNET_new (struct RewindIpState);
+  ris->target_label = target_label;
+  ris->counter = counter;
+  return GNUNET_TESTING_command_new (ris,
+                                     label,
+                                     &rewind_ip_run,
+                                     &rewind_ip_free,
+                                     NULL);
+}
+
+
+/* end of testing_api_loop.c */
diff --git a/src/lib/testing/testing_api_loop.h b/src/lib/testing/testing_api_loop.h
new file mode 100644
index 000000000..2a3047183
--- /dev/null
+++ b/src/lib/testing/testing_api_loop.h
@@ -0,0 +1,163 @@
+/*
+      This file is part of GNUnet
+      Copyright (C) 2022 GNUnet e.V.
+
+      GNUnet is free software: you can redistribute it and/or modify it
+      under the terms of the GNU Affero General Public License as published
+      by the Free Software Foundation, either version 3 of the License,
+      or (at your option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Affero General Public License for more details.
+
+      You should have received a copy of the GNU Affero General Public License
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+/**
+ * @file testing_api_loop.h
+ * @brief
+ * @author t3sserakt
+ */
+#ifndef TESTING_API_LOOP_H
+#define TESTING_API_LOOP_H
+
+#include "testing_api_barrier.h"
+
+
+/**
+ * Callback function to write messages from the helper process running on a netjail node to the master process.
+ *
+ * @param message The message to write.
+ */
+typedef void
+(*GNUNET_TESTING_cmd_helper_write_cb) (
+  const struct GNUNET_MessageHeader *message);
+
+
+/**
+ * The plugin API every test case plugin has to implement.
+ */
+struct GNUNET_TESTING_PluginFunctions
+{
+
+  /**
+   * Closure to pass to start_testcase.
+   */
+  void *cls;
+
+  /**
+   * Function to be implemented for each test case plugin which starts the test case on a netjail node.
+   *
+   * @param topology_data A file name for the file containing the topology configuration, or a string containing
+   *        the topology configuration.
+   * @param barrier_count length of the @a barriers array
+   * @param barriers inherited barriers
+   * @param write_message Callback function to write messages from the helper process running on a
+   * netjail node to the master process.
+   * @param finish_cb Callback function which writes a message from the helper process running on a netjail
+   *                  node to the master process * signaling that the test case running on the netjail node finished.
+   * @return Returns The struct GNUNET_TESTING_Interpreter of the command loop running on this netjail node.
+   */
+  struct GNUNET_TESTING_Interpreter *
+  (*start_testcase) (
+    void *cls,
+    const char *topology_data,
+    uint32_t barrier_count,
+    const struct GNUNET_ShortHashCode *barriers,
+    GNUNET_TESTING_cmd_helper_write_cb write_message,
+    GNUNET_TESTING_ResultCallback finish_cb,
+    void *finish_cb_cls);
+
+};
+
+
+/**
+ * Send message to our parent. Fails very hard if
+ * we do not have one.
+ *
+ * @param is The interpreter loop.
+ */
+void
+GNUNET_TESTING_loop_notify_parent_ (
+  struct GNUNET_TESTING_Interpreter *is,
+  const struct GNUNET_MessageHeader *hdr);
+
+
+/**
+ * Send message to all netjail children (if there
+ * are any).
+ *
+ * @param is The interpreter loop.
+ */
+void
+GNUNET_TESTING_loop_notify_children_ (
+  struct GNUNET_TESTING_Interpreter *is,
+  const struct GNUNET_MessageHeader *hdr);
+
+
+/**
+ * Current command is done, run the next one.
+ */
+void
+GNUNET_TESTING_interpreter_next_ (void *cls);
+
+
+void
+GNUNET_TESTING_interpreter_run_cmd_ (
+  struct GNUNET_TESTING_Interpreter *is,
+  struct GNUNET_TESTING_Command *cmd);
+
+/**
+ * Adding a helper handle to the interpreter.
+ *
+ * @param is The interpreter.
+ * @param helper The helper handle.
+ */
+void
+GNUNET_TESTING_add_netjail_helper_ (
+  struct GNUNET_TESTING_Interpreter *is,
+  struct GNUNET_HELPER_Handle *helper);
+
+
+/**
+ * Add a barrier to the interpreter to share it with
+ * all children as an inherited barrier.
+ *
+ * @param is The interpreter.
+ * @param barrier The barrier to add.
+ */
+void
+GNUNET_TESTING_add_barrier_ (
+  struct GNUNET_TESTING_Interpreter *is,
+  struct GNUNET_TESTING_Barrier *barrier);
+
+
+struct GNUNET_TESTING_Barrier *
+GNUNET_TESTING_get_barrier2_ (
+  struct GNUNET_TESTING_Interpreter *is,
+  const struct GNUNET_ShortHashCode *create_key);
+
+
+struct GNUNET_TESTING_Barrier *
+GNUNET_TESTING_get_barrier_ (
+  struct GNUNET_TESTING_Interpreter *is,
+  const char *barrier_name);
+
+
+unsigned int
+GNUNET_TESTING_barrier_count_ (
+  struct GNUNET_TESTING_Interpreter *is);
+
+
+void
+GNUNET_TESTING_barrier_iterate_ (
+  struct GNUNET_TESTING_Interpreter *is,
+  GNUNET_CONTAINER_ShortmapIterator cb,
+  void *cb_cls);
+
+#endif
diff --git a/src/lib/testing/testing_api_main.c b/src/lib/testing/testing_api_main.c
new file mode 100644
index 000000000..fc60cb2c9
--- /dev/null
+++ b/src/lib/testing/testing_api_main.c
@@ -0,0 +1,140 @@
+/*
+      This file is part of GNUnet
+      Copyright (C) 2021-2024 GNUnet e.V.
+
+      GNUnet is free software: you can redistribute it and/or modify it
+      under the terms of the GNU Affero General Public License as published
+      by the Free Software Foundation, either version 3 of the License,
+      or (at your option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Affero General Public License for more details.
+
+      You should have received a copy of the GNU Affero General Public License
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+/**
+ * @file testing/testing_api_loop.c
+ * @brief main interpreter loop for testcases
+ * @author Christian Grothoff (GNU Taler testing)
+ * @author Marcello Stanisci (GNU Taler testing)
+ * @author t3sserakt
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testing_lib.h"
+
+
+/**
+ * Closure for #loop_run().
+ */
+struct MainParams
+{
+
+  /**
+   * NULL-label terminated array of commands.
+   */
+  const struct GNUNET_TESTING_Command *commands;
+
+  /**
+   * The interpreter.
+   */
+  struct GNUNET_TESTING_Interpreter *is;
+
+  /**
+   * Global timeout for the test.
+   */
+  struct GNUNET_TIME_Relative timeout;
+
+  /**
+   * Set to #EXIT_FAILURE on error.
+   */
+  int rv;
+};
+
+
+/**
+ * Function called with the final result of the test.
+ *
+ * @param cls the `struct MainParams`
+ * @param rv #GNUNET_OK if the test passed
+ */
+static void
+handle_result (void *cls,
+               enum GNUNET_GenericReturnValue rv)
+{
+  struct MainParams *mp = cls;
+
+  mp->is = NULL;
+  switch (rv)
+  {
+  case GNUNET_OK:
+    mp->rv = EXIT_SUCCESS;
+    break;
+  case GNUNET_NO:
+    mp->rv = 77;
+    break;
+  case GNUNET_SYSERR:
+    mp->rv = EXIT_FAILURE;
+    break;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+              "Test exits with status %d\n",
+              mp->rv);
+  GNUNET_SCHEDULER_shutdown ();
+}
+
+
+static void
+do_shutdown (void *cls)
+{
+  struct MainParams *mp = cls;
+
+  if (NULL != mp->is)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Terminating test due to shutdown\n");
+    GNUNET_TESTING_interpreter_fail (mp->is);
+  }
+}
+
+
+/**
+ * Main function to run the test cases.
+ *
+ * @param cls a `struct MainParams *`
+ */
+static void
+loop_run (void *cls)
+{
+  struct MainParams *mp = cls;
+
+  mp->is = GNUNET_TESTING_run (mp->commands,
+                               mp->timeout,
+                               &handle_result,
+                               mp);
+  GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
+                                 mp);
+}
+
+
+int
+GNUNET_TESTING_main (
+  const struct GNUNET_TESTING_Command *commands,
+  struct GNUNET_TIME_Relative timeout)
+{
+  struct MainParams mp = {
+    .commands = commands,
+    .timeout = timeout,
+    .rv = EXIT_SUCCESS
+  };
+
+  GNUNET_SCHEDULER_run (&loop_run,
+                        &mp);
+  return mp.rv;
+}
diff --git a/src/lib/testing/testing_api_topology.c b/src/lib/testing/testing_api_topology.c
new file mode 100644
index 000000000..22cfd85fe
--- /dev/null
+++ b/src/lib/testing/testing_api_topology.c
@@ -0,0 +1,1355 @@
+/*
+      This file is part of GNUnet
+      Copyright (C) 2008, 2009, 2012 GNUnet e.V.
+
+      GNUnet is free software: you can redistribute it and/or modify it
+      under the terms of the GNU Affero General Public License as published
+      by the Free Software Foundation, either version 3 of the License,
+      or (at your option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Affero General Public License for more details.
+
+      You should have received a copy of the GNU Affero General Public License
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+/**
+ * @file testing/testing.c
+ * @brief convenience API for writing testcases for GNUnet
+ *        Many testcases need to start and stop a peer/service
+ *        and this library is supposed to make that easier
+ *        for TESTCASES.  Normal programs should always
+ *        use functions from gnunet_{util,arm}_lib.h.  This API is
+ *        ONLY for writing testcases (or internal use of the testbed).
+ * @author Christian Grothoff
+ *
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testing_lib.h"
+#include "testing_api_topology.h"
+#include "testing_cmds.h"
+
+#define LOG(kind, ...) GNUNET_log_from (kind, "testing-api", __VA_ARGS__)
+
+#define CONNECT_ADDRESS_TEMPLATE "%s-192.168.15.%u"
+
+#define ROUTER_CONNECT_ADDRESS_TEMPLATE "%s-92.68.150.%u"
+
+#define KNOWN_CONNECT_ADDRESS_TEMPLATE "%s-92.68.151.%u"
+
+#define PREFIX_TCP "tcp"
+
+#define PREFIX_UDP "udp"
+
+#define PREFIX_TCP_NATTED "tcp_natted"
+
+#define PREFIX_UDP_NATTED "udp_natted"
+
+
+/**
+ * Every line in the topology configuration starts with a string indicating which
+ * kind of information will be configured with this line. Configuration values following
+ * this string are seperated by special sequences of characters. An integer value seperated
+ * by ':' is returned by this function.
+ *
+ * @param line The line of configuration. Example: "a:42[:43]"
+ * @return An integer value (42)
+ */
+static unsigned int
+get_first_value (const char *line)
+{
+  const char *colon = strchr (line, ':');
+  char dummy;
+  int ret;
+
+  GNUNET_assert (NULL != colon);
+  ret = sscanf (colon + 1,
+                "%u%c",
+                &ret,
+                &dummy);
+  if (2 == ret)
+    GNUNET_assert (':' == dummy);
+  else
+    GNUNET_assert (1 == ret);
+  return ret;
+}
+
+
+/**
+ * Every line in the topology configuration starts with a string indicating
+ * which kind of information will be configured with this line. This string is
+ * returned by this function.
+ *
+ * @param line The line of configuration, e.g. "D:452"
+ * @return The leading string of this configuration line ("D")
+ */
+static char *
+get_key (const char *line)
+{
+  const char *colon = strchr (line, ':');
+
+  GNUNET_assert (NULL != colon);
+  return GNUNET_strndup (line,
+                         colon - line);
+}
+
+
+/**
+ * Every line in the topology configuration starts with a string indicating which
+ * kind of information will be configured with this line. Configuration values following
+ * this string are seperated by special sequences of characters. A string value seperated
+ * by ':' is returned by this function.
+ *
+ * @param line The line of configuration ("FOO:BAR")
+ * @return A string value ("BAR").
+ */
+// FIXME: avoid strdup, return const?
+static char *
+get_first_string_value (const char *line)
+{
+  const char *colon = strchr (line, ':');
+
+  GNUNET_assert (NULL != colon);
+  return GNUNET_strdup (colon + 1);
+}
+
+
+/**
+ * Every line in the topology configuration starts with a string indicating
+ * which kind of information will be configured with this line. Configuration
+ * values following this string are seperated by special sequences of
+ * characters. A second integer value seperated by ':' from a first value is
+ * returned by this function.
+ *
+ * @param line The line of configuration (example: "P:1:3")
+ * @return An integer value (3)
+ */
+static unsigned int
+get_second_value (const char *line)
+{
+  const char *colon;
+  char dummy;
+  int ret;
+
+  colon = strchr (line, ':');
+  GNUNET_assert (NULL != colon);
+  colon = strchr (colon + 1, ':');
+  GNUNET_assert (NULL != colon);
+  GNUNET_assert (1 ==
+                 sscanf (colon + 1,
+                         "%u%c",
+                         &ret,
+                         &dummy));
+  return ret;
+}
+
+
+/**
+ * Every line in the topology configuration starts with a string indicating which
+ * kind of information will be configured with this line. Configuration values following
+ * this string are seperated by special sequences of characters. A value might be
+ * a key value pair.
+ * This function returns the value for a specific key in a configuration line.
+ *
+ * @param key The key of the key value pair.
+ * @return The value of the key value pair.
+ */
+static char *
+get_value (const char *key, const char *line)
+{
+  char copy[strlen (line) + 1];
+  size_t slen;
+  char *token;
+  char *token2;
+  char *temp;
+  char *rest = NULL;
+
+  slen = strlen (line) + 1;
+  memcpy (copy, line, slen);
+  temp = strstr (copy, key);
+  if (NULL == temp)
+    return NULL;
+  token = strtok_r (temp, ":", &rest);
+  if (NULL == token)
+    return NULL;
+  token = strtok_r (NULL, ":", &rest);
+  if (NULL == token)
+    return NULL;
+  token2 = strtok_r (token, "}", &rest);
+  if (NULL == token2)
+    return NULL;
+  return GNUNET_strdup (token2);
+}
+
+
+/**
+ * Every line in the topology configuration starts with a string indicating which
+ * kind of information will be configured with this line. Configuration values following
+ * this string are seperated by special sequences of characters. A value might be
+ * a key value pair. A special key is the 'connect' key which can appear more than once.
+ * The value is the information about a connection via some protocol to some other node.
+ * This function returns the struct GNUNET_TESTING_NodeConnection which holds the information
+ * of the connect value.
+ *
+ * @param value The value of the connect key value pair.
+ * @return The struct GNUNET_TESTING_NodeConnection.
+ */
+static struct GNUNET_TESTING_NodeConnection *
+get_connect_value (const char *line,
+                   struct GNUNET_TESTING_NetjailNode *node)
+{
+  struct GNUNET_TESTING_NodeConnection *node_connection;
+  char *copy;
+  char *token;
+  char *token2;
+  unsigned int node_n;
+  unsigned int namespace_n;
+  char *rest = NULL;
+  char *rest2 = NULL;
+  struct GNUNET_TESTING_AddressPrefix *prefix;
+  unsigned int sscanf_ret;
+
+  node_connection = GNUNET_new (struct GNUNET_TESTING_NodeConnection);
+  node_connection->node = node;
+
+  copy = GNUNET_strdup (line);
+  token = strtok_r (copy, ":", &rest);
+  if (0 == strcmp ("{K", token))
+  {
+    node_connection->node_type = GNUNET_TESTING_GLOBAL_NODE;
+    token = strtok_r (NULL, ":", &rest);
+    GNUNET_assert (1 == sscanf (token, "%u", &node_n));
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+         "node_n %u\n",
+         node_n);
+    node_connection->node_n = node_n;
+    node_connection->namespace_n = 0;
+  }
+  else if (0 == strcmp ("{P", token))
+  {
+    node_connection->node_type = GNUNET_TESTING_SUBNET_NODE;
+    token = strtok_r (NULL, ":", &rest);
+    errno = 0;
+    sscanf_ret = sscanf (token, "%u", &namespace_n);
+    if (errno != 0)
+    {
+      GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "sscanf");
+    }
+    GNUNET_assert (0 < sscanf_ret);
+    node_connection->namespace_n = namespace_n;
+    token = strtok_r (NULL, ":", &rest);
+    errno = 0;
+    sscanf_ret = sscanf (token, "%u", &node_n);
+    if (errno != 0)
+    {
+      GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "sscanf");
+    }
+    GNUNET_assert (0 < sscanf_ret);
+    node_connection->node_n = node_n;
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+         "node_n %u namespace_n %u node->node_n %u node->namespace_n %u\n",
+         node_n,
+         namespace_n,
+         node->node_n,
+         node->namespace_n);
+  }
+  else
+  {
+    GNUNET_break (0);
+    GNUNET_free (node_connection);
+    GNUNET_free (copy);
+    return NULL;
+  }
+
+  while (NULL != (token = strtok_r (NULL, ":", &rest)))
+  {
+    prefix = GNUNET_new (struct GNUNET_TESTING_AddressPrefix);
+    token2 = strtok_r (token, "}", &rest2);
+    if (NULL != token2)
+      prefix->address_prefix = GNUNET_strdup (token2);
+    else
+      prefix->address_prefix = GNUNET_strdup (token);
+
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+         "address_prefix %s\n",
+         prefix->address_prefix);
+
+    GNUNET_CONTAINER_DLL_insert (node_connection->address_prefixes_head,
+                                 node_connection->address_prefixes_tail,
+                                 prefix);
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+         "address_prefix %s\n",
+         prefix->address_prefix);
+  }
+
+  GNUNET_free (copy);
+  return node_connection;
+}
+
+
+/**
+ * Every line in the topology configuration starts with a string indicating which
+ * kind of information will be configured with this line. Configuration values following
+ * this string are seperated by special sequences of characters. A value might be
+ * a key value pair. A special key is the 'connect' key.
+ * The value is the information about a connections via some protocol to other nodes.
+ * Each connection itself is a key value pair separated by the character '|' and
+ * surrounded by the characters '{' and '}'.
+ * The struct GNUNET_TESTING_NodeConnection holds the information of each connection value.
+ * This function extracts the values of each connection into a DLL of
+ * struct GNUNET_TESTING_NodeConnection which will be added to a node.
+ *
+ * @param line The line of configuration.
+ * @param node The struct GNUNET_TESTING_NetjailNode to which the DLL of
+ *             struct GNUNET_TESTING_NodeConnection will be added.
+ */
+static void
+node_connections (const char *line,
+                  struct GNUNET_TESTING_NetjailNode *node)
+{
+  char *value, *value2;
+  char *temp;
+  char *copy;
+  char *rest = NULL;
+  char *rest2 = NULL;
+  struct GNUNET_TESTING_NodeConnection *node_connection;
+
+  temp = strstr (line, "connect");
+  if (NULL != temp)
+  {
+    copy = GNUNET_strdup (temp);
+    strtok_r (copy, ":", &rest);
+    value = strtok_r (rest, "|", &rest2);
+
+    while (NULL != value)
+    {
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "node_connections value %s\n",
+           value);
+      node_connection = get_connect_value (value, node);
+      if (NULL == node_connection)
+      {
+        LOG (GNUNET_ERROR_TYPE_WARNING,
+             "connect key was not expected in this configuration line: %s\n",
+             line);
+        break;
+      }
+      GNUNET_CONTAINER_DLL_insert (node->node_connections_head,
+                                   node->node_connections_tail,
+                                   node_connection);
+      value2 = strstr (value, "}}");
+      if (NULL != value2)
+        break;
+      value = strtok_r (NULL, "|", &rest2);
+
+    }
+    GNUNET_free (copy);
+  }
+}
+
+
+/**
+ * A helper function to log information about individual nodes.
+ *
+ * @param cls This is not used actually.
+ * @param id The key of this value in the map.
+ * @param value A struct GNUNET_TESTING_NetjailNode which holds information about a node.
+ * return GNUNET_YES to continue with iterating, GNUNET_NO otherwise.
+ */
+static int
+log_nodes (void *cls,
+           const struct GNUNET_ShortHashCode *id,
+           void *value)
+{
+  struct GNUNET_TESTING_NetjailNode *node = value;
+  struct GNUNET_TESTING_NodeConnection *pos_connection;
+  struct GNUNET_TESTING_AddressPrefix *pos_prefix;
+
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "plugin: %s space: %u node: %u global: %u\n",
+       node->plugin,
+       node->namespace_n,
+       node->node_n,
+       node->is_global);
+
+  for (pos_connection = node->node_connections_head; NULL != pos_connection;
+       pos_connection = pos_connection->next)
+  {
+
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+         "namespace_n: %u node_n: %u node_type: %u\n",
+         pos_connection->namespace_n,
+         pos_connection->node_n,
+         pos_connection->node_type);
+
+    for (pos_prefix = pos_connection->address_prefixes_head; NULL != pos_prefix;
+         pos_prefix =
+           pos_prefix->next)
+    {
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "prefix: %s\n",
+           pos_prefix->address_prefix);
+    }
+  }
+  return GNUNET_YES;
+}
+
+
+/**
+ * Helper function to log information about namespaces.
+ *
+ * @param cls This is not used actually.
+ * @param id The key of this value in the map.
+ * @param value A struct GNUNET_TESTING_NetjailNamespace which holds information about a subnet.
+ * return GNUNET_YES to continue with iterating, GNUNET_NO otherwise.
+ */
+static int
+log_namespaces (void *cls,
+                const struct GNUNET_ShortHashCode *id,
+                void *value)
+{
+  struct GNUNET_TESTING_NetjailNamespace *namespace = value;
+
+  GNUNET_CONTAINER_multishortmap_iterate (namespace->nodes,
+                                          &log_nodes,
+                                          NULL);
+  return GNUNET_YES;
+}
+
+
+/**
+ * Helper function to log the configuration in case of a problem with configuration.
+ *
+ * @param topology The struct GNUNET_TESTING_NetjailTopology holding the configuration information.
+ */
+static int
+log_topo (const struct GNUNET_TESTING_NetjailTopology *topology)
+{
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "plugin: %s spaces: %u nodes: %u known: %u\n",
+       topology->plugin,
+       topology->namespaces_n,
+       topology->nodes_m,
+       topology->nodes_x);
+
+  GNUNET_CONTAINER_multishortmap_iterate (topology->map_namespaces,
+                                          log_namespaces, NULL);
+  GNUNET_CONTAINER_multishortmap_iterate (topology->map_globals, &log_nodes,
+                                          NULL);
+  return GNUNET_YES;
+}
+
+
+/**
+ * This function extracts information about a specific node from the topology.
+ *
+ * @param num The global index number of the node.
+ * @param[out] node_ex A struct GNUNET_TESTING_NetjailNode with information about the node.
+ * @param[out] namespace_ex A struct GNUNET_TESTING_NetjailNamespace with information about the namespace
+               the node is in or NULL, if the node is a global node.
+ * @param[out] node_connections_ex A struct GNUNET_TESTING_NodeConnection with information about the connection
+               of this node to other nodes.
+*/
+static void
+get_node_info (unsigned int num,
+               const struct GNUNET_TESTING_NetjailTopology *topology,
+               struct GNUNET_TESTING_NetjailNode **node_ex,
+               struct GNUNET_TESTING_NetjailNamespace **namespace_ex,
+               struct GNUNET_TESTING_NodeConnection **node_connections_ex)
+{
+  struct GNUNET_ShortHashCode hkey;
+  struct GNUNET_HashCode hc;
+  unsigned int namespace_n;
+  unsigned int node_m;
+  struct GNUNET_TESTING_NetjailNode *node;
+  struct GNUNET_TESTING_NetjailNamespace *namespace;
+  struct GNUNET_TESTING_NodeConnection *node_connections = NULL;
+
+  log_topo (topology);
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "num: %u \n",
+       num);
+  if (topology->nodes_x >= num)
+  {
+
+    GNUNET_CRYPTO_hash (&num, sizeof(num), &hc);
+    memcpy (&hkey,
+            &hc,
+            sizeof (hkey));
+    node = GNUNET_CONTAINER_multishortmap_get (topology->map_globals,
+                                               &hkey);
+    if (NULL != node)
+    {
+      *node_ex = node;
+      *node_connections_ex = node->node_connections_head;
+    }
+  }
+  else
+  {
+    namespace_n = (unsigned int) ceil ((double) (num - topology->nodes_x)
+                                       / topology->nodes_m);
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+         "ceil num: %u nodes_x: %u nodes_m: %u namespace_n: %u\n",
+         num,
+         topology->nodes_x,
+         topology->nodes_m,
+         namespace_n);
+    GNUNET_CRYPTO_hash (&namespace_n, sizeof(namespace_n), &hc);
+    memcpy (&hkey,
+            &hc,
+            sizeof (hkey));
+    namespace = GNUNET_CONTAINER_multishortmap_get (topology->map_namespaces,
+                                                    &hkey);
+    if (NULL != namespace)
+    {
+      node_m = num - topology->nodes_x - topology->nodes_m * (namespace_n - 1);
+      GNUNET_CRYPTO_hash (&node_m, sizeof(node_m), &hc);
+      memcpy (&hkey,
+              &hc,
+              sizeof (hkey));
+      node = GNUNET_CONTAINER_multishortmap_get (namespace->nodes,
+                                                 &hkey);
+      if (NULL != node)
+      {
+        LOG (GNUNET_ERROR_TYPE_DEBUG,
+             "node additional_connects: %u %p\n",
+             node->additional_connects,
+             node);
+        node_connections = node->node_connections_head;
+      }
+      *node_ex = node;
+      *namespace_ex = namespace;
+      *node_connections_ex = node_connections;
+    }
+  }
+}
+
+
+/**
+ * Get a node from the topology.
+ *
+ * @param num The specific node we want the connections for.
+ * @param topology The topology we get the connections from.
+ * @return The connections of the node.
+ */
+struct GNUNET_TESTING_NetjailNode *
+GNUNET_TESTING_get_node (unsigned int num,
+                         struct GNUNET_TESTING_NetjailTopology *topology)
+{
+  struct GNUNET_TESTING_NetjailNode *node;
+  struct GNUNET_TESTING_NetjailNamespace *namespace;
+  struct GNUNET_TESTING_NodeConnection *node_connections;
+
+  get_node_info (num, topology, &node, &namespace, &node_connections);
+
+  return node;
+
+}
+
+
+/**
+ * Get the connections to other nodes for a specific node.
+ *
+ * @param num The specific node we want the connections for.
+ * @param topology The topology we get the connections from.
+ * @return The connections of the node.
+ */
+struct GNUNET_TESTING_NodeConnection *
+GNUNET_TESTING_get_connections (unsigned int num,
+                                const struct
+                                GNUNET_TESTING_NetjailTopology *topology)
+{
+  struct GNUNET_TESTING_NetjailNode *node;
+  struct GNUNET_TESTING_NetjailNamespace *namespace;
+  struct GNUNET_TESTING_NodeConnection *node_connections;
+
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "get_connections\n");
+
+  get_node_info (num, topology, &node, &namespace, &node_connections);
+
+  return node_connections;
+}
+
+
+int
+free_nodes_cb (void *cls,
+               const struct GNUNET_ShortHashCode *key,
+               void *value)
+{
+  (void) cls;
+  struct GNUNET_TESTING_NetjailNode *node = value;
+  struct GNUNET_TESTING_NodeConnection *pos_connection;
+  struct GNUNET_TESTING_AddressPrefix *pos_prefix;
+
+  while (NULL != (pos_connection = node->node_connections_head))
+  {
+    while (NULL != (pos_prefix = pos_connection->address_prefixes_head))
+    {
+      GNUNET_CONTAINER_DLL_remove (pos_connection->address_prefixes_head,
+                                   pos_connection->address_prefixes_tail,
+                                   pos_prefix);
+      GNUNET_free (pos_prefix->address_prefix);
+      GNUNET_free (pos_prefix);
+    }
+    GNUNET_CONTAINER_DLL_remove (node->node_connections_head,
+                                 node->node_connections_tail,
+                                 pos_connection);
+    GNUNET_free (pos_connection);
+  }
+
+  GNUNET_free (node->plugin);
+  GNUNET_free (node);
+  return GNUNET_OK;
+}
+
+
+int
+free_namespaces_cb (void *cls,
+                    const struct GNUNET_ShortHashCode *key,
+                    void *value)
+{
+  (void) cls;
+  struct GNUNET_TESTING_NetjailNamespace *namespace = value;
+
+  GNUNET_free (namespace->router);
+  GNUNET_CONTAINER_multishortmap_iterate (namespace->nodes, free_nodes_cb,
+                                          namespace->nodes);
+  return GNUNET_OK;
+
+}
+
+
+static int
+free_value_cb (void *cls,
+                    const struct GNUNET_ShortHashCode *key,
+                    void *value)
+{
+  (void) cls;
+
+  GNUNET_free (value);
+
+  return GNUNET_OK;
+}
+
+
+static int
+free_subnets_cb (void *cls,
+                    const struct GNUNET_ShortHashCode *key,
+                    void *value)
+{
+  (void) cls;
+  struct GNUNET_TESTING_NetjailSubnet *subnet = value;
+
+  GNUNET_CONTAINER_multishortmap_iterate (subnet->peers,
+                                          &free_value_cb,
+                                          NULL);
+
+  GNUNET_free (subnet);
+
+  return GNUNET_OK;
+}
+
+
+static int
+free_carriers_cb (void *cls,
+                    const struct GNUNET_ShortHashCode *key,
+                    void *value)
+{
+  (void) cls;
+  struct GNUNET_TESTING_NetjailCarrier *carrier = value;
+
+  GNUNET_CONTAINER_multishortmap_iterate (carrier->peers,
+                                          &free_value_cb,
+                                          NULL);
+  GNUNET_CONTAINER_multishortmap_iterate (carrier->subnets,
+                                          &free_subnets_cb,
+                                          NULL);
+
+  GNUNET_free (carrier);
+
+  return GNUNET_OK;
+}
+
+
+/**
+ * Deallocate memory of the struct GNUNET_TESTING_NetjailTopology.
+ *
+ * @param topology The GNUNET_TESTING_NetjailTopology to be deallocated.
+ */
+void
+GNUNET_TESTING_free_topology (struct GNUNET_TESTING_NetjailTopology *topology)
+{
+  GNUNET_CONTAINER_multishortmap_iterate (topology->backbone_peers,
+                                          &free_value_cb,
+                                          NULL);
+  GNUNET_CONTAINER_multishortmap_iterate (topology->carriers,
+                                          &free_carriers_cb,
+                                          NULL);
+  GNUNET_free (topology->plugin);
+  GNUNET_free (topology);
+}
+
+
+/**
+ * Deallocate memory of the struct GNUNET_TESTING_NetjailTopology.
+ *
+ * @param topology The GNUNET_TESTING_NetjailTopology to be deallocated.
+ *
+void
+GNUNET_TESTING_free_topology (struct GNUNET_TESTING_NetjailTopology *topology)
+{
+  GNUNET_CONTAINER_multishortmap_iterate (topology->map_namespaces,
+                                          &free_namespaces_cb,
+                                          NULL);
+  GNUNET_CONTAINER_multishortmap_destroy (topology->map_namespaces);
+  GNUNET_CONTAINER_multishortmap_iterate (topology->map_globals,
+                                          &free_nodes_cb,
+                                          NULL);
+  GNUNET_CONTAINER_multishortmap_destroy (topology->map_globals);
+  GNUNET_free (topology->plugin);
+  GNUNET_free (topology);
+  }*/
+
+
+unsigned int
+GNUNET_TESTING_calculate_num (
+  struct GNUNET_TESTING_NodeConnection *node_connection,
+  struct GNUNET_TESTING_NetjailTopology *topology)
+{
+  unsigned int n, m, num;
+
+  n = node_connection->namespace_n;
+  m = node_connection->node_n;
+
+  if (0 == n)
+    num = m;
+  else
+    num = (n - 1) * topology->nodes_m + m + topology->nodes_x;
+
+  return num;
+}
+
+
+/**
+ * Get the address for a specific communicator from a connection.
+ *
+ * @param connection The connection we like to have the address from.
+ * @param prefix The communicator protocol prefix.
+ * @return The address of the communicator.
+ */
+char *
+GNUNET_TESTING_get_address (struct GNUNET_TESTING_NodeConnection *connection,
+                            const char *prefix)
+{
+  struct GNUNET_TESTING_NetjailNode *node;
+  char *addr;
+  char *template;
+  unsigned int node_n;
+
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "get address prefix: %s node_n: %u\n",
+       prefix,
+       connection->node_n);
+
+  node = connection->node;
+  if (connection->namespace_n == node->namespace_n)
+  {
+    template = CONNECT_ADDRESS_TEMPLATE;
+    node_n = connection->node_n;
+  }
+  else if (0 == connection->namespace_n)
+  {
+    template = KNOWN_CONNECT_ADDRESS_TEMPLATE;
+    node_n = connection->node_n;
+  }
+  else if (1 == connection->node_n)
+  {
+    template = ROUTER_CONNECT_ADDRESS_TEMPLATE;
+    node_n = connection->namespace_n;
+  }
+  else
+  {
+    return NULL;
+  }
+
+  if (0 == strcmp (PREFIX_TCP, prefix) ||
+      0 == strcmp (PREFIX_UDP, prefix) ||
+      0 == strcmp (PREFIX_UDP_NATTED, prefix) ||
+      0 == strcmp (PREFIX_TCP_NATTED, prefix))
+  {
+    GNUNET_asprintf (&addr,
+                     template,
+                     prefix,
+                     node_n);
+  }
+  else
+  {
+    GNUNET_assert (0);
+  }
+
+  return addr;
+}
+
+
+/**
+ * Get the number of unintentional additional connections the node waits for.
+ *
+ * @param num The specific node we want the additional connects for.
+ * @return The number of additional connects
+ */
+unsigned int
+GNUNET_TESTING_get_additional_connects (unsigned int num,
+                                        struct GNUNET_TESTING_NetjailTopology *
+                                        topology)
+{
+  struct GNUNET_TESTING_NetjailNode *node;
+  struct GNUNET_TESTING_NetjailNamespace *namespace;
+  struct GNUNET_TESTING_NodeConnection *node_connections;
+
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "get_additional_connects\n");
+
+  get_node_info (num, topology, &node, &namespace, &node_connections);
+
+  if (NULL == node)
+  {
+    LOG (GNUNET_ERROR_TYPE_WARNING,
+         "No info found for node %d\n", num);
+    return 0;
+  }
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "node additional_connects for node %p\n",
+       node);
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "node additional_connects: %u\n",
+       node->additional_connects);
+
+  return node->additional_connects;
+}
+
+char *
+GNUNET_TESTING_get_plugin_from_topo (
+  struct GNUNET_TESTING_NetjailTopology *njt,
+  const char *my_node_id)
+{
+  return njt->plugin;
+}
+
+
+static void
+create_subnet_peers (struct GNUNET_CONFIGURATION_Handle *cfg,
+               struct GNUNET_TESTING_NetjailTopology *topology,
+               struct GNUNET_TESTING_NetjailSubnet *subnet)
+{
+  struct GNUNET_HashCode hc;
+  subnet->peers = GNUNET_CONTAINER_multishortmap_create (1,GNUNET_NO);
+
+  for (int i = 1; i < subnet->number_peers; i++)
+  {
+    struct GNUNET_ShortHashCode hkey;
+    struct GNUNET_TESTING_NetjailSubnetPeer *subnet_peer = GNUNET_new (struct GNUNET_TESTING_NetjailSubnetPeer);
+
+    topology->total++;
+    GNUNET_CRYPTO_hash (&topology->total, sizeof(topology->total), &hc);
+      memcpy (&hkey,
+              &hc,
+              sizeof (hkey));
+    GNUNET_CONTAINER_multishortmap_put (subnet->peers,
+                                        &hkey,
+                                        subnet_peer,
+                                        GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+  }
+}
+
+
+static void
+create_subnets (struct GNUNET_CONFIGURATION_Handle *cfg,
+               struct GNUNET_TESTING_NetjailTopology *topology,
+               struct GNUNET_TESTING_NetjailCarrier *carrier)
+{
+  struct GNUNET_HashCode hc;
+  carrier->subnets = GNUNET_CONTAINER_multishortmap_create (1,GNUNET_NO);
+  
+  for (int i = 1; i < carrier->number_subnets; i++)
+  {
+    struct GNUNET_ShortHashCode hkey;
+    struct GNUNET_TESTING_NetjailSubnet *subnet = GNUNET_new (struct GNUNET_TESTING_NetjailSubnet);
+    char *section;
+ 
+    topology->total++;
+    subnet->number = topology->total;
+    subnet->index = i;
+    GNUNET_CRYPTO_hash (&topology->total, sizeof(topology->total), &hc);
+      memcpy (&hkey,
+              &hc,
+              sizeof (hkey));
+    GNUNET_CONTAINER_multishortmap_put (carrier->subnets,
+                                        &hkey,
+                                        subnet,
+                                        GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+    GNUNET_asprintf (&section, "CARRIER-%u-SUBNET-%u", carrier->index, i);
+    if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg,
+                                                          section,
+                                                          "SUBNET_PEERS",
+                                                          (unsigned long long *) &subnet->number_peers))
+    {
+      subnet->number_peers = topology->default_subnet_peers;
+    }
+
+    create_subnet_peers (cfg, topology, subnet);
+
+    GNUNET_free (section);
+  }
+}
+
+
+static void
+create_peers (struct GNUNET_CONFIGURATION_Handle *cfg,
+               struct GNUNET_TESTING_NetjailTopology *topology,
+               struct GNUNET_TESTING_NetjailCarrier *carrier)
+{
+  struct GNUNET_HashCode hc;
+  carrier->peers = GNUNET_CONTAINER_multishortmap_create (1,GNUNET_NO);
+
+  for (int i = 1; i < carrier->number_peers; i++)
+  {
+    struct GNUNET_ShortHashCode hkey;
+    struct GNUNET_TESTING_NetjailCarrierPeer *peer = GNUNET_new (struct GNUNET_TESTING_NetjailCarrierPeer);
+
+    topology->total++;
+    peer->number = topology->total;
+    GNUNET_CRYPTO_hash (&topology->total, sizeof(topology->total), &hc);
+      memcpy (&hkey,
+              &hc,
+              sizeof (hkey));
+    GNUNET_CONTAINER_multishortmap_put (carrier->peers,
+                                        &hkey,
+                                        peer,
+                                        GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+    //GNUNET_asprintf (&section, "CARRIER-%u-PEER-%u", carrier->index, i);
+  }
+}
+
+
+struct GNUNET_TESTING_NetjailTopology *
+GNUNET_TESTING_get_topo_from_string_ (const char *input)
+{
+  struct GNUNET_CONFIGURATION_Handle *cfg;
+  struct GNUNET_TESTING_NetjailTopology *topology = GNUNET_new (struct GNUNET_TESTING_NetjailTopology);
+  topology->backbone_peers = GNUNET_CONTAINER_multishortmap_create (1,GNUNET_NO);
+  topology->carriers = GNUNET_CONTAINER_multishortmap_create (1,GNUNET_NO);
+  struct GNUNET_HashCode hc;
+
+  cfg = GNUNET_CONFIGURATION_create ();
+  GNUNET_assert (NULL != topology->carriers);
+
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_deserialize (cfg,
+                                        input,
+                                        strlen (input),
+                                        NULL))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _ ("Failed to parse configuration.\n"));
+    GNUNET_CONFIGURATION_destroy (cfg);
+    return NULL;
+  }
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg,
+                                                          "DEFAULTS",
+                                                          "SUBNETS",
+                                                          &(topology->default_subnets)))
+  {
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         "Missing default SUBNETS!\n");
+    return NULL;
+  }
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg,
+                                                          "DEFAULTS",
+                                                          "TESTBED_PLUGIN",
+                                                          &topology->plugin))
+  {
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         "Missing default TESTBED_PLUGIN!\n");
+    return NULL;
+  }
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg,
+                                                          "DEFAULTS",
+                                                          "CARRIER_PEERS",
+                                                          &(topology->default_carrier_peers)))
+  {
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         "Missing default CARRIER_PEERS!\n");
+    return NULL;
+  }
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg,
+                                                          "DEFAULTS",
+                                                          "SUBNET_PEERS",
+                                                          &(topology->default_subnet_peers)))
+  {
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         "Missing default SUBNET_PEERS!\n");
+    return NULL;
+  }
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg,
+                                                          "BACKBONE",
+                                                          "CARRIERS",
+                                                          &(topology->num_carriers)))
+  {
+    LOG (GNUNET_ERROR_TYPE_INFO,
+         "No carrier configured!\n");
+    return NULL;
+  }
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg,
+                                                          "BACKBONE",
+                                                          "BACKBONE_PEERS",
+                                                          &(topology->num_backbone_peers)))
+  {
+    LOG (GNUNET_ERROR_TYPE_INFO,
+         "No backbone peers configured!\n");
+    return NULL;
+  }
+  for (int i = 0;i < topology->num_backbone_peers; i++)
+  {
+    struct GNUNET_TESTING_NetjailBackbonePeer *peer = GNUNET_new (struct GNUNET_TESTING_NetjailBackbonePeer);
+    struct GNUNET_ShortHashCode hkey;
+
+    topology->total++;
+    peer->number = topology->total;
+    GNUNET_CRYPTO_hash (&topology->total, sizeof(topology->total), &hc);
+      memcpy (&hkey,
+              &hc,
+              sizeof (hkey));
+    GNUNET_CONTAINER_multishortmap_put (topology->backbone_peers,
+                                        &hkey,
+                                        peer,
+                                        GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+  }
+  GNUNET_assert (NULL != topology->carriers);
+  for (int i = 0;i < topology->num_carriers; i++)
+  {
+    struct GNUNET_TESTING_NetjailCarrier *carrier = GNUNET_new (struct GNUNET_TESTING_NetjailCarrier);
+    struct GNUNET_ShortHashCode hkey;
+    char *section;
+
+    topology->total++;
+    carrier->number = topology->total;
+    GNUNET_CRYPTO_hash (&topology->total, sizeof(topology->total), &hc);
+    memcpy (&hkey,
+              &hc,
+              sizeof (hkey));
+    GNUNET_assert (NULL != topology->carriers);
+    GNUNET_CONTAINER_multishortmap_put (topology->carriers,
+                                        &hkey,
+                                        carrier,
+                                        GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+    GNUNET_asprintf (&section, "CARRIER-%u", i); 
+    if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg,
+                                                          section,
+                                                          "SUBNETS",
+                                                          (unsigned long long *) &carrier->number_subnets))
+    {
+      carrier->number_subnets = topology->default_subnets;
+    }
+    if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (cfg,
+                                                          section,
+                                                          "CARRIER_PEERS",
+                                                          (unsigned long long *) &carrier->number_peers))
+    {
+      carrier->number_peers = topology->default_carrier_peers;
+    }
+    create_peers  (cfg, topology, carrier);
+    create_subnets (cfg, topology, carrier);
+
+    GNUNET_free (section);
+  }
+
+  GNUNET_free (cfg);
+  
+  return topology;
+}
+
+
+/**
+ * Parse the topology data.
+ *
+ * @param data The topology data.
+ * @return The GNUNET_TESTING_NetjailTopology
+ *
+struct GNUNET_TESTING_NetjailTopology *
+GNUNET_TESTING_get_topo_from_string_ (const char *input)
+{
+  char *token;
+  char *key = NULL;
+  unsigned int out;
+  char *rest = NULL;
+  char *value = NULL;
+  char *value2;
+  char *data;
+  int ret;
+  struct GNUNET_TESTING_NetjailTopology *topo;
+  struct GNUNET_TESTING_NetjailRouter *router;
+  struct GNUNET_TESTING_NetjailNamespace *namespace;
+  struct GNUNET_HashCode hc;
+
+  data = GNUNET_strdup (input);
+  token = strtok_r (data, "\n", &rest);
+  topo = GNUNET_new (struct GNUNET_TESTING_NetjailTopology);
+  topo->map_namespaces =
+    GNUNET_CONTAINER_multishortmap_create (1,GNUNET_NO);
+  topo->map_globals =
+    GNUNET_CONTAINER_multishortmap_create (1,GNUNET_NO);
+
+  while (NULL != token)
+  {
+    if (NULL != key)
+      GNUNET_free (key);
+    key = get_key (token);
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+         "In the loop with token: %s beginning with %s\n",
+         token,
+         key);
+    if (0 == strcmp (key, "M"))
+    {
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "Get first Value for M.\n");
+      out = get_first_value (token);
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "M: %u\n",
+           out);
+      topo->nodes_m = out;
+    }
+    else if (0 == strcmp (key, "N"))
+    {
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "Get first Value for N.\n");
+      out = get_first_value (token);
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "N: %u\n",
+           out);
+      topo->namespaces_n = out;
+    }
+    else if (0 == strcmp (key, "X"))
+    {
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "Get first Value for X.\n");
+      out = get_first_value (token);
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "X: %u\n",
+           out);
+      topo->nodes_x = out;
+    }
+    else if (0 == strcmp (key, "AC"))
+    {
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "Get first Value for AC.\n");
+      out = get_first_value (token);
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "AC: %u\n",
+           out);
+      topo->additional_connects = out;
+    }
+    else if (0 == strcmp (key, "T"))
+    {
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "Get first string value for T.\n");
+      value = get_first_string_value (token);
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "value: %s\n",
+           value);
+      topo->plugin = value;
+    }
+    else if (0 == strcmp (key, "K"))
+    {
+      struct GNUNET_ShortHashCode hkey_k;
+      struct GNUNET_TESTING_NetjailNode *k_node = GNUNET_new (struct
+                                                              GNUNET_TESTING_NetjailNode);
+
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "Get first Value for K.\n");
+      out = get_first_value (token);
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "K: %u\n",
+           out);
+      k_node->node_n = out;
+      GNUNET_CRYPTO_hash (&out, sizeof(out), &hc);
+      memcpy (&hkey_k,
+              &hc,
+              sizeof (hkey_k));
+      k_node->is_global = GNUNET_YES;
+
+      if (GNUNET_YES == GNUNET_CONTAINER_multishortmap_contains (
+            topo->map_globals,
+            &hkey_k))
+        GNUNET_break (0);
+      else
+        GNUNET_CONTAINER_multishortmap_put (topo->map_globals,
+                                            &hkey_k,
+                                            k_node,
+                                            GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "Get value for key value on K.\n");
+      value = get_value ("plugin", token);
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "value: %s\n",
+           value);
+      k_node->plugin = value;
+      parse_ac (k_node, token);
+      node_connections (token, k_node);
+      GNUNET_free (value);
+    }
+    else if (0 == strcmp (key, "R"))
+    {
+      struct GNUNET_ShortHashCode hkey_r;
+      router = GNUNET_new (struct GNUNET_TESTING_NetjailRouter);
+
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "Get first Value for R.\n");
+      out = get_first_value (token);
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "R: %u\n",
+           out);
+      GNUNET_CRYPTO_hash (&out, sizeof(out), &hc);
+      memcpy (&hkey_r,
+              &hc,
+              sizeof (hkey_r));
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "Get value for key tcp_port on R.\n");
+      value = get_value ("tcp_port", token);
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "tcp_port: %s\n",
+           value);
+      ret = sscanf (value, "%u", &(router->tcp_port));
+      GNUNET_free (value);
+      GNUNET_break (0 != ret && 1 >= router->tcp_port);
+
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "Get value for key udp_port on R.\n");
+      value2 = get_value ("udp_port", token);
+      ret = sscanf (value2, "%u", &(router->udp_port));
+      GNUNET_free (value2);
+      GNUNET_break (0 != ret && 1 >= router->udp_port);
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "udp_port: %s\n",
+           value2);
+      GNUNET_free (value2);
+      if (GNUNET_YES == GNUNET_CONTAINER_multishortmap_contains (
+            topo->map_namespaces,
+            &hkey_r))
+      {
+        namespace = GNUNET_CONTAINER_multishortmap_get (topo->map_namespaces,
+                                                        &hkey_r);
+      }
+      else
+      {
+        namespace = GNUNET_new (struct GNUNET_TESTING_NetjailNamespace);
+        namespace->namespace_n = out;
+        namespace->nodes = GNUNET_CONTAINER_multishortmap_create (1,GNUNET_NO);
+        GNUNET_CONTAINER_multishortmap_put (topo->map_namespaces,
+                                            &hkey_r,
+                                            namespace,
+                                            GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+      }
+      namespace->router = router;
+
+    }
+    else if (0 == strcmp (key, "P"))
+    {
+      struct GNUNET_TESTING_NetjailNode *p_node = GNUNET_new (struct
+                                                              GNUNET_TESTING_NetjailNode);
+      struct GNUNET_ShortHashCode hkey_p;
+
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "Get first Value for P.\n");
+      out = get_first_value (token);
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "P: %u\n",
+           out);
+      GNUNET_CRYPTO_hash (&out, sizeof(out), &hc);
+      memcpy (&hkey_p,
+              &hc,
+              sizeof (hkey_p));
+
+      if (GNUNET_YES == GNUNET_CONTAINER_multishortmap_contains (
+            topo->map_namespaces,
+            &hkey_p))
+      {
+        namespace = GNUNET_CONTAINER_multishortmap_get (topo->map_namespaces,
+                                                        &hkey_p);
+      }
+      else
+      {
+        namespace = GNUNET_new (struct GNUNET_TESTING_NetjailNamespace);
+        namespace->nodes = GNUNET_CONTAINER_multishortmap_create (1,GNUNET_NO);
+        namespace->namespace_n = out;
+        GNUNET_CONTAINER_multishortmap_put (topo->map_namespaces,
+                                            &hkey_p,
+                                            namespace,
+                                            GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+      }
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "Get second Value for P.\n");
+      out = get_second_value (token);
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "P: %u\n",
+           out);
+      GNUNET_CRYPTO_hash (&out, sizeof(out), &hc);
+      memcpy (&hkey_p,
+              &hc,
+              sizeof (hkey_p));
+      if (GNUNET_YES == GNUNET_CONTAINER_multishortmap_contains (
+            namespace->nodes,
+            &hkey_p))
+      {
+        GNUNET_break (0);
+      }
+      else
+      {
+
+        GNUNET_CONTAINER_multishortmap_put (namespace->nodes,
+                                            &hkey_p,
+                                            p_node,
+                                            GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+        LOG (GNUNET_ERROR_TYPE_DEBUG,
+             "Get value for key plugin on P.\n");
+        value = get_value ("plugin", token);
+        if (NULL != value)
+        {
+          LOG (GNUNET_ERROR_TYPE_DEBUG,
+               "plugin: %s\n",
+               value);
+          p_node->plugin = value;
+        }
+        p_node->node_n = out;
+        p_node->namespace_n = namespace->namespace_n;
+      }
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "Get AC Value for P.\n");
+      parse_ac (p_node, token);
+      node_connections (token, p_node);
+    }
+    token = strtok_r (NULL, "\n", &rest);
+    if (NULL != token)
+      LOG (GNUNET_ERROR_TYPE_DEBUG,
+           "Next token %s\n",
+           token);
+  }
+  if (NULL != key)
+    GNUNET_free (key);
+  GNUNET_free (data);
+  return topo;
+  }*/
+
+
+GNUNET_TESTING_SIMPLE_NETJAIL_TRAITS (
+  GNUNET_TESTING_MAKE_IMPL_SIMPLE_TRAIT,
+  GNUNET_TESTING)
+
+
+/* end of netjail.c */
diff --git a/src/include/gnunet_testing_netjail_lib.h b/src/lib/testing/testing_api_topology.h
index 843fce0d5..45afb9114 100644
--- a/src/include/gnunet_testing_netjail_lib.h
+++ b/src/lib/testing/testing_api_topology.h
@@ -24,11 +24,11 @@
  * @author Marcello Stanisci
  * @author t3sserakt
  */
-#ifndef GNUNET_TESTING_NETJAIL_LIB_H
-#define GNUNET_TESTING_NETJAIL_LIB_H
+#ifndef NETJAIL_H
+#define NETJAIL_H
 
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_plugin.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testing_lib.h"
 
 
 /**
@@ -189,7 +189,6 @@ struct GNUNET_TESTING_NetjailNode
   unsigned int expected_reaches;
 };
 
-
 /**
  * Subnet in a topology.
  */
@@ -212,17 +211,151 @@ struct GNUNET_TESTING_NetjailNamespace
 };
 
 /**
+ * Backbone peer.
+ */
+struct GNUNET_TESTING_NetjailBackbonePeer
+{
+  /**
+   * Unique identifier this part of the topology can be identified.
+   */
+  unsigned int number;
+};
+
+/**
+ * Backbone peer.
+ */
+struct GNUNET_TESTING_NetjailCarrierPeer
+{
+  /**
+   * Unique identifier this part of the topology can be identified.
+   */
+  unsigned int number;
+};
+
+/**
+ * Carrier.
+ */
+struct GNUNET_TESTING_NetjailCarrier
+{
+  /**
+   * Unique identifier this part of the topology can be identified.
+   */
+  unsigned int number;
+
+  /**
+   * Of all carriers this has index.
+   */
+  unsigned int index;
+
+  /**
+   * Number of carrier peers.
+   */
+  unsigned int number_peers;
+
+  /**
+   * Number of carrier subnets.
+   */
+  unsigned int number_subnets;
+
+  /**
+   * Hash map containing subnets.
+   */
+  struct GNUNET_CONTAINER_MultiShortmap *subnets;
+
+  /**
+   * Hash map containing peers.
+   */
+  struct GNUNET_CONTAINER_MultiShortmap *peers;
+};
+
+/**
+ * Carrier subnet.
+ */
+struct GNUNET_TESTING_NetjailSubnet
+{
+  /**
+   * Unique identifier this part of the topology can be identified.
+   */
+  unsigned int number;
+
+  /**
+   * Of all subnets this has index.
+   */
+  unsigned int index;
+
+  /**
+   * Number of subnet peers.
+   */
+  unsigned int number_peers;
+
+  /**
+   * Hash map containing peers.
+   */
+  struct GNUNET_CONTAINER_MultiShortmap *peers;
+};
+
+/**
+ * Subnet peer.
+ */
+struct GNUNET_TESTING_NetjailSubnetPeer
+{
+  /**
+   * Unique identifier this part of the topology can be identified.
+   */
+  unsigned int number;
+};
+
+/**
  * Toplogy of our netjail setup.
  */
 struct GNUNET_TESTING_NetjailTopology
 {
 
   /**
+   * Default number of subnets per carrier.
+   */
+  unsigned long long default_subnets;
+
+  /**
+   * Default number of peers per carrier.
+   */
+  unsigned long long default_carrier_peers;
+
+  /**
+   * Default number of peers per subnet.
+   */
+  unsigned long long default_subnet_peers;
+  /**
    * Default plugin for the test case to be run on nodes.
    */
   char *plugin;
 
   /**
+   * Default number of backbone peers.
+   */
+  unsigned long long num_backbone_peers;
+
+  /**
+   * Number of carriers.
+   */
+  unsigned long long num_carriers;
+
+  /**
+   * Hash map containing the carriers.
+   */
+  struct GNUNET_CONTAINER_MultiShortmap *carriers;
+
+  /**
+   * Hash map containing the carriers.
+   */
+  struct GNUNET_CONTAINER_MultiShortmap *backbone_peers;
+
+  /**
+   * Total number of namespaces in the topology.
+   */
+  unsigned int total;
+
+  /**
    * Number of subnets.
    */
   unsigned int namespaces_n;
@@ -253,25 +386,15 @@ struct GNUNET_TESTING_NetjailTopology
   unsigned int additional_connects;
 };
 
-/**
- * Getting the topology from file.
- *
- * @param filename The name of the topology file.
- * @return The GNUNET_TESTING_NetjailTopology
- */
-struct GNUNET_TESTING_NetjailTopology *
-GNUNET_TESTING_get_topo_from_file (const char *filename);
-
 
 /**
- * FIXME: this could use a "to_string".
  * Parse the topology data.
  *
  * @param data The topology data.
  * @return The GNUNET_TESTING_NetjailTopology
  */
 struct GNUNET_TESTING_NetjailTopology *
-GNUNET_TESTING_get_topo_from_string (const char *data);
+GNUNET_TESTING_get_topo_from_string_ (const char *data);
 
 
 /**
@@ -281,9 +404,10 @@ GNUNET_TESTING_get_topo_from_string (const char *data);
  * @return The number of additional connects
  */
 unsigned int
-GNUNET_TESTING_get_additional_connects (unsigned int num,
-                                        struct GNUNET_TESTING_NetjailTopology *
-                                        topology);
+GNUNET_TESTING_get_additional_connects (
+  unsigned int num,
+  struct GNUNET_TESTING_NetjailTopology *topology);
+
 
 /**
  * Get a node from the topology.
@@ -305,8 +429,9 @@ GNUNET_TESTING_get_node (unsigned int num,
  * @return The connections of the node.
  */
 struct GNUNET_TESTING_NodeConnection *
-GNUNET_TESTING_get_connections (unsigned int num,
-                                const struct GNUNET_TESTING_NetjailTopology *topology);
+GNUNET_TESTING_get_connections (
+  unsigned int num,
+  const struct GNUNET_TESTING_NetjailTopology *topology);
 
 
 /**
@@ -317,14 +442,24 @@ GNUNET_TESTING_get_connections (unsigned int num,
  * @return The address of the communicator.
  */
 char *
-GNUNET_TESTING_get_address (struct GNUNET_TESTING_NodeConnection *connection,
-                            const char *prefix);
+GNUNET_TESTING_get_address (
+  struct GNUNET_TESTING_NodeConnection *connection,
+  const char *prefix);
+
+
+/**
+ * Get the global plugin name form the topology file
+ */
+char *
+GNUNET_TESTING_get_plugin_from_topo (
+  struct GNUNET_TESTING_NetjailTopology *njt,
+  const char *my_node_id);
 
 
 /**
  * Deallocate memory of the struct GNUNET_TESTING_NetjailTopology.
  *
- * @param topology The GNUNET_TESTING_NetjailTopology to be deallocated.
+ * @param[in] topology The GNUNET_TESTING_NetjailTopology to be deallocated.
  */
 void
 GNUNET_TESTING_free_topology (struct GNUNET_TESTING_NetjailTopology *topology);
@@ -338,209 +473,22 @@ GNUNET_TESTING_free_topology (struct GNUNET_TESTING_NetjailTopology *topology);
  * @return The unique id of the node from the connection.
  */
 unsigned int
-GNUNET_TESTING_calculate_num (struct
-                              GNUNET_TESTING_NodeConnection *node_connection,
-                              struct GNUNET_TESTING_NetjailTopology *topology);
-
-
-/**
- * Struct with information for callbacks.
- *
- */
-struct GNUNET_TESTING_BlockState
-{
-  /**
-   * Context for our asynchronous completion.
-   */
-  struct GNUNET_TESTING_AsyncContext ac;
-
-  /**
-   * The label of this command.
-   */
-  const char *label;
-
-  /**
-   * If this command will block.
-   */
-  unsigned int asynchronous_finish;
-};
-
-/**
- * Struct to hold information for callbacks.
- *
- */
-struct GNUNET_TESTING_LocalPreparedState
-{
-  /**
-   * Context for our asynchronous completion.
-   */
-  struct GNUNET_TESTING_AsyncContext ac;
-
-  /**
-   * Callback to write messages to the master loop.
-   *
-   */
-  GNUNET_TESTING_cmd_helper_write_cb write_message;
-};
-
-/**
- * This command destroys the ressources allocated for the test system setup.
- *
- * @param label Name for command.
- * @param create_label Label of the cmd which started the test system.
- * @param write_message Callback to write messages to the master loop.
- * @return command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_system_destroy (const char *label,
-                                   const char *create_label);
-
-/**
- * This command is setting up a test environment for a peer to start.
- *
- * @param label Name for command.
- * @param testdir Only the directory name without any path. Temporary
- *                directory used for all service homes.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_system_create (const char *label,
-                                  const char *testdir);
-
-
-/**
- * This command executes a shell script to setup the netjail environment.
- *
- * @param label name for command.
- * @param topology_config Configuration file for the test topology.
- * @param read_file Flag indicating if the the name of the topology file is send to the helper, or a string with the topology data.
- * @return command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_netjail_start (const char *label,
-                                  char *topology_config,
-                                  unsigned int *read_file);
-
-
-/**
- * This command executes a shell script to remove the netjail environment.
- *
- * @param label name for command.
- * @param topology_config Configuration file for the test topology.
- * @param read_file Flag indicating if the the name of the topology file is send to the helper, or a string with the topology data.
- * @return command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_netjail_stop (const char *label,
-                                 char *topology_config,
-                                 unsigned int *read_file);
-
-
-/**
- * This command executes a shell script which starts a helper process. 
- * This process is running on a netjail node, executing a defined test case.
- *
- * @param label Name for the command.
- * @param topology The complete topology information.
- * @param read_file Flag indicating if the the name of the topology file is send to the helper, or a string with the topology data.
- * @param topology_data If read_file is GNUNET_NO, topology_data holds the string with the topology.
- * @param timeout Before this timeout is reached this cmd MUST finish.
- * @return command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_netjail_start_cmds_helper (
-  const char *label,
-  struct GNUNET_TESTING_NetjailTopology *topology,
-  unsigned int *read_file,
-  char *topology_data,
-  struct GNUNET_TIME_Relative timeout);
-
-
-/**
- * Create command.
- *
- * @param label name for command.
- * @param helper_start_label label of the cmd to start the test system.
- * @param topology The complete topology information.
- * @return command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_stop_cmds_helper (
-  const char *label,
-  const char *helper_start_label,
+GNUNET_TESTING_calculate_num (
+  struct GNUNET_TESTING_NodeConnection *node_connection,
   struct GNUNET_TESTING_NetjailTopology *topology);
 
 
 /**
- * This command is used to block the loop, until the command is finished by other commands, 
- * using a trait to get this commands  struct GNUNET_TESTING_AsyncContext.
- *
- * @param label name for command.
- * @return command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_block_until_external_trigger (
-  const char *label);
-
-/**
- * DEPRECATED
- * This command sends a GNUNET_MESSAGE_TYPE_CMDS_HELPER_PEER_STARTED message to the master loop.
- *
- * @param label name for command.
- * @param write_message Callback to write messages to the master loop.
- * @return command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_send_peer_ready (const char *label,
-                                    GNUNET_TESTING_cmd_helper_write_cb write_message);
-
-
-/**
- * This command sends a GNUNET_MESSAGE_TYPE_CMDS_HELPER_LOCAL_TESTS_PREPARED message to the master loop.
- *
- * @param label name for command.
- * @param write_message Callback to write messages to the master loop.
- * @return command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_local_test_prepared (const char *label,
-                                        GNUNET_TESTING_cmd_helper_write_cb
-                                        write_message);
-
-
-/**
- * Create command.
- *
- * @param label name for command.
- * @param system_label Label of the cmd to setup a test environment.
- * @param no Decimal number representing the last byte of the IP address of this peer.
- * @param node_ip The IP address of this node.
- * @param cfgname Configuration file name for this peer.
- * @param broadcast Flag indicating, if broadcast should be switched on.
- * @return command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_start_peer (const char *label,
-                               const char *system_label,
-                               uint32_t no,
-                               const char *node_ip,
-                               const char *cfgname,
-                               unsigned int broadcast);
-
-
-/* ***** Netjail trait support ***** */
-
-
-/**
  * Call #op on all simple traits.
  */
 #define GNUNET_TESTING_SIMPLE_NETJAIL_TRAITS(op, prefix)                            \
-  op (prefix, test_system, const struct GNUNET_TESTING_System)                      \
-  op (prefix, async_context, struct GNUNET_TESTING_AsyncContext)                    \
-  op (prefix, helper_handles, const struct GNUNET_HELPER_Handle *)                  \
-  op (prefix, local_prepared_state, const struct GNUNET_TESTING_LocalPreparedState) \
-  op (prefix, block_state, struct GNUNET_TESTING_BlockState)
+        op (prefix, topology, const struct GNUNET_TESTING_NetjailTopology)            \
+        op (prefix, topology_string, const char)                                          \
+        op (prefix, async_context, struct GNUNET_TESTING_AsyncContext)                    \
+        op (prefix, helper_handles, const struct GNUNET_HELPER_Handle *)
 
-GNUNET_TESTING_SIMPLE_NETJAIL_TRAITS (GNUNET_TESTING_MAKE_DECL_SIMPLE_TRAIT, GNUNET_TESTING)
+GNUNET_TESTING_SIMPLE_NETJAIL_TRAITS (GNUNET_TESTING_MAKE_DECL_SIMPLE_TRAIT,
+                                      GNUNET_TESTING)
 
 
 #endif
diff --git a/src/service/testing/testing_api_traits.c b/src/lib/testing/testing_api_traits.c
index 18faa2d04..0726a7576 100644
--- a/src/service/testing/testing_api_traits.c
+++ b/src/lib/testing/testing_api_traits.c
@@ -26,23 +26,11 @@
  * @author t3sserakt
  */
 #include "platform.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_plugin.h"
-#include "gnunet_testing_barrier.h"
-#include "gnunet_testing_netjail_lib.h"
+#include "gnunet_testing_lib.h"
 
 
-/* FIXME: move these into respective sub-libs? */
-
-GNUNET_TESTING_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_IMPL_SIMPLE_TRAIT, GNUNET_TESTING)
-
-GNUNET_TESTING_INDEXED_TRAITS (GNUNET_TESTING_MAKE_IMPL_INDEXED_TRAIT, GNUNET_TESTING)
-
-GNUNET_TESTING_LOOP_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_IMPL_SIMPLE_TRAIT, GNUNET_TESTING)
-
-GNUNET_TESTING_LOOP_INDEXED_TRAITS (GNUNET_TESTING_MAKE_IMPL_INDEXED_TRAIT, GNUNET_TESTING)
-
-GNUNET_TESTING_SIMPLE_NETJAIL_TRAITS (GNUNET_TESTING_MAKE_IMPL_SIMPLE_TRAIT, GNUNET_TESTING)
+GNUNET_TESTING_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_IMPL_SIMPLE_TRAIT,
+                              GNUNET_TESTING)
 
 /**
  * End a trait array.  Usually, commands offer several traits,
diff --git a/src/lib/testing/testing_cmds.h b/src/lib/testing/testing_cmds.h
new file mode 100644
index 000000000..79876556b
--- /dev/null
+++ b/src/lib/testing/testing_cmds.h
@@ -0,0 +1,109 @@
+/*
+      This file is part of GNUnet
+      Copyright (C) 2021 GNUnet e.V.
+
+      GNUnet is free software: you can redistribute it and/or modify it
+      under the terms of the GNU Affero General Public License as published
+      by the Free Software Foundation, either version 3 of the License,
+      or (at your option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Affero General Public License for more details.
+
+      You should have received a copy of the GNU Affero General Public License
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+/**
+ * @file testing/testing_cmds.h
+ * @brief Message formats for communication between testing cmds helper and testcase plugins.
+ * @author t3sserakt
+ */
+
+#ifndef TESTING_CMDS_H
+#define TESTING_CMDS_H
+
+#include "gnunet_common.h"
+
+#define HELPER_CMDS_BINARY "gnunet-cmds-helper"
+
+#define NETJAIL_EXEC_SCRIPT "netjail_exec.sh"
+
+GNUNET_NETWORK_STRUCT_BEGIN
+
+/**
+ * Initialization message for gnunet-cmds-testbed to start cmd binary.
+ */
+struct GNUNET_TESTING_CommandHelperInit
+{
+  /**
+   * Type is #GNUNET_MESSAGE_TYPE_CMDS_HELPER_INIT
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * Number of barriers the helper inherits.
+   */
+  uint32_t barrier_count GNUNET_PACKED;
+
+  /* Followed by barrier_count barrier hashes */
+
+  /* Followed by topology data */
+};
+
+
+struct GNUNET_TESTING_CommandLocalFinished
+{
+  /**
+   * Type is GNUNET_MESSAGE_TYPE_CMDS_HELPER_LOCAL_FINISHED
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * The exit status local test return with in NBO.
+   */
+  uint32_t rv GNUNET_PACKED;
+};
+
+
+/**
+ * Child to parent: I reached the given barrier,
+ * increment the counter (or pass to grandparent).
+ */
+struct GNUNET_TESTING_CommandBarrierReached
+{
+  struct GNUNET_MessageHeader header;
+  struct GNUNET_ShortHashCode barrier_key;
+};
+
+
+/**
+ * Parent to child: you're inheriting a barrier.
+ * If the barrier was already satisfied, the parent
+ * must sent a separate barrier satisfied message.
+ */
+struct GNUNET_TESTING_CommandBarrierInherited
+{
+  struct GNUNET_MessageHeader header;
+  struct GNUNET_ShortHashCode barrier_key;
+};
+
+
+/**
+ * Parent to child: this barrier was satisfied.
+ */
+struct GNUNET_TESTING_CommandBarrierSatisfied
+{
+  struct GNUNET_MessageHeader header;
+  struct GNUNET_ShortHashCode barrier_key;
+};
+
+
+GNUNET_NETWORK_STRUCT_END
+
+#endif
+/* end of testing_cmds.h */
diff --git a/src/lib/util/Makefile.am b/src/lib/util/Makefile.am
index 4d052c57b..38dd4c2ad 100644
--- a/src/lib/util/Makefile.am
+++ b/src/lib/util/Makefile.am
@@ -84,8 +84,7 @@ libgnunetutil_la_SOURCES = \
   mq.c \
   nc.c \
   network.c \
-        nt.c \
-  op.c \
+  nt.c \
   os_installation.c \
   os_network.c \
   os_priority.c \
diff --git a/src/lib/util/common_allocation.c b/src/lib/util/common_allocation.c
index 36d49eddb..afd701720 100644
--- a/src/lib/util/common_allocation.c
+++ b/src/lib/util/common_allocation.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     Copyright (C) 2001, 2002, 2003, 2005, 2006 GNUnet e.V.
+     Copyright (C) 2001, 2002, 2003, 2005, 2006, 2024 GNUnet e.V.
 
      GNUnet is free software: you can redistribute it and/or modify it
      under the terms of the GNU Affero General Public License as published
@@ -34,60 +34,41 @@
 #endif
 
 #define LOG(kind, ...) \
-  GNUNET_log_from (kind, "util-common-allocation", __VA_ARGS__)
+        GNUNET_log_from (kind, "util-common-allocation", __VA_ARGS__)
 
 #define LOG_STRERROR(kind, syscall) \
-  GNUNET_log_from_strerror (kind, "util-common-allocation", syscall)
+        GNUNET_log_from_strerror (kind, "util-common-allocation", syscall)
 
 #ifndef INT_MAX
 #define INT_MAX 0x7FFFFFFF
 #endif
 
 
-/**
- * Allocate memory. Checks the return value, aborts if no more
- * memory is available.
- *
- * @param size how many bytes of memory to allocate, do NOT use
- *  this function (or GNUNET_malloc()) to allocate more than several MB
- *  of memory, if you are possibly needing a very large chunk use
- *  #GNUNET_xmalloc_unchecked_() instead.
- * @param filename where in the code was the call to GNUNET_malloc()
- * @param linenumber where in the code was the call to GNUNET_malloc()
- * @return pointer to size bytes of memory
- */
 void *
-GNUNET_xmalloc_ (size_t size, const char *filename, int linenumber)
+GNUNET_xmalloc_ (size_t size,
+                 const char *filename,
+                 int linenumber)
 {
   void *ret;
 
   /* As a security precaution, we generally do not allow very large
    * allocations using the default 'GNUNET_malloc()' macro */
-  GNUNET_assert_at (size <= GNUNET_MAX_MALLOC_CHECKED, filename, linenumber);
-  ret = GNUNET_xmalloc_unchecked_ (size, filename, linenumber);
+  GNUNET_assert_at (size <= GNUNET_MAX_MALLOC_CHECKED,
+                    filename,
+                    linenumber);
+  ret = GNUNET_xmalloc_unchecked_ (size,
+                                   filename,
+                                   linenumber);
   if (NULL == ret)
   {
-    LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "malloc");
+    LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR,
+                  "malloc");
     GNUNET_assert (0);
   }
   return ret;
 }
 
 
-/**
- * Allocate memory for a two dimensional array in one block
- * and set up pointers. Aborts if no more memory is available.
- * Don't use GNUNET_xnew_array_2d_ directly. Use the
- * #GNUNET_new_array_2d macro.
- * The memory of the elements will be zero'ed out.
- *
- * @param n size of the first dimension
- * @param m size of the second dimension
- * @param elementSize size of a single element in bytes
- * @param filename where is this call being made (for debugging)
- * @param linenumber line where this call is being made (for debugging)
- * @return allocated memory, never NULL
- */
 void **
 GNUNET_xnew_array_2d_ (size_t n,
                        size_t m,
@@ -109,21 +90,6 @@ GNUNET_xnew_array_2d_ (size_t n,
 }
 
 
-/**
- * Allocate memory for a three dimensional array in one block
- * and set up pointers. Aborts if no more memory is available.
- * Don't use GNUNET_xnew_array_3d_ directly. Use the
- * #GNUNET_new_array_3d macro.
- * The memory of the elements will be zero'ed out.
- *
- * @param n size of the first dimension
- * @param m size of the second dimension
- * @param o size of the third dimension
- * @param elementSize size of a single element in bytes
- * @param filename where is this call being made (for debugging)
- * @param linenumber line where this call is being made (for debugging)
- * @return allocated memory, never NULL
- */
 void ***
 GNUNET_xnew_array_3d_ (size_t n,
                        size_t m,
@@ -166,58 +132,50 @@ GNUNET_xmemdup_ (const void *buf,
 
   /* As a security precaution, we generally do not allow very large
    * allocations here */
-  GNUNET_assert_at (size <= GNUNET_MAX_MALLOC_CHECKED, filename, linenumber);
-  GNUNET_assert_at (size < INT_MAX, filename, linenumber);
+  GNUNET_assert_at (size <= GNUNET_MAX_MALLOC_CHECKED,
+                    filename,
+                    linenumber);
+  GNUNET_assert_at (size < INT_MAX,
+                    filename,
+                    linenumber);
   ret = malloc (size);
-  if (ret == NULL)
+  if (NULL == ret)
   {
-    LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "malloc");
+    LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR,
+                  "malloc");
     GNUNET_assert (0);
   }
-  GNUNET_memcpy (ret, buf, size);
+  GNUNET_memcpy (ret,
+                 buf,
+                 size);
   return ret;
 }
 
 
-/**
- * Wrapper around malloc(). Allocates size bytes of memory.
- * The memory will be zero'ed out.
- *
- * @param size the number of bytes to allocate
- * @param filename where in the code was the call to GNUNET_malloc_unchecked()
- * @param linenumber where in the code was the call to GNUNET_malloc_unchecked()
- * @return pointer to size bytes of memory, NULL if we do not have enough memory
- */
 void *
-GNUNET_xmalloc_unchecked_ (size_t size, const char *filename, int linenumber)
+GNUNET_xmalloc_unchecked_ (size_t size,
+                           const char *filename,
+                           int linenumber)
 {
   void *result;
 
   (void) filename;
   (void) linenumber;
-
   result = malloc (size);
   if (NULL == result)
     return NULL;
-  memset (result, 0, size);
-
+  memset (result,
+          0,
+          size);
   return result;
 }
 
 
-/**
- * Reallocate memory. Checks the return value, aborts if no more
- * memory is available.
- * The content of the intersection of the new and old size will be unchanged.
- *
- * @param ptr the pointer to reallocate
- * @param n how many bytes of memory to allocate
- * @param filename where in the code was the call to GNUNET_realloc()
- * @param linenumber where in the code was the call to GNUNET_realloc()
- * @return pointer to size bytes of memory
- */
 void *
-GNUNET_xrealloc_ (void *ptr, size_t n, const char *filename, int linenumber)
+GNUNET_xrealloc_ (void *ptr,
+                  size_t n,
+                  const char *filename,
+                  int linenumber)
 {
   (void) filename;
   (void) linenumber;
@@ -249,7 +207,8 @@ GNUNET_xrealloc_ (void *ptr, size_t n, const char *filename, int linenumber)
   ptr = realloc (ptr, n);
   if ((NULL == ptr) && (n > 0))
   {
-    LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "realloc");
+    LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR,
+                  "realloc");
     GNUNET_assert (0);
   }
   return ptr;
@@ -272,14 +231,6 @@ GNUNET_xrealloc_ (void *ptr, size_t n, const char *filename, int linenumber)
 #define M_SIZE(p) malloc_size (p)
 #endif
 
-/**
- * Free memory. Merely a wrapper for the case that we
- * want to keep track of allocations.
- *
- * @param ptr the pointer to free
- * @param filename where in the code was the call to GNUNET_free()
- * @param linenumber where in the code was the call to GNUNET_free()
- */
 void
 GNUNET_xfree_ (void *ptr,
                const char *filename,
@@ -304,35 +255,37 @@ GNUNET_xfree_ (void *ptr,
 }
 
 
-/**
- * Dup a string (same semantics as strdup).
- *
- * @param str the string to dup
- * @param filename where in the code was the call to GNUNET_strdup()
- * @param linenumber where in the code was the call to GNUNET_strdup()
- * @return `strdup(@a str)`
- */
 char *
-GNUNET_xstrdup_ (const char *str, const char *filename, int linenumber)
+GNUNET_xstrdup_ (const char *str,
+                 const char *filename,
+                 int linenumber)
 {
+  size_t slen = strlen (str) + 1;
   char *res;
-  size_t slen;
 
-  GNUNET_assert_at (str != NULL, filename, linenumber);
-  slen = strlen (str) + 1;
-  res = GNUNET_xmalloc_ (slen, filename, linenumber);
-  GNUNET_memcpy (res, str, slen);
+  GNUNET_assert_at (str != NULL,
+                    filename,
+                    linenumber);
+  res = GNUNET_xmalloc_ (slen,
+                         filename,
+                         linenumber);
+  GNUNET_memcpy (res,
+                 str,
+                 slen);
   return res;
 }
 
 
 #if ! HAVE_STRNLEN
 static size_t
-strnlen (const char *s, size_t n)
+strnlen (const char *s,
+         size_t n)
 {
   const char *e;
 
-  e = memchr (s, '\0', n);
+  e = memchr (s,
+              '\0',
+              n);
   if (NULL == e)
     return n;
   return e - s;
@@ -342,15 +295,6 @@ strnlen (const char *s, size_t n)
 #endif
 
 
-/**
- * Dup partially a string (same semantics as strndup).
- *
- * @param str the string to dup
- * @param len the length of the string to dup
- * @param filename where in the code was the call to GNUNET_strndup()
- * @param linenumber where in the code was the call to GNUNET_strndup()
- * @return `strndup(@a str,@a len)`
- */
 char *
 GNUNET_xstrndup_ (const char *str,
                   size_t len,
@@ -361,27 +305,19 @@ GNUNET_xstrndup_ (const char *str,
 
   if (0 == len)
     return GNUNET_strdup ("");
-  GNUNET_assert_at (NULL != str, filename, linenumber);
+  GNUNET_assert_at (NULL != str,
+                    filename,
+                    linenumber);
   len = strnlen (str, len);
-  res = GNUNET_xmalloc_ (len + 1, filename, linenumber);
+  res = GNUNET_xmalloc_ (len + 1,
+                         filename,
+                         linenumber);
   GNUNET_memcpy (res, str, len);
   /* res[len] = '\0'; 'malloc' zeros out anyway */
   return res;
 }
 
 
-/**
- * Grow an array.  Grows old by (*oldCount-newCount)*elementSize bytes
- * and sets *oldCount to newCount.
- *
- * @param old address of the pointer to the array
- *        *old may be NULL
- * @param elementSize the size of the elements of the array
- * @param oldCount address of the number of elements in the *old array
- * @param newCount number of elements in the new array, may be 0
- * @param filename where in the code was the call to GNUNET_array_grow()
- * @param linenumber where in the code was the call to GNUNET_array_grow()
- */
 void
 GNUNET_xgrow_ (void **old,
                size_t elementSize,
@@ -401,65 +337,70 @@ GNUNET_xgrow_ (void **old,
   }
   else
   {
-    tmp = GNUNET_xmalloc_ (size, filename, linenumber);
+    tmp = GNUNET_xmalloc_ (size,
+                           filename,
+                           linenumber);
     if (NULL != *old)
     {
-      GNUNET_memcpy (tmp, *old, elementSize * GNUNET_MIN (*oldCount, newCount));
+      GNUNET_memcpy (tmp,
+                     *old,
+                     elementSize * GNUNET_MIN (*oldCount,
+                                               newCount));
     }
   }
 
   if (NULL != *old)
   {
-    GNUNET_xfree_ (*old, filename, linenumber);
+    GNUNET_xfree_ (*old,
+                   filename,
+                   linenumber);
   }
   *old = tmp;
   *oldCount = newCount;
 }
 
 
-/**
- * Like asprintf(), just portable.
- *
- * @param buf set to a buffer of sufficient size (allocated, caller must free)
- * @param format format string (see printf(), fprintf(), etc.)
- * @param ... data for format string
- * @return number of bytes in `*@a buf`, excluding 0-termination
- */
 int
-GNUNET_asprintf (char **buf, const char *format, ...)
+GNUNET_asprintf (char **buf,
+                 const char *format,
+                 ...)
 {
   int ret;
   va_list args;
 
-  va_start (args, format);
-  ret = vsnprintf (NULL, 0, format, args);
+  va_start (args,
+            format);
+  ret = vsnprintf (NULL,
+                   0,
+                   format,
+                   args);
   va_end (args);
   GNUNET_assert (ret >= 0);
   *buf = GNUNET_malloc (ret + 1);
   va_start (args, format);
-  ret = vsprintf (*buf, format, args);
+  ret = vsprintf (*buf,
+                  format,
+                  args);
   va_end (args);
   return ret;
 }
 
 
-/**
- * Like snprintf(), just aborts if the buffer is of insufficient size.
- *
- * @param buf pointer to buffer that is written to
- * @param size number of bytes in buf
- * @param format format strings
- * @param ... data for format string
- * @return number of bytes written to buf or negative value on error
- */
 int
-GNUNET_snprintf (char *buf, size_t size, const char *format, ...)
+GNUNET_snprintf (char *buf,
+                 size_t size,
+                 const char *format,
+                 ...)
 {
   int ret;
   va_list args;
 
-  va_start (args, format);
-  ret = vsnprintf (buf, size, format, args);
+  va_start (args,
+            format);
+  ret = vsnprintf (buf,
+                   size,
+                   format,
+                   args);
   va_end (args);
   GNUNET_assert ((ret >= 0) && (((size_t) ret) < size));
   return ret;
@@ -480,15 +421,7 @@ GNUNET_copy_message (const struct GNUNET_MessageHeader *msg)
 }
 
 
-/**
- * Check that memory in @a a is all zeros. @a a must be a pointer.
- *
- * @param a pointer to @a n bytes which should be tested for the
- *          entire memory being zero'ed out.
- * @param n number of bytes in @a to be tested
- * @return GNUNET_YES if a is zero, GNUNET_NO otherwise
- */
-enum GNUNET_GenericReturnValue
+bool
 GNUNET_is_zero_ (const void *a,
                  size_t n)
 {
@@ -496,8 +429,8 @@ GNUNET_is_zero_ (const void *a,
 
   for (size_t i = 0; i < n; i++)
     if (b[i])
-      return GNUNET_NO;
-  return GNUNET_YES;
+      return false;
+  return true;
 }
 
 
diff --git a/src/lib/util/crypto_ecc.c b/src/lib/util/crypto_ecc.c
index 11c3e50d4..8ea17fda0 100644
--- a/src/lib/util/crypto_ecc.c
+++ b/src/lib/util/crypto_ecc.c
@@ -411,24 +411,39 @@ GNUNET_CRYPTO_eddsa_private_key_from_string (
 }
 
 
+static void
+buffer_clear (void *buf, size_t len)
+{
+#if HAVE_MEMSET_S
+  memset_s (buf, len, 0, len);
+#elif HAVE_EXPLICIT_BZERO
+  explicit_bzero (buf, len);
+#else
+  volatile unsigned char *p = buf;
+  while (len--)
+    *p++ = 0;
+#endif
+}
+
+
 void
 GNUNET_CRYPTO_ecdhe_key_clear (struct GNUNET_CRYPTO_EcdhePrivateKey *pk)
 {
-  memset (pk, 0, sizeof(struct GNUNET_CRYPTO_EcdhePrivateKey));
+  buffer_clear (pk, sizeof(struct GNUNET_CRYPTO_EcdhePrivateKey));
 }
 
 
 void
 GNUNET_CRYPTO_ecdsa_key_clear (struct GNUNET_CRYPTO_EcdsaPrivateKey *pk)
 {
-  memset (pk, 0, sizeof(struct GNUNET_CRYPTO_EcdsaPrivateKey));
+  buffer_clear (pk, sizeof(struct GNUNET_CRYPTO_EcdsaPrivateKey));
 }
 
 
 void
 GNUNET_CRYPTO_eddsa_key_clear (struct GNUNET_CRYPTO_EddsaPrivateKey *pk)
 {
-  memset (pk, 0, sizeof(struct GNUNET_CRYPTO_EddsaPrivateKey));
+  buffer_clear (pk, sizeof(struct GNUNET_CRYPTO_EddsaPrivateKey));
 }
 
 
diff --git a/src/lib/util/crypto_ecc_setup.c b/src/lib/util/crypto_ecc_setup.c
index 2ee9ed931..07e28f89d 100644
--- a/src/lib/util/crypto_ecc_setup.c
+++ b/src/lib/util/crypto_ecc_setup.c
@@ -297,6 +297,7 @@ GNUNET_CRYPTO_sign_by_peer_identity (const struct
                                      struct GNUNET_CRYPTO_EddsaSignature *sig)
 {
   struct GNUNET_CRYPTO_EddsaPrivateKey *priv;
+  enum GNUNET_GenericReturnValue result;
 
   if (NULL == (priv = GNUNET_CRYPTO_eddsa_key_create_from_configuration (cfg)))
   {
@@ -305,7 +306,9 @@ GNUNET_CRYPTO_sign_by_peer_identity (const struct
     return GNUNET_SYSERR;
   }
 
-  return GNUNET_CRYPTO_eddsa_sign_ (priv, purpose, sig);
+  result = GNUNET_CRYPTO_eddsa_sign_ (priv, purpose, sig);
+  GNUNET_CRYPTO_eddsa_key_clear (priv);
+  return result;
 }
 
 
diff --git a/src/lib/util/crypto_pkey.c b/src/lib/util/crypto_pkey.c
index a9d4831fb..92e0fba36 100644
--- a/src/lib/util/crypto_pkey.c
+++ b/src/lib/util/crypto_pkey.c
@@ -43,6 +43,23 @@ check_key_type (uint32_t type)
 }
 
 
+void
+GNUNET_CRYPTO_private_key_clear (struct GNUNET_CRYPTO_PrivateKey *key)
+{
+  switch (ntohl (key->type))
+  {
+  case GNUNET_PUBLIC_KEY_TYPE_ECDSA:
+    GNUNET_CRYPTO_ecdsa_key_clear (&key->ecdsa_key);
+    break;
+  case GNUNET_PUBLIC_KEY_TYPE_EDDSA:
+    GNUNET_CRYPTO_eddsa_key_clear (&key->eddsa_key);
+    break;
+  default:
+    GNUNET_break (0);
+  }
+}
+
+
 ssize_t
 GNUNET_CRYPTO_private_key_get_length (const struct
                                       GNUNET_CRYPTO_PrivateKey *key)
diff --git a/src/lib/util/helper.c b/src/lib/util/helper.c
index 1dd3e33e2..87ea749e9 100644
--- a/src/lib/util/helper.c
+++ b/src/lib/util/helper.c
@@ -612,7 +612,7 @@ helper_write (void *cls)
 struct GNUNET_HELPER_SendHandle *
 GNUNET_HELPER_send (struct GNUNET_HELPER_Handle *h,
                     const struct GNUNET_MessageHeader *msg,
-                    int can_drop,
+                    bool can_drop,
                     GNUNET_HELPER_Continuation cont,
                     void *cont_cls)
 {
@@ -621,7 +621,7 @@ GNUNET_HELPER_send (struct GNUNET_HELPER_Handle *h,
 
   if (NULL == h->fh_to_helper)
     return NULL;
-  if ((GNUNET_YES == can_drop) && (NULL != h->sh_head))
+  if (can_drop && (NULL != h->sh_head))
     return NULL;
   mlen = ntohs (msg->size);
   sh = GNUNET_malloc (sizeof(struct GNUNET_HELPER_SendHandle) + mlen);
diff --git a/src/lib/util/op.c b/src/lib/util/op.c
deleted file mode 100644
index a8fc3de4a..000000000
--- a/src/lib/util/op.c
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2016 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file
- * Asynchronous operations; register callbacks for operations and call them when a response arrives.
- *
- * @author Gabor X Toth
- */
-
-#include "platform.h"
-#include <inttypes.h>
-
-
-#include "gnunet_util_lib.h"
-
-#define LOG(kind, ...) GNUNET_log_from (kind, "util-op", __VA_ARGS__)
-
-struct OperationListItem
-{
-  struct OperationListItem *prev;
-  struct OperationListItem *next;
-
-  /**
-   * Operation ID.
-   */
-  uint64_t op_id;
-
-  /**
-   * Continuation to invoke with the result of an operation.
-   */
-  GNUNET_ResultCallback result_cb;
-
-  /**
-   * Closure for @a result_cb.
-   */
-  void *cls;
-
-  /**
-   * User context.
-   */
-  void *ctx;
-};
-
-
-/**
- * Operations handle.
- */
-
-struct GNUNET_OP_Handle
-{
-  /**
-   * First operation in the linked list.
-   */
-  struct OperationListItem *op_head;
-
-  /**
-   * Last operation in the linked list.
-   */
-  struct OperationListItem *op_tail;
-
-  /**
-   * Last operation ID used.
-   */
-  uint64_t last_op_id;
-};
-
-
-/**
- * Create new operations handle.
- */
-struct GNUNET_OP_Handle *
-GNUNET_OP_create ()
-{
-  return GNUNET_new (struct GNUNET_OP_Handle);
-}
-
-
-/**
- * Destroy operations handle.
- */
-void
-GNUNET_OP_destroy (struct GNUNET_OP_Handle *h)
-{
-  GNUNET_free (h);
-}
-
-
-/**
- * Get a unique operation ID to distinguish between asynchronous requests.
- *
- * @param h
- *        Operations handle.
- *
- * @return Operation ID to use.
- */
-uint64_t
-GNUNET_OP_get_next_id (struct GNUNET_OP_Handle *h)
-{
-  return ++h->last_op_id;
-}
-
-
-/**
- * Find operation by ID.
- *
- * @param h
- *        Operations handle.
- * @param op_id
- *        Operation ID to look up.
- *
- * @return Operation, or NULL if not found.
- */
-static struct OperationListItem *
-op_find (struct GNUNET_OP_Handle *h,
-         uint64_t op_id)
-{
-  struct OperationListItem *op;
-
-  for (op = h->op_head; NULL != op; op = op->next)
-    if (op->op_id == op_id)
-      return op;
-  return NULL;
-}
-
-
-/**
- * Find operation by ID.
- *
- * @param h
- *        Operations handle.
- * @param op_id
- *        Operation ID to look up.
- * @param[out] result_cb
- *        If an operation was found, its result callback is returned here.
- * @param[out] cls
- *        If an operation was found, its closure is returned here.
- * @param[out] ctx
- *        If an operation was found, its user context is returned here.
- *
- * @return #GNUNET_YES if an operation was found,
- *         #GNUNET_NO  if not found.
- */
-int
-GNUNET_OP_get (struct GNUNET_OP_Handle *h,
-               uint64_t op_id,
-               GNUNET_ResultCallback *result_cb,
-               void **cls,
-               void **ctx)
-{
-  struct OperationListItem *op = op_find (h, op_id);
-
-  if (NULL != op)
-  {
-    if (NULL != result_cb)
-      *result_cb = op->result_cb;
-    if (NULL != cls)
-      *cls = op->cls;
-    if (NULL != ctx)
-      *ctx = op->ctx;
-    return GNUNET_YES;
-  }
-  return GNUNET_NO;
-}
-
-
-/**
- * Add a new operation.
- *
- * @param h
- *        Operations handle.
- * @param result_cb
- *        Function to call with the result of the operation.
- * @param cls
- *        Closure for @a result_cb.
- * @param ctx
- *        User context.
- *
- * @return ID of the new operation.
- */
-uint64_t
-GNUNET_OP_add (struct GNUNET_OP_Handle *h,
-               GNUNET_ResultCallback result_cb,
-               void *cls,
-               void *ctx)
-{
-  struct OperationListItem *op;
-
-  op = GNUNET_new (struct OperationListItem);
-  op->op_id = GNUNET_OP_get_next_id (h);
-  op->result_cb = result_cb;
-  op->cls = cls;
-  op->ctx = ctx;
-  GNUNET_CONTAINER_DLL_insert_tail (h->op_head,
-                                    h->op_tail,
-                                    op);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "%p Added operation #%" PRIu64 "\n",
-       h, op->op_id);
-  return op->op_id;
-}
-
-
-/**
- * Remove an operation, and call its result callback (unless it was cancelled).
- *
- *
- * @param h
- *        Operations handle.
- * @param op_id
- *        Operation ID.
- * @param result_code
- *        Result of the operation.
- * @param data
- *        Data result of the operation.
- * @param data_size
- *        Size of @a data.
- * @param[out] ctx
- *        User context.
- * @param cancel
- *        Is the operation cancelled?
- *        #GNUNET_NO  Not cancelled, result callback is called.
- *        #GNUNET_YES Cancelled, result callback is not called.
- *
- * @return #GNUNET_YES if the operation was found and removed,
- *         #GNUNET_NO  if the operation was not found.
- */
-static int
-op_result (struct GNUNET_OP_Handle *h,
-           uint64_t op_id,
-           int64_t result_code,
-           const void *data,
-           uint16_t data_size,
-           void **ctx,
-           uint8_t cancel)
-{
-  if (0 == op_id)
-    return GNUNET_NO;
-
-  struct OperationListItem *op = op_find (h, op_id);
-  if (NULL == op)
-  {
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-         "Could not find operation #%" PRIu64 "\n", op_id);
-    return GNUNET_NO;
-  }
-
-  if (NULL != ctx)
-    *ctx = op->ctx;
-
-  GNUNET_CONTAINER_DLL_remove (h->op_head,
-                               h->op_tail,
-                               op);
-
-  if ((GNUNET_YES != cancel) &&
-      (NULL != op->result_cb))
-    op->result_cb (op->cls,
-                   result_code, data,
-                   data_size);
-  GNUNET_free (op);
-  return GNUNET_YES;
-}
-
-
-/**
- * Call the result callback of an operation and remove it.
- *
- * @param h
- *        Operations handle.
- * @param op_id
- *        Operation ID.
- * @param result_code
- *        Result of the operation.
- * @param data
- *        Data result of the operation.
- * @param data_size
- *        Size of @a data.
- * @param[out] ctx
- *        User context.
- *
- * @return #GNUNET_YES if the operation was found and removed,
- *         #GNUNET_NO  if the operation was not found.
- */
-int
-GNUNET_OP_result (struct GNUNET_OP_Handle *h,
-                  uint64_t op_id,
-                  int64_t result_code,
-                  const void *data,
-                  uint16_t data_size,
-                  void **ctx)
-{
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "%p Received result for operation #%" PRIu64 ": %" PRId64 " (size: %u)\n",
-       h, op_id, result_code, data_size);
-  return op_result (h, op_id, result_code, data, data_size, ctx, GNUNET_NO);
-}
-
-
-/**
- * Remove / cancel an operation.
- *
- * @param h
- *        Operations handle.
- * @param op_id
- *        Operation ID.
- *
- * @return #GNUNET_YES if the operation was found and removed,
- *         #GNUNET_NO  if the operation was not found.
- */
-int
-GNUNET_OP_remove (struct GNUNET_OP_Handle *h,
-                  uint64_t op_id)
-{
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "%p Cancelling operation #%" PRIu64  "\n",
-       h, op_id);
-  return op_result (h, op_id, 0, NULL, 0, NULL, GNUNET_YES);
-}
diff --git a/src/lib/util/service.c b/src/lib/util/service.c
index 7aeabf687..363210c61 100644
--- a/src/lib/util/service.c
+++ b/src/lib/util/service.c
@@ -24,7 +24,6 @@
  * @author Christian Grothoff
  * @author Florian Dold
  */
-
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_protocols.h"
@@ -233,15 +232,10 @@ struct GNUNET_SERVICE_Handle
   int ready_confirm_fd;
 
   /**
-   * Overall success/failure of the service start.
-   */
-  int ret;
-
-  /**
-   * If #GNUNET_YES, consider unknown message types an error where the
+   * If true, consider unknown message types an error where the
    * client is disconnected.
    */
-  int require_found;
+  bool require_found;
 };
 
 
@@ -330,19 +324,19 @@ struct GNUNET_SERVICE_Client
    * force the OS to close once the process actually dies.  Should only
    * be used in special cases!
    */
-  int persist;
+  bool persist;
 
   /**
    * Is this client a 'monitor' client that should not be counted
    * when deciding on destroying the server during soft shutdown?
    * (see also #GNUNET_SERVICE_start)
    */
-  int is_monitor;
+  bool is_monitor;
 
   /**
    * Are we waiting for the application to call #GNUNET_SERVICE_client_continue()?
    */
-  int needs_continue;
+  bool needs_continue;
 
   /**
    * Type of last message processed (for warn_no_receive_done).
@@ -356,19 +350,22 @@ struct GNUNET_SERVICE_Client
  * monitoring.
  *
  * @param sh service to check clients for
- * @return #GNUNET_YES if we have non-monitoring clients left
+ * @return true if we have non-monitoring clients left
  */
-static int
+static enum GNUNET_GenericReturnValue
 have_non_monitor_clients (struct GNUNET_SERVICE_Handle *sh)
 {
-  for (struct GNUNET_SERVICE_Client *client = sh->clients_head; NULL != client;
+  for (struct GNUNET_SERVICE_Client *client = sh->clients_head;
+       NULL != client;
        client = client->next)
   {
+    if (NULL != client->drop_task)
+      continue;
     if (client->is_monitor)
       continue;
-    return GNUNET_YES;
+    return true;
   }
-  return GNUNET_NO;
+  return false;
 }
 
 
@@ -380,13 +377,14 @@ have_non_monitor_clients (struct GNUNET_SERVICE_Handle *sh)
  * @param sr reason for suspending accepting connections
  */
 static void
-do_suspend (struct GNUNET_SERVICE_Handle *sh, enum SuspendReason sr)
+do_suspend (struct GNUNET_SERVICE_Handle *sh,
+            enum SuspendReason sr)
 {
-  struct ServiceListenContext *slc;
-
   GNUNET_assert (0 == (sh->suspend_state & sr));
   sh->suspend_state |= sr;
-  for (slc = sh->slc_head; NULL != slc; slc = slc->next)
+  for (struct ServiceListenContext *slc = sh->slc_head;
+       NULL != slc;
+       slc = slc->next)
   {
     if (NULL != slc->listen_task)
     {
@@ -423,7 +421,7 @@ service_shutdown (void *cls)
   case GNUNET_SERVICE_OPTION_SOFT_SHUTDOWN:
     if (0 == (sh->suspend_state & SUSPEND_STATE_SHUTDOWN))
       do_suspend (sh, SUSPEND_STATE_SHUTDOWN);
-    if (GNUNET_NO == have_non_monitor_clients (sh))
+    if (! have_non_monitor_clients (sh))
       GNUNET_SERVICE_shutdown (sh);
     break;
   }
@@ -435,25 +433,21 @@ service_shutdown (void *cls)
  *
  * @param list a list of networks
  * @param add the IP to check (in network byte order)
- * @return #GNUNET_NO if the IP is not in the list, #GNUNET_YES if it it is
+ * @return false if the IP is not in the list, true if it it is
  */
-static int
+static bool
 check_ipv4_listed (const struct GNUNET_STRINGS_IPv4NetworkPolicy *list,
                    const struct in_addr *add)
 {
-  unsigned int i;
-
-  if (NULL == list)
-    return GNUNET_NO;
-  i = 0;
-  while ((0 != list[i].network.s_addr) || (0 != list[i].netmask.s_addr))
+  for (unsigned int i = 0;
+       0 != list[i].network.s_addr;
+       i++)
   {
-    if ((add->s_addr & list[i].netmask.s_addr) ==
-        (list[i].network.s_addr & list[i].netmask.s_addr))
-      return GNUNET_YES;
-    i++;
+    if ( (add->s_addr & list[i].netmask.s_addr) ==
+         (list[i].network.s_addr & list[i].netmask.s_addr) )
+      return true;
   }
-  return GNUNET_NO;
+  return false;
 }
 
 
@@ -462,30 +456,29 @@ check_ipv4_listed (const struct GNUNET_STRINGS_IPv4NetworkPolicy *list,
  *
  * @param list a list of networks
  * @param ip the IP to check (in network byte order)
- * @return #GNUNET_NO if the IP is not in the list, #GNUNET_YES if it it is
+ * @return false if the IP is not in the list, true if it it is
  */
-static int
+static bool
 check_ipv6_listed (const struct GNUNET_STRINGS_IPv6NetworkPolicy *list,
                    const struct in6_addr *ip)
 {
-  unsigned int i;
-
-  if (NULL == list)
-    return GNUNET_NO;
-  i = 0;
-NEXT:
-  while (GNUNET_NO == GNUNET_is_zero (&list[i].network))
+  for (unsigned int i = 0;
+       ! GNUNET_is_zero (&list[i].network);
+       i++)
   {
+    bool match = true;
+    
     for (unsigned int j = 0; j < sizeof(struct in6_addr) / sizeof(int); j++)
       if (((((int *) ip)[j] & ((int *) &list[i].netmask)[j])) !=
           (((int *) &list[i].network)[j] & ((int *) &list[i].netmask)[j]))
       {
-        i++;
-        goto NEXT;
+        match = false;
+        break;
       }
-    return GNUNET_YES;
+    if (match)
+      return true;
   }
-  return GNUNET_NO;
+  return false;
 }
 
 
@@ -593,7 +586,8 @@ service_mq_send (struct GNUNET_MQ_Handle *mq,
  * @param impl_state state specific to the implementation
  */
 static void
-service_mq_cancel (struct GNUNET_MQ_Handle *mq, void *impl_state)
+service_mq_cancel (struct GNUNET_MQ_Handle *mq,
+                   void *impl_state)
 {
   struct GNUNET_SERVICE_Client *client = impl_state;
 
@@ -615,12 +609,14 @@ service_mq_cancel (struct GNUNET_MQ_Handle *mq, void *impl_state)
  * @param error error code
  */
 static void
-service_mq_error_handler (void *cls, enum GNUNET_MQ_Error error)
+service_mq_error_handler (void *cls,
+                          enum GNUNET_MQ_Error error)
 {
   struct GNUNET_SERVICE_Client *client = cls;
   struct GNUNET_SERVICE_Handle *sh = client->sh;
 
-  if ((GNUNET_MQ_ERROR_NO_MATCH == error) && (GNUNET_NO == sh->require_found))
+  if ( (GNUNET_MQ_ERROR_NO_MATCH == error) &&
+       (! sh->require_found) )
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "No handler for message of type %u found\n",
@@ -680,8 +676,8 @@ service_client_mst_cb (void *cls,
        "Received message of type %u and size %u from client\n",
        ntohs (message->type),
        ntohs (message->size));
-  GNUNET_assert (GNUNET_NO == client->needs_continue);
-  client->needs_continue = GNUNET_YES;
+  GNUNET_assert (! client->needs_continue);
+  client->needs_continue = true;
   client->warn_type = ntohs (message->type);
   client->warn_start = GNUNET_TIME_absolute_get ();
   GNUNET_assert (NULL == client->warn_task);
@@ -717,7 +713,7 @@ service_client_recv (void *cls)
     /* client closed connection (or IO error) */
     if (NULL == client->drop_task)
     {
-      GNUNET_assert (GNUNET_NO == client->needs_continue);
+      GNUNET_assert (! client->needs_continue);
       GNUNET_SERVICE_client_drop (client);
     }
     return;
@@ -726,7 +722,7 @@ service_client_recv (void *cls)
     return; /* more messages in buffer, wait for application
                to be done processing */
   GNUNET_assert (GNUNET_OK == ret);
-  if (GNUNET_YES == client->needs_continue)
+  if (client->needs_continue)
     return;
   if (NULL != client->recv_task)
     return;
@@ -753,7 +749,9 @@ start_client (struct GNUNET_SERVICE_Handle *sh,
   struct GNUNET_SERVICE_Client *client;
 
   client = GNUNET_new (struct GNUNET_SERVICE_Client);
-  GNUNET_CONTAINER_DLL_insert (sh->clients_head, sh->clients_tail, client);
+  GNUNET_CONTAINER_DLL_insert (sh->clients_head,
+                               sh->clients_tail,
+                               client);
   client->sh = sh;
   client->sock = csock;
   client->mq = GNUNET_MQ_queue_for_callbacks (&service_mq_send,
@@ -806,7 +804,8 @@ accept_client (void *cls)
       if (EMFILE == errno)
         do_suspend (sh, SUSPEND_STATE_EMFILE);
       else if (EAGAIN != errno)
-        GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "accept");
+        GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
+                             "accept");
       break;
     }
     switch (sa.ss_family)
@@ -815,18 +814,22 @@ accept_client (void *cls)
       GNUNET_assert (addrlen == sizeof(struct sockaddr_in));
       v4 = (const struct sockaddr_in *) &sa;
       ok = (((NULL == sh->v4_allowed) ||
-             (check_ipv4_listed (sh->v4_allowed, &v4->sin_addr))) &&
+             (check_ipv4_listed (sh->v4_allowed,
+                                 &v4->sin_addr))) &&
             ((NULL == sh->v4_denied) ||
-             (! check_ipv4_listed (sh->v4_denied, &v4->sin_addr))));
+             (! check_ipv4_listed (sh->v4_denied,
+                                   &v4->sin_addr))));
       break;
 
     case AF_INET6:
       GNUNET_assert (addrlen == sizeof(struct sockaddr_in6));
       v6 = (const struct sockaddr_in6 *) &sa;
       ok = (((NULL == sh->v6_allowed) ||
-             (check_ipv6_listed (sh->v6_allowed, &v6->sin6_addr))) &&
+             (check_ipv6_listed (sh->v6_allowed,
+                                 &v6->sin6_addr))) &&
             ((NULL == sh->v6_denied) ||
-             (! check_ipv6_listed (sh->v6_denied, &v6->sin6_addr))));
+             (! check_ipv6_listed (sh->v6_denied,
+                                   &v6->sin6_addr))));
       break;
 
     case AF_UNIX:
@@ -850,7 +853,8 @@ accept_client (void *cls)
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "Service accepted incoming connection from %s.\n",
          GNUNET_a2s ((const struct sockaddr *) &sa, addrlen));
-    start_client (slc->sh, sock);
+    start_client (slc->sh,
+                  sock);
   }
   if (0 != sh->suspend_state)
     return;
@@ -870,15 +874,16 @@ accept_client (void *cls)
  *           or #SUSPEND_STATE_NONE on first startup
  */
 static void
-do_resume (struct GNUNET_SERVICE_Handle *sh, enum SuspendReason sr)
+do_resume (struct GNUNET_SERVICE_Handle *sh,
+           enum SuspendReason sr)
 {
-  struct ServiceListenContext *slc;
-
   GNUNET_assert ((SUSPEND_STATE_NONE == sr) || (0 != (sh->suspend_state & sr)));
   sh->suspend_state -= sr;
   if (SUSPEND_STATE_NONE != sh->suspend_state)
     return;
-  for (slc = sh->slc_head; NULL != slc; slc = slc->next)
+  for (struct ServiceListenContext *slc = sh->slc_head;
+       NULL != slc;
+       slc = slc->next)
   {
     GNUNET_assert (NULL == slc->listen_task);
     slc->listen_task =
@@ -928,7 +933,7 @@ service_main (void *cls)
  * @return #GNUNET_SYSERR on parse error, #GNUNET_OK on success (including
  *         no ACL configured)
  */
-static int
+static enum GNUNET_GenericReturnValue
 process_acl4 (struct GNUNET_STRINGS_IPv4NetworkPolicy **ret,
               struct GNUNET_SERVICE_Handle *sh,
               const char *option)
@@ -969,7 +974,7 @@ process_acl4 (struct GNUNET_STRINGS_IPv4NetworkPolicy **ret,
  * @return #GNUNET_SYSERR on parse error, #GNUNET_OK on success (including
  *         no ACL configured)
  */
-static int
+static enum GNUNET_GenericReturnValue
 process_acl6 (struct GNUNET_STRINGS_IPv6NetworkPolicy **ret,
               struct GNUNET_SERVICE_Handle *sh,
               const char *option)
@@ -1457,7 +1462,7 @@ open_listen_socket (const struct sockaddr *server_addr,
  * @param sh service context to initialize
  * @return #GNUNET_OK if configuration succeeded
  */
-static int
+static enum GNUNET_GenericReturnValue
 setup_service (struct GNUNET_SERVICE_Handle *sh)
 {
   int tolerant;
@@ -1489,8 +1494,8 @@ setup_service (struct GNUNET_SERVICE_Handle *sh)
 
   lsocks = NULL;
   errno = 0;
-  if ((NULL != (nfds = getenv ("LISTEN_FDS"))) &&
-      (1 == sscanf (nfds, "%u%1s", &cnt, dummy)) && (cnt > 0) &&
+  if ( (NULL != (nfds = getenv ("LISTEN_FDS"))) &&
+       (1 == sscanf (nfds, "%u%1s", &cnt, dummy)) && (cnt > 0) &&
       (cnt < FD_SETSIZE) && (cnt + 4 < FD_SETSIZE))
   {
     lsocks = GNUNET_new_array (cnt + 1, struct GNUNET_NETWORK_Handle *);
@@ -1532,7 +1537,9 @@ setup_service (struct GNUNET_SERVICE_Handle *sh)
       slc = GNUNET_new (struct ServiceListenContext);
       slc->sh = sh;
       slc->listen_socket = *ls;
-      GNUNET_CONTAINER_DLL_insert (sh->slc_head, sh->slc_tail, slc);
+      GNUNET_CONTAINER_DLL_insert (sh->slc_head,
+                                   sh->slc_tail,
+                                   slc);
     }
     GNUNET_free (lsocks);
   }
@@ -1552,7 +1559,8 @@ setup_service (struct GNUNET_SERVICE_Handle *sh)
 
       slc = GNUNET_new (struct ServiceListenContext);
       slc->sh = sh;
-      slc->listen_socket = open_listen_socket (addrs[i], addrlens[i]);
+      slc->listen_socket = open_listen_socket (addrs[i],
+                                               addrlens[i]);
       GNUNET_free (addrs[i]);
       if (NULL == slc->listen_socket)
       {
@@ -1560,7 +1568,9 @@ setup_service (struct GNUNET_SERVICE_Handle *sh)
         GNUNET_free (slc);
         continue;
       }
-      GNUNET_CONTAINER_DLL_insert (sh->slc_head, sh->slc_tail, slc);
+      GNUNET_CONTAINER_DLL_insert (sh->slc_head,
+                                   sh->slc_tail,
+                                   slc);
     }
     GNUNET_free (addrlens);
     GNUNET_free (addrs);
@@ -1582,7 +1592,7 @@ setup_service (struct GNUNET_SERVICE_Handle *sh)
       GNUNET_NETWORK_socket_close (*ls);
     GNUNET_free (csocks);
   }
-  sh->require_found = tolerant ? GNUNET_NO : GNUNET_YES;
+  sh->require_found = (GNUNET_NO == tolerant);
   sh->match_uid = GNUNET_CONFIGURATION_get_value_yesno (sh->cfg,
                                                         sh->service_name,
                                                         "UNIX_MATCH_UID");
@@ -1609,10 +1619,11 @@ get_user_name (struct GNUNET_SERVICE_Handle *sh)
 {
   char *un;
 
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (sh->cfg,
-                                                            sh->service_name,
-                                                            "USERNAME",
-                                                            &un))
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_filename (sh->cfg,
+                                               sh->service_name,
+                                               "USERNAME",
+                                               &un))
     return NULL;
   return un;
 }
@@ -1624,16 +1635,14 @@ get_user_name (struct GNUNET_SERVICE_Handle *sh)
  * @param sh service context
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
-static int
+static enum GNUNET_GenericReturnValue
 set_user_id (struct GNUNET_SERVICE_Handle *sh)
 {
   char *user;
+  struct passwd *pws;
 
   if (NULL == (user = get_user_name (sh)))
     return GNUNET_OK; /* keep */
-
-  struct passwd *pws;
-
   errno = 0;
   pws = getpwnam (user);
   if (NULL == pws)
@@ -1649,7 +1658,8 @@ set_user_id (struct GNUNET_SERVICE_Handle *sh)
 #if HAVE_INITGROUPS
       (0 != initgroups (user, pws->pw_gid)) ||
 #endif
-      (0 != setuid (pws->pw_uid)) || (0 != seteuid (pws->pw_uid)))
+      (0 != setuid (pws->pw_uid)) ||
+      (0 != seteuid (pws->pw_uid)))
   {
     if ((0 != setregid (pws->pw_gid, pws->pw_gid)) ||
         (0 != setreuid (pws->pw_uid, pws->pw_uid)))
@@ -1680,10 +1690,11 @@ get_pid_file_name (struct GNUNET_SERVICE_Handle *sh)
 {
   char *pif;
 
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (sh->cfg,
-                                                            sh->service_name,
-                                                            "PIDFILE",
-                                                            &pif))
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_filename (sh->cfg,
+                                               sh->service_name,
+                                               "PIDFILE",
+                                               &pif))
     return NULL;
   return pif;
 }
@@ -1702,7 +1713,9 @@ pid_file_delete (struct GNUNET_SERVICE_Handle *sh)
   if (NULL == pif)
     return; /* no PID file */
   if (0 != unlink (pif))
-    LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "unlink", pif);
+    LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING,
+                       "unlink",
+                       pif);
   GNUNET_free (pif);
 }
 
@@ -1713,7 +1726,7 @@ pid_file_delete (struct GNUNET_SERVICE_Handle *sh)
  * @param sh service context
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
  */
-static int
+static enum GNUNET_GenericReturnValue
 detach_terminal (struct GNUNET_SERVICE_Handle *sh)
 {
   pid_t pid;
@@ -1722,13 +1735,15 @@ detach_terminal (struct GNUNET_SERVICE_Handle *sh)
 
   if (0 != pipe (filedes))
   {
-    LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "pipe");
+    LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR,
+                  "pipe");
     return GNUNET_SYSERR;
   }
   pid = fork ();
   if (pid < 0)
   {
-    LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "fork");
+    LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR,
+                  "fork");
     return GNUNET_SYSERR;
   }
   if (0 != pid)
@@ -1739,7 +1754,8 @@ detach_terminal (struct GNUNET_SERVICE_Handle *sh)
     GNUNET_break (0 == close (filedes[1]));
     c = 'X';
     if (1 != read (filedes[0], &c, sizeof(char)))
-      LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "read");
+      LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING,
+                    "read");
     fflush (stdout);
     switch (c)
     {
@@ -1780,7 +1796,8 @@ detach_terminal (struct GNUNET_SERVICE_Handle *sh)
   /* Detach from controlling terminal */
   pid = setsid ();
   if (-1 == pid)
-    LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "setsid");
+    LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR,
+                  "setsid");
   sh->ready_confirm_fd = filedes[1];
 
   return GNUNET_OK;
@@ -1804,7 +1821,9 @@ teardown_service (struct GNUNET_SERVICE_Handle *sh)
   GNUNET_free (sh->v6_allowed);
   while (NULL != (slc = sh->slc_head))
   {
-    GNUNET_CONTAINER_DLL_remove (sh->slc_head, sh->slc_tail, slc);
+    GNUNET_CONTAINER_DLL_remove (sh->slc_head,
+                                 sh->slc_tail,
+                                 slc);
     if (NULL != slc->listen_task)
       GNUNET_SCHEDULER_cancel (slc->listen_task);
     GNUNET_break (GNUNET_OK ==
@@ -1821,7 +1840,8 @@ teardown_service (struct GNUNET_SERVICE_Handle *sh)
  * @param msg AGPL request
  */
 static void
-return_agpl (void *cls, const struct GNUNET_MessageHeader *msg)
+return_agpl (void *cls,
+             const struct GNUNET_MessageHeader *msg)
 {
   struct GNUNET_SERVICE_Client *client = cls;
   struct GNUNET_MQ_Handle *mq;
@@ -1832,50 +1852,17 @@ return_agpl (void *cls, const struct GNUNET_MessageHeader *msg)
 
   (void) msg;
   slen = strlen (pd->agpl_url) + 1;
-  env = GNUNET_MQ_msg_extra (res, GNUNET_MESSAGE_TYPE_RESPONSE_AGPL, slen);
-  memcpy (&res[1], GNUNET_AGPL_URL, slen);
+  env = GNUNET_MQ_msg_extra (res,
+                             GNUNET_MESSAGE_TYPE_RESPONSE_AGPL, slen);
+  memcpy (&res[1],
+          GNUNET_AGPL_URL,
+          slen);
   mq = GNUNET_SERVICE_client_get_mq (client);
   GNUNET_MQ_send (mq, env);
   GNUNET_SERVICE_client_continue (client);
 }
 
 
-/**
- * Low-level function to start a service if the scheduler
- * is already running.  Should only be used directly in
- * special cases.
- *
- * The function will launch the service with the name @a service_name
- * using the @a service_options to configure its shutdown
- * behavior. When clients connect or disconnect, the respective
- * @a connect_cb or @a disconnect_cb functions will be called. For
- * messages received from the clients, the respective @a handlers will
- * be invoked; for the closure of the handlers we use the return value
- * from the @a connect_cb invocation of the respective client.
- *
- * Each handler MUST call #GNUNET_SERVICE_client_continue() after each
- * message to receive further messages from this client.  If
- * #GNUNET_SERVICE_client_continue() is not called within a short
- * time, a warning will be logged. If delays are expected, services
- * should call #GNUNET_SERVICE_client_disable_continue_warning() to
- * disable the warning.
- *
- * Clients sending invalid messages (based on @a handlers) will be
- * dropped. Additionally, clients can be dropped at any time using
- * #GNUNET_SERVICE_client_drop().
- *
- * The service must be stopped using #GNUNET_SERVICE_stop().
- *
- * @param service_name name of the service to run
- * @param cfg configuration to use
- * @param connect_cb function to call whenever a client connects
- * @param disconnect_cb function to call whenever a client disconnects
- * @param cls closure argument for @a connect_cb and @a disconnect_cb
- * @param handlers NULL-terminated array of message handlers for the service,
- *                 the closure will be set to the value returned by
- *                 the @a connect_cb for the respective connection
- * @return NULL on error
- */
 struct GNUNET_SERVICE_Handle *
 GNUNET_SERVICE_start (const char *service_name,
                       const struct GNUNET_CONFIGURATION_Handle *cfg,
@@ -1892,23 +1879,61 @@ GNUNET_SERVICE_start (const char *service_name,
   sh->connect_cb = connect_cb;
   sh->disconnect_cb = disconnect_cb;
   sh->cb_cls = cls;
-  sh->handlers = GNUNET_MQ_copy_handlers2 (handlers, &return_agpl, NULL);
+  sh->handlers = GNUNET_MQ_copy_handlers2 (handlers,
+                                           &return_agpl,
+                                           NULL);
   if (GNUNET_OK != setup_service (sh))
   {
     GNUNET_free (sh->handlers);
     GNUNET_free (sh);
     return NULL;
   }
-  do_resume (sh, SUSPEND_STATE_NONE);
+  do_resume (sh,
+             SUSPEND_STATE_NONE);
   return sh;
 }
 
 
 /**
- * Stops a service that was started with #GNUNET_SERVICE_start().
+ * Asynchronously finish dropping the client.
  *
- * @param srv service to stop
+ * @param cls the `struct GNUNET_SERVICE_Client`.
  */
+static void
+finish_client_drop (void *cls)
+{
+  struct GNUNET_SERVICE_Client *c = cls;
+  struct GNUNET_SERVICE_Handle *sh = c->sh;
+
+  c->drop_task = NULL;
+  GNUNET_CONTAINER_DLL_remove (sh->clients_head,
+                               sh->clients_tail,
+                               c);
+  GNUNET_assert (NULL == c->send_task);
+  GNUNET_assert (NULL == c->recv_task);
+  GNUNET_assert (NULL == c->warn_task);
+  GNUNET_MST_destroy (c->mst);
+  GNUNET_MQ_destroy (c->mq);
+  if (! c->persist)
+  {
+    GNUNET_break (GNUNET_OK ==
+                  GNUNET_NETWORK_socket_close (c->sock));
+    if ((0 != (SUSPEND_STATE_EMFILE & sh->suspend_state)) &&
+        (0 == (SUSPEND_STATE_SHUTDOWN & sh->suspend_state)))
+      do_resume (sh,
+                 SUSPEND_STATE_EMFILE);
+  }
+  else
+  {
+    GNUNET_NETWORK_socket_free_memory_only_ (c->sock);
+  }
+  GNUNET_free (c);
+  if ((0 != (SUSPEND_STATE_SHUTDOWN & sh->suspend_state)) &&
+      (! have_non_monitor_clients (sh)))
+    GNUNET_SERVICE_shutdown (sh);
+}
+
+
 void
 GNUNET_SERVICE_stop (struct GNUNET_SERVICE_Handle *srv)
 {
@@ -1916,7 +1941,12 @@ GNUNET_SERVICE_stop (struct GNUNET_SERVICE_Handle *srv)
 
   GNUNET_SERVICE_suspend (srv);
   while (NULL != (client = srv->clients_head))
-    GNUNET_SERVICE_client_drop (client);
+  {
+    if (NULL == client->drop_task)
+      GNUNET_SERVICE_client_drop (client);
+    GNUNET_SCHEDULER_cancel (client->drop_task);
+    finish_client_drop (client);
+  }
   teardown_service (srv);
   GNUNET_free (srv->handlers);
   GNUNET_free (srv);
@@ -1988,7 +2018,6 @@ GNUNET_SERVICE_run_ (int argc,
                 ? GNUNET_MQ_copy_handlers (handlers)
                 : GNUNET_MQ_copy_handlers2 (handlers, &return_agpl, NULL);
   sh.service_name = service_name;
-  sh.ret = 0;
   /* setup subsystems */
   loglev = NULL;
   logfile = NULL;
@@ -2040,9 +2069,12 @@ GNUNET_SERVICE_run_ (int argc,
   }
   else
   {
-    if (GNUNET_YES == GNUNET_DISK_file_test (cfg_filename))
+    if (GNUNET_YES ==
+        GNUNET_DISK_file_test (cfg_filename))
     {
-      if (GNUNET_SYSERR == GNUNET_CONFIGURATION_load (cfg, cfg_filename))
+      if (GNUNET_SYSERR ==
+          GNUNET_CONFIGURATION_load (cfg,
+                                     cfg_filename))
       {
         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                     _ ("Malformed configuration file `%s', exit ...\n"),
@@ -2052,7 +2084,9 @@ GNUNET_SERVICE_run_ (int argc,
     }
     else
     {
-      if (GNUNET_SYSERR == GNUNET_CONFIGURATION_load (cfg, NULL))
+      if (GNUNET_SYSERR ==
+          GNUNET_CONFIGURATION_load (cfg,
+                                     NULL))
       {
         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                     _ ("Malformed configuration, exit ...\n"));
@@ -2062,7 +2096,8 @@ GNUNET_SERVICE_run_ (int argc,
   }
   if (GNUNET_OK != setup_service (&sh))
     goto shutdown;
-  if ((1 == do_daemonize) && (GNUNET_OK != detach_terminal (&sh)))
+  if ( (1 == do_daemonize) &&
+       (GNUNET_OK != detach_terminal (&sh)) )
   {
     GNUNET_break (0);
     goto shutdown;
@@ -2073,14 +2108,16 @@ GNUNET_SERVICE_run_ (int argc,
        "Service `%s' runs with configuration from `%s'\n",
        service_name,
        (NULL != opt_cfg_filename) ? opt_cfg_filename : cfg_filename);
-  if ((GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (sh.cfg,
-                                                           "TESTING",
-                                                           "SKEW_OFFSET",
-                                                           &skew_offset)) &&
-      (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (sh.cfg,
-                                                           "TESTING",
-                                                           "SKEW_VARIANCE",
-                                                           &skew_variance)))
+  if ( (GNUNET_OK ==
+        GNUNET_CONFIGURATION_get_value_number (sh.cfg,
+                                               "TESTING",
+                                               "SKEW_OFFSET",
+                                               &skew_offset)) &&
+       (GNUNET_OK ==
+        GNUNET_CONFIGURATION_get_value_number (sh.cfg,
+                                               "TESTING",
+                                               "SKEW_VARIANCE",
+                                               &skew_variance)) )
   {
     clock_offset = skew_offset - skew_variance;
     GNUNET_TIME_set_offset (clock_offset);
@@ -2108,18 +2145,23 @@ shutdown:
   {
     char *counter;
 
-    if ((GNUNET_YES == GNUNET_CONFIGURATION_have_value (sh.cfg,
-                                                        service_name,
-                                                        "GAUGER_HEAP")) &&
-        (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (sh.cfg,
-                                                             service_name,
-                                                             "GAUGER_HEAP",
-                                                             &counter)))
+    if ( (GNUNET_YES ==
+          GNUNET_CONFIGURATION_have_value (sh.cfg,
+                                           service_name,
+                                           "GAUGER_HEAP")) &&
+         (GNUNET_OK ==
+          GNUNET_CONFIGURATION_get_value_string (sh.cfg,
+                                                 service_name,
+                                                 "GAUGER_HEAP",
+                                                 &counter)))
     {
       struct mallinfo2 mi;
 
       mi = mallinfo2 ();
-      GAUGER (service_name, counter, mi.usmblks, "blocks");
+      GAUGER (service_name,
+              counter,
+              mi.usmblks,
+              "blocks");
       GNUNET_free (counter);
     }
   }
@@ -2133,11 +2175,12 @@ shutdown:
   GNUNET_free (cfg_filename);
   GNUNET_free (opt_cfg_filename);
 
-  return err ? GNUNET_SYSERR : sh.ret;
+  return err ? GNUNET_SYSERR : 0;
 }
 
 
-/* A list of service to be launched when GNUNET_SERVICE_main()
+/**
+ * A list of service to be launched when GNUNET_SERVICE_main()
  * is called
  */
 struct ServiceHandleList
@@ -2153,10 +2196,11 @@ struct ServiceHandleList
 };
 
 /* The service list */
-static struct ServiceHandleList *hll_head = NULL;
+static struct ServiceHandleList *hll_head;
 
 /* The service list */
-static struct ServiceHandleList *hll_tail = NULL;
+static struct ServiceHandleList *hll_tail;
+
 
 int
 GNUNET_SERVICE_register_ (const char *service_name,
@@ -2181,30 +2225,34 @@ GNUNET_SERVICE_register_ (const char *service_name,
                 ? GNUNET_MQ_copy_handlers (handlers)
                 : GNUNET_MQ_copy_handlers2 (handlers, &return_agpl, NULL);
   sh->service_name = service_name;
-  sh->ret = 0;
   hle = GNUNET_new (struct ServiceHandleList);
   hle->sh = sh;
-  GNUNET_CONTAINER_DLL_insert (hll_head, hll_tail, hle);
-  return GNUNET_OK;
+  GNUNET_CONTAINER_DLL_insert (hll_head,
+                               hll_tail,
+                               hle);
+  return 0;
 }
 
 
 static void
 do_registered_services_shutdown (void *cls)
 {
-  struct GNUNET_SERVICE_Handle *sh;
-  struct ServiceHandleList *shl;
-
-  for (shl = hll_head; NULL != shl;)
+  while (NULL != hll_head)
   {
-    sh = shl->sh;
-    GNUNET_CONTAINER_DLL_remove (hll_head, hll_tail, shl);
+    struct ServiceHandleList *shl = hll_head;
+    struct GNUNET_SERVICE_Handle *sh = shl->sh;
+
+    GNUNET_CONTAINER_DLL_remove (hll_head,
+                                 hll_tail,
+                                 shl);
     GNUNET_free (shl);
     if (-1 != sh->ready_confirm_fd)
     {
       if (1 != write (sh->ready_confirm_fd, "S", 1))
-        LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "write");
-      GNUNET_break (0 == close (sh->ready_confirm_fd));
+        LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING,
+                      "write");
+      GNUNET_break (0 ==
+                    close (sh->ready_confirm_fd));
     }
     teardown_service (sh);
     GNUNET_free (sh->handlers);
@@ -2216,20 +2264,22 @@ do_registered_services_shutdown (void *cls)
 static void
 launch_registered_services (void *cls)
 {
-  struct ServiceHandleList *shl;
   struct GNUNET_CONFIGURATION_Handle *cfg = cls;
 
-  for (shl = hll_head; NULL != shl; shl = shl->next)
+  for (struct ServiceHandleList *shl = hll_head;
+       NULL != shl;
+       shl = shl->next)
   {
     shl->sh->cfg = cfg;
     if (GNUNET_OK != setup_service (shl->sh))
       continue;
     if (GNUNET_OK != set_user_id (shl->sh))
       continue;
-
-    GNUNET_SCHEDULER_add_now (&service_main, shl->sh);
+    GNUNET_SCHEDULER_add_now (&service_main,
+                              shl->sh);
   }
-  GNUNET_SCHEDULER_add_shutdown (&do_registered_services_shutdown, NULL);
+  GNUNET_SCHEDULER_add_shutdown (&do_registered_services_shutdown,
+                                 NULL);
 }
 
 
@@ -2246,7 +2296,6 @@ GNUNET_SERVICE_main (int argc,
   int ret;
   struct GNUNET_CONFIGURATION_Handle *cfg;
   const struct GNUNET_OS_ProjectData *pd = GNUNET_OS_project_data_get ();
-
   struct GNUNET_GETOPT_CommandLineOption service_options[] = {
     GNUNET_GETOPT_option_cfgfile (&opt_cfg_filename),
     GNUNET_GETOPT_option_flag ('d',
@@ -2260,6 +2309,7 @@ GNUNET_SERVICE_main (int argc,
     GNUNET_GETOPT_option_version (pd->version),
     GNUNET_GETOPT_OPTION_END
   };
+  
   xdg = getenv ("XDG_CONFIG_HOME");
   if (NULL != xdg)
     GNUNET_asprintf (&cfg_filename,
@@ -2282,17 +2332,22 @@ GNUNET_SERVICE_main (int argc,
     goto shutdown;
   }
   // FIXME we need to set this up for each service!
-  if (GNUNET_OK != GNUNET_log_setup ("libgnunet",
-                                     loglev,
-                                     logfile))
+  // NOTE: that was not the idea. What are you proposing? -CG
+  if (GNUNET_OK !=
+      GNUNET_log_setup ("libgnunet",
+                        loglev,
+                        logfile))
   {
     GNUNET_break (0);
     goto shutdown;
   }
   if (NULL != opt_cfg_filename)
   {
-    if ((GNUNET_YES != GNUNET_DISK_file_test (opt_cfg_filename)) ||
-        (GNUNET_SYSERR == GNUNET_CONFIGURATION_load (cfg, opt_cfg_filename)))
+    if ( (GNUNET_YES !=
+          GNUNET_DISK_file_test (opt_cfg_filename)) ||
+         (GNUNET_SYSERR ==
+          GNUNET_CONFIGURATION_load (cfg,
+                                     opt_cfg_filename)) )
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   _ ("Malformed configuration file `%s', exit ...\n"),
@@ -2302,9 +2357,12 @@ GNUNET_SERVICE_main (int argc,
   }
   else
   {
-    if (GNUNET_YES == GNUNET_DISK_file_test (cfg_filename))
+    if (GNUNET_YES ==
+        GNUNET_DISK_file_test (cfg_filename))
     {
-      if (GNUNET_SYSERR == GNUNET_CONFIGURATION_load (cfg, cfg_filename))
+      if (GNUNET_SYSERR ==
+          GNUNET_CONFIGURATION_load (cfg,
+                                     cfg_filename))
       {
         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                     _ ("Malformed configuration file `%s', exit ...\n"),
@@ -2315,7 +2373,9 @@ GNUNET_SERVICE_main (int argc,
     }
     else
     {
-      if (GNUNET_SYSERR == GNUNET_CONFIGURATION_load (cfg, NULL))
+      if (GNUNET_SYSERR ==
+          GNUNET_CONFIGURATION_load (cfg,
+                                     NULL))
       {
         GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                     _ ("Malformed configuration, exit ...\n"));
@@ -2326,7 +2386,8 @@ GNUNET_SERVICE_main (int argc,
   }
   GNUNET_RESOLVER_connect (cfg);
 
-  GNUNET_SCHEDULER_run (&launch_registered_services, cfg);
+  GNUNET_SCHEDULER_run (&launch_registered_services,
+                        cfg);
 shutdown:
   GNUNET_SPEEDUP_stop_ ();
   GNUNET_CONFIGURATION_destroy (cfg);
@@ -2337,28 +2398,19 @@ shutdown:
 }
 
 
-/**
- * Suspend accepting connections from the listen socket temporarily.
- * Resume activity using #GNUNET_SERVICE_resume.
- *
- * @param sh service to stop accepting connections.
- */
 void
 GNUNET_SERVICE_suspend (struct GNUNET_SERVICE_Handle *sh)
 {
-  do_suspend (sh, SUSPEND_STATE_APP);
+  do_suspend (sh,
+              SUSPEND_STATE_APP);
 }
 
 
-/**
- * Resume accepting connections from the listen socket.
- *
- * @param sh service to resume accepting connections.
- */
 void
 GNUNET_SERVICE_resume (struct GNUNET_SERVICE_Handle *sh)
 {
-  do_resume (sh, SUSPEND_STATE_APP);
+  do_resume (sh,
+             SUSPEND_STATE_APP);
 }
 
 
@@ -2376,7 +2428,8 @@ resume_client_receive (void *cls)
 
   c->recv_task = NULL;
   /* first, check if there is still something in the buffer */
-  ret = GNUNET_MST_next (c->mst, GNUNET_YES);
+  ret = GNUNET_MST_next (c->mst,
+                         GNUNET_YES);
   if (GNUNET_SYSERR == ret)
   {
     if (NULL == c->drop_task)
@@ -2386,7 +2439,7 @@ resume_client_receive (void *cls)
   if (GNUNET_NO == ret)
     return; /* done processing, wait for more later */
   GNUNET_assert (GNUNET_OK == ret);
-  if (GNUNET_YES == c->needs_continue)
+  if (c->needs_continue)
     return; /* #GNUNET_MST_next() did give a message to the client */
   /* need to receive more data from the network first */
   if (NULL != c->recv_task)
@@ -2398,36 +2451,23 @@ resume_client_receive (void *cls)
 }
 
 
-/**
- * Continue receiving further messages from the given client.
- * Must be called after each message received.
- *
- * @param c the client to continue receiving from
- */
 void
 GNUNET_SERVICE_client_continue (struct GNUNET_SERVICE_Client *c)
 {
   GNUNET_assert (NULL == c->drop_task);
-  GNUNET_assert (GNUNET_YES == c->needs_continue);
+  GNUNET_assert (c->needs_continue);
   GNUNET_assert (NULL == c->recv_task);
-  c->needs_continue = GNUNET_NO;
+  c->needs_continue = false;
   if (NULL != c->warn_task)
   {
     GNUNET_SCHEDULER_cancel (c->warn_task);
     c->warn_task = NULL;
   }
-  c->recv_task = GNUNET_SCHEDULER_add_now (&resume_client_receive, c);
+  c->recv_task = GNUNET_SCHEDULER_add_now (&resume_client_receive,
+                                           c);
 }
 
 
-/**
- * Disable the warning the server issues if a message is not
- * acknowledged in a timely fashion.  Use this call if a client is
- * intentionally delayed for a while.  Only applies to the current
- * message.
- *
- * @param c client for which to disable the warning
- */
 void
 GNUNET_SERVICE_client_disable_continue_warning (struct GNUNET_SERVICE_Client *c)
 {
@@ -2440,51 +2480,6 @@ GNUNET_SERVICE_client_disable_continue_warning (struct GNUNET_SERVICE_Client *c)
 }
 
 
-/**
- * Asynchronously finish dropping the client.
- *
- * @param cls the `struct GNUNET_SERVICE_Client`.
- */
-static void
-finish_client_drop (void *cls)
-{
-  struct GNUNET_SERVICE_Client *c = cls;
-  struct GNUNET_SERVICE_Handle *sh = c->sh;
-
-  c->drop_task = NULL;
-  GNUNET_assert (NULL == c->send_task);
-  GNUNET_assert (NULL == c->recv_task);
-  GNUNET_assert (NULL == c->warn_task);
-  GNUNET_MST_destroy (c->mst);
-  GNUNET_MQ_destroy (c->mq);
-  if (GNUNET_NO == c->persist)
-  {
-    GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (c->sock));
-    if ((0 != (SUSPEND_STATE_EMFILE & sh->suspend_state)) &&
-        (0 == (SUSPEND_STATE_SHUTDOWN & sh->suspend_state)))
-      do_resume (sh, SUSPEND_STATE_EMFILE);
-  }
-  else
-  {
-    GNUNET_NETWORK_socket_free_memory_only_ (c->sock);
-  }
-  GNUNET_free (c);
-  if ((0 != (SUSPEND_STATE_SHUTDOWN & sh->suspend_state)) &&
-      (GNUNET_NO == have_non_monitor_clients (sh)))
-    GNUNET_SERVICE_shutdown (sh);
-}
-
-
-/**
- * Ask the server to disconnect from the given client.  This is the
- * same as returning #GNUNET_SYSERR within the check procedure when
- * handling a message, wexcept that it allows dropping of a client even
- * when not handling a message from that client.  The `disconnect_cb`
- * will be called on @a c even if the application closes the connection
- * using this function.
- *
- * @param c client to disconnect now
- */
 void
 GNUNET_SERVICE_client_drop (struct GNUNET_SERVICE_Client *c)
 {
@@ -2497,9 +2492,11 @@ GNUNET_SERVICE_client_drop (struct GNUNET_SERVICE_Client *c)
 #if EXECINFO
   {
     void *backtrace_array[MAX_TRACE_DEPTH];
-    int num_backtrace_strings = backtrace (backtrace_array, MAX_TRACE_DEPTH);
+    int num_backtrace_strings = backtrace (backtrace_array,
+                                           MAX_TRACE_DEPTH);
     char **backtrace_strings =
-      backtrace_symbols (backtrace_array, t->num_backtrace_strings);
+      backtrace_symbols (backtrace_array,
+                         t->num_backtrace_strings);
     for (unsigned int i = 0; i < num_backtrace_strings; i++)
       LOG (GNUNET_ERROR_TYPE_DEBUG,
            "client drop trace %u: %s\n",
@@ -2507,15 +2504,7 @@ GNUNET_SERVICE_client_drop (struct GNUNET_SERVICE_Client *c)
            backtrace_strings[i]);
   }
 #endif
-  if (NULL != c->drop_task)
-  {
-    /* asked to drop twice! */
-    GNUNET_assert (0);
-    return;
-  }
-  GNUNET_CONTAINER_DLL_remove (sh->clients_head,
-                               sh->clients_tail,
-                               c);
+  GNUNET_assert (NULL == c->drop_task);
   if (NULL != sh->disconnect_cb)
     sh->disconnect_cb (sh->cb_cls,
                        c,
@@ -2535,69 +2524,44 @@ GNUNET_SERVICE_client_drop (struct GNUNET_SERVICE_Client *c)
     GNUNET_SCHEDULER_cancel (c->send_task);
     c->send_task = NULL;
   }
-  c->drop_task = GNUNET_SCHEDULER_add_now (&finish_client_drop, c);
+  c->drop_task = GNUNET_SCHEDULER_add_now (&finish_client_drop,
+                                           c);
 }
 
 
-/**
- * Explicitly stops the service.
- *
- * @param sh server to shutdown
- */
 void
 GNUNET_SERVICE_shutdown (struct GNUNET_SERVICE_Handle *sh)
 {
-  struct GNUNET_SERVICE_Client *client;
-
   if (0 == (sh->suspend_state & SUSPEND_STATE_SHUTDOWN))
-    do_suspend (sh, SUSPEND_STATE_SHUTDOWN);
-  while (NULL != (client = sh->clients_head))
-    GNUNET_SERVICE_client_drop (client);
+    do_suspend (sh,
+                SUSPEND_STATE_SHUTDOWN);
+  for (struct GNUNET_SERVICE_Client *client = sh->clients_head;
+       NULL != client;
+       client = client->next)
+  {
+    if (NULL == client->drop_task)
+      GNUNET_SERVICE_client_drop (client);
+  }
 }
 
 
-/**
- * Set the 'monitor' flag on this client.  Clients which have been
- * marked as 'monitors' won't prevent the server from shutting down
- * once #GNUNET_SERVICE_stop_listening() has been invoked.  The idea is
- * that for "normal" clients we likely want to allow them to process
- * their requests; however, monitor-clients are likely to 'never'
- * disconnect during shutdown and thus will not be considered when
- * determining if the server should continue to exist after
- * shutdown has been triggered.
- *
- * @param c client to mark as a monitor
- */
 void
 GNUNET_SERVICE_client_mark_monitor (struct GNUNET_SERVICE_Client *c)
 {
-  c->is_monitor = GNUNET_YES;
+  c->is_monitor = true;
   if (((0 != (SUSPEND_STATE_SHUTDOWN & c->sh->suspend_state)) &&
-       (GNUNET_NO == have_non_monitor_clients (c->sh))))
+       (! have_non_monitor_clients (c->sh))))
     GNUNET_SERVICE_shutdown (c->sh);
 }
 
 
-/**
- * Set the persist option on this client.  Indicates that the
- * underlying socket or fd should never really be closed.  Used for
- * indicating process death.
- *
- * @param c client to persist the socket (never to be closed)
- */
 void
 GNUNET_SERVICE_client_persist (struct GNUNET_SERVICE_Client *c)
 {
-  c->persist = GNUNET_YES;
+  c->persist = true;
 }
 
 
-/**
- * Obtain the message queue of @a c.  Convenience function.
- *
- * @param c the client to continue receiving from
- * @return the message queue of @a c
- */
 struct GNUNET_MQ_Handle *
 GNUNET_SERVICE_client_get_mq (struct GNUNET_SERVICE_Client *c)
 {
diff --git a/src/plugin/datastore/Makefile.am b/src/plugin/datastore/Makefile.am
index 1f4ab59c8..bde7321dd 100644
--- a/src/plugin/datastore/Makefile.am
+++ b/src/plugin/datastore/Makefile.am
@@ -103,39 +103,33 @@ endif
 perf_plugin_datastore_heap_SOURCES = \
  perf_plugin_datastore.c
 perf_plugin_datastore_heap_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_plugin_datastore_heap_SOURCES = \
  test_plugin_datastore.c
 test_plugin_datastore_heap_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 
 perf_plugin_datastore_sqlite_SOURCES = \
  perf_plugin_datastore.c
 perf_plugin_datastore_sqlite_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_plugin_datastore_sqlite_SOURCES = \
  test_plugin_datastore.c
 test_plugin_datastore_sqlite_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 
 test_plugin_datastore_postgres_SOURCES = \
  test_plugin_datastore.c
 test_plugin_datastore_postgres_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 perf_plugin_datastore_postgres_SOURCES = \
  perf_plugin_datastore.c
 perf_plugin_datastore_postgres_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 
diff --git a/src/plugin/namecache/Makefile.am b/src/plugin/namecache/Makefile.am
index bf8fc9b8d..980aeebe6 100644
--- a/src/plugin/namecache/Makefile.am
+++ b/src/plugin/namecache/Makefile.am
@@ -86,19 +86,16 @@ libgnunet_plugin_namecache_postgres_la_LDFLAGS = \
 test_plugin_namecache_flat_SOURCES = \
  test_plugin_namecache.c
 test_plugin_namecache_flat_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_plugin_namecache_sqlite_SOURCES = \
  test_plugin_namecache.c
 test_plugin_namecache_sqlite_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_plugin_namecache_postgres_SOURCES = \
  test_plugin_namecache.c
 test_plugin_namecache_postgres_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 EXTRA_DIST = \
diff --git a/src/plugin/peerstore/Makefile.am b/src/plugin/peerstore/Makefile.am
index 7202aef84..5e10b706f 100644
--- a/src/plugin/peerstore/Makefile.am
+++ b/src/plugin/peerstore/Makefile.am
@@ -31,7 +31,6 @@ plugin_LTLIBRARIES = \
 test_plugin_peerstore_sqlite_SOURCES = \
   test_plugin_peerstore.c
 test_plugin_peerstore_sqlite_LDADD = \
-        $(top_builddir)/src/service/testing/libgnunettesting.la \
         $(top_builddir)/src/lib/util/libgnunetutil.la
 
 check_PROGRAMS = \
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index 610971725..557f56b8a 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -1,9 +1,9 @@
 SUBDIRS = \
         util \
+    testbed \
         statistics \
         arm \
         peerstore \
-        testing \
         nat \
         nat-auto \
         transport \
@@ -32,4 +32,3 @@ SUBDIRS = \
         reclaim \
         messenger \
         rest
-
diff --git a/src/service/arm/Makefile.am b/src/service/arm/Makefile.am
index 32addeef1..26c940688 100644
--- a/src/service/arm/Makefile.am
+++ b/src/service/arm/Makefile.am
@@ -13,10 +13,14 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
-lib_LTLIBRARIES = libgnunetarm.la
+lib_LTLIBRARIES = \
+  libgnunetarm.la \
+  libgnunettestingarm.la
 
 libgnunetarm_la_SOURCES = \
-  arm_api.c arm_monitor_api.c arm.h
+  arm_api.c \
+  arm_monitor_api.c \
+  arm.h
 libgnunetarm_la_LIBADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(GN_LIBINTL) $(XLIB)
@@ -24,6 +28,21 @@ libgnunetarm_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)   \
   -version-info 2:0:0
 
+libgnunettestingarm_la_SOURCES = \
+  testing_arm_cmd_start_peer.c \
+  testing_arm_cmd_stop_peer.c \
+  testing_arm_traits.c
+libgnunettestingarm_la_LIBADD = \
+  libgnunetarm.la \
+  $(top_builddir)/src/service/testbed/libgnunettestingtestbed.la \
+  $(top_builddir)/src/service/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(GN_LIBINTL) $(XLIB)
+libgnunettestingarm_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)   \
+  -version-info 0:0:0
+
 
 noinst_PROGRAMS = \
  mockup-service
diff --git a/src/service/arm/arm_api.c b/src/service/arm/arm_api.c
index 1360ecf14..bc5efbd3f 100644
--- a/src/service/arm/arm_api.c
+++ b/src/service/arm/arm_api.c
@@ -346,7 +346,7 @@ pool_get (const char *pool_start,
  * @param lres the message received from the arm service
  * @return #GNUNET_OK if message is well-formed
  */
-static int
+static enum GNUNET_GenericReturnValue
 check_arm_list_result (void *cls,
                        const struct GNUNET_ARM_ListResultMessage *lres)
 {
@@ -515,7 +515,7 @@ mq_error_handler (void *cls,
  * @param h arm handle
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
  */
-static int
+static enum GNUNET_GenericReturnValue
 reconnect_arm (struct GNUNET_ARM_Handle *h)
 {
   struct GNUNET_MQ_MessageHandler handlers[] = {
@@ -574,9 +574,10 @@ reconnect_arm (struct GNUNET_ARM_Handle *h)
  * @return context to use for further ARM operations, NULL on error.
  */
 struct GNUNET_ARM_Handle *
-GNUNET_ARM_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                    GNUNET_ARM_ConnectionStatusCallback conn_status,
-                    void *conn_status_cls)
+GNUNET_ARM_connect (
+  const struct GNUNET_CONFIGURATION_Handle *cfg,
+  GNUNET_ARM_ConnectionStatusCallback conn_status,
+  void *conn_status_cls)
 {
   struct GNUNET_ARM_Handle *h;
 
@@ -673,17 +674,19 @@ start_arm_service (struct GNUNET_ARM_Handle *h,
     ld[1] = -1;
     lsocks = ld;
   }
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (h->cfg,
-                                                          "arm",
-                                                          "PREFIX",
-                                                          &loprefix))
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (h->cfg,
+                                             "arm",
+                                             "PREFIX",
+                                             &loprefix))
     loprefix = GNUNET_strdup ("");
   else
     loprefix = GNUNET_CONFIGURATION_expand_dollar (h->cfg, loprefix);
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (h->cfg,
-                                                          "arm",
-                                                          "OPTIONS",
-                                                          &lopostfix))
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (h->cfg,
+                                             "arm",
+                                             "OPTIONS",
+                                             &lopostfix))
     lopostfix = GNUNET_strdup ("");
   else
     lopostfix = GNUNET_CONFIGURATION_expand_dollar (h->cfg,
@@ -701,10 +704,11 @@ start_arm_service (struct GNUNET_ARM_Handle *h,
     GNUNET_free (lopostfix);
     return GNUNET_ARM_RESULT_IS_NOT_KNOWN;
   }
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (h->cfg,
-                                                            "arm",
-                                                            "CONFIG",
-                                                            &config))
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_filename (h->cfg,
+                                               "arm",
+                                               "CONFIG",
+                                               &config))
     config = NULL;
   binary = GNUNET_OS_get_libexec_binary_path (cbinary);
   GNUNET_asprintf (&quotedbinary,
@@ -850,10 +854,14 @@ change_service (struct GNUNET_ARM_Handle *h,
   GNUNET_CONTAINER_DLL_insert_tail (h->operation_pending_head,
                                     h->operation_pending_tail,
                                     op);
-  env = GNUNET_MQ_msg_extra (msg, slen, type);
+  env = GNUNET_MQ_msg_extra (msg,
+                             slen,
+                             type);
   msg->reserved = htonl (0);
   msg->request_id = GNUNET_htonll (op->id);
-  GNUNET_memcpy (&msg[1], service_name, slen);
+  GNUNET_memcpy (&msg[1],
+                 service_name,
+                 slen);
   GNUNET_MQ_send (h->mq, env);
   return op;
 }
@@ -907,7 +915,7 @@ notify_starting (void *cls)
     op->result_cont (op->cont_cls,
                      GNUNET_ARM_REQUEST_SENT_OK,
                      op->starting_ret);
-  GNUNET_DISK_file_close(op->rfd);
+  GNUNET_DISK_file_close (op->rfd);
   GNUNET_free (op);
 }
 
@@ -923,12 +931,13 @@ notify_starting (void *cls)
  * @return handle for the operation, NULL on error
  */
 struct GNUNET_ARM_Operation *
-GNUNET_ARM_request_service_start (struct GNUNET_ARM_Handle *h,
-                                  const char *service_name,
-                                  enum GNUNET_OS_InheritStdioFlags
-                                  std_inheritance,
-                                  GNUNET_ARM_ResultCallback cont,
-                                  void *cont_cls)
+GNUNET_ARM_request_service_start (
+  struct GNUNET_ARM_Handle *h,
+  const char *service_name,
+  enum GNUNET_OS_InheritStdioFlags
+  std_inheritance,
+  GNUNET_ARM_ResultCallback cont,
+  void *cont_cls)
 {
   struct GNUNET_ARM_Operation *op;
   enum GNUNET_ARM_Result ret;
@@ -1035,10 +1044,11 @@ GNUNET_ARM_request_service_start (struct GNUNET_ARM_Handle *h,
  * @return handle for the operation, NULL on error
  */
 struct GNUNET_ARM_Operation *
-GNUNET_ARM_request_service_stop (struct GNUNET_ARM_Handle *h,
-                                 const char *service_name,
-                                 GNUNET_ARM_ResultCallback cont,
-                                 void *cont_cls)
+GNUNET_ARM_request_service_stop (
+  struct GNUNET_ARM_Handle *h,
+  const char *service_name,
+  GNUNET_ARM_ResultCallback cont,
+  void *cont_cls)
 {
   struct GNUNET_ARM_Operation *op;
 
@@ -1070,9 +1080,10 @@ GNUNET_ARM_request_service_stop (struct GNUNET_ARM_Handle *h,
  * @return handle for the operation, NULL on error
  */
 struct GNUNET_ARM_Operation *
-GNUNET_ARM_request_service_list (struct GNUNET_ARM_Handle *h,
-                                 GNUNET_ARM_ServiceListCallback cont,
-                                 void *cont_cls)
+GNUNET_ARM_request_service_list (
+  struct GNUNET_ARM_Handle *h,
+  GNUNET_ARM_ServiceListCallback cont,
+  void *cont_cls)
 {
   struct GNUNET_ARM_Operation *op;
   struct GNUNET_MQ_Envelope *env;
diff --git a/src/service/arm/testing_arm_cmd_start_peer.c b/src/service/arm/testing_arm_cmd_start_peer.c
new file mode 100644
index 000000000..73d7ca4e7
--- /dev/null
+++ b/src/service/arm/testing_arm_cmd_start_peer.c
@@ -0,0 +1,293 @@
+/*
+      This file is part of GNUnet
+      Copyright (C) 2021 GNUnet e.V.
+
+      GNUnet is free software: you can redistribute it and/or modify it
+      under the terms of the GNU Affero General Public License as published
+      by the Free Software Foundation, either version 3 of the License,
+      or (at your option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Affero General Public License for more details.
+
+      You should have received a copy of the GNU Affero General Public License
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+/**
+ * @file testing_api_cmd_start_peer.c
+ * @brief cmd to start a peer.
+ * @author t3sserakt
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testing_lib.h"
+#include "gnunet_testbed_lib.h"
+#include "gnunet_testing_testbed_lib.h"
+#include "gnunet_testing_arm_lib.h"
+
+
+/**
+ * Handle for a peer controlled via ARM.
+ */
+struct GNUNET_TESTING_StartPeerState
+{
+
+  const char *system_label;
+
+  const char *cfgname;
+
+  /**
+   * Our interpreter.
+   */
+  struct GNUNET_TESTING_Interpreter *is;
+
+  /**
+   * Asynchronous start context.
+   */
+  struct GNUNET_TESTING_AsyncContext ac;
+
+  /**
+   * The TESTBED system associated with this peer
+   */
+  struct GNUNET_TESTBED_System *system;
+
+  /**
+   * The handle to the peer's ARM service
+   */
+  struct GNUNET_ARM_Handle *ah;
+
+  /**
+   * Handle to the ARM process information.
+   */
+  struct GNUNET_OS_Process *arm;
+
+  /**
+   * The config of the peer
+   */
+  struct GNUNET_CONFIGURATION_Handle *cfg;
+
+};
+
+
+/**
+ * Function called whenever we connect to or disconnect from ARM.
+ *
+ * @param cls closure
+ * @param connected #GNUNET_YES if connected, #GNUNET_NO if disconnected,
+ *                  #GNUNET_SYSERR if there was an error.
+ */
+static void
+conn_status (
+  void *cls,
+  enum GNUNET_GenericReturnValue connected)
+{
+  struct GNUNET_TESTING_StartPeerState *sps = cls;
+
+  if (GNUNET_OK != connected)
+  {
+    GNUNET_break (0);
+    GNUNET_TESTING_async_fail (&sps->ac);
+    return;
+  }
+  GNUNET_TESTING_async_finish (&sps->ac);
+}
+
+
+/**
+ * The run method of this cmd will start all services of a peer to test the transport service.
+ *
+ */
+static void
+start_peer_run (void *cls,
+                struct GNUNET_TESTING_Interpreter *is)
+{
+  struct GNUNET_TESTING_StartPeerState *sps = cls;
+  const struct GNUNET_TESTING_Command *system_cmd;
+
+  sps->is = is;
+  if (GNUNET_NO ==
+      GNUNET_DISK_file_test (sps->cfgname))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "File not found: `%s'\n",
+                sps->cfgname);
+    GNUNET_TESTING_FAIL (is);
+  }
+  system_cmd
+    = GNUNET_TESTING_interpreter_lookup_command (is,
+                                                 sps->system_label);
+  if (NULL == system_cmd)
+    GNUNET_TESTING_FAIL (is);
+  if (GNUNET_OK !=
+      GNUNET_TESTING_TESTBED_get_trait_test_system (
+        system_cmd,
+        &sps->system))
+    GNUNET_TESTING_FAIL (is);
+  sps->cfg = GNUNET_CONFIGURATION_create ();
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_load (sps->cfg,
+                                 sps->cfgname))
+    GNUNET_TESTING_FAIL (is);
+  if (GNUNET_SYSERR ==
+      GNUNET_TESTBED_configuration_create (sps->system,
+                                           sps->cfg,
+                                           NULL,
+                                           NULL))
+    GNUNET_TESTING_FAIL (is);
+  {
+    char *config_filename;
+    char *libexec_binary;
+    char *main_binary;
+    char *args;
+    char *prefix;
+
+    GNUNET_assert (
+      GNUNET_OK ==
+      GNUNET_CONFIGURATION_get_value_filename (
+        sps->cfg,
+        "PATHS",
+        "DEFAULTCONFIG",
+        &config_filename));
+    if (GNUNET_OK !=
+        GNUNET_CONFIGURATION_write (sps->cfg,
+                                    config_filename))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Failed to write configuration file `%s': %s\n",
+                  config_filename,
+                  strerror (errno));
+      GNUNET_free (config_filename);
+      GNUNET_TESTING_FAIL (is);
+    }
+
+    libexec_binary
+      = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm");
+
+    if (GNUNET_SYSERR ==
+        GNUNET_CONFIGURATION_get_value_string (sps->cfg,
+                                               "arm",
+                                               "PREFIX",
+                                               &prefix))
+    {
+      /* No prefix */
+      main_binary = libexec_binary;
+      args = GNUNET_strdup ("");
+    }
+    else
+    {
+      main_binary = prefix;
+      args = libexec_binary;
+    }
+    sps->arm
+      = GNUNET_OS_start_process_s (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+                                   NULL,
+                                   main_binary,
+                                   args,
+                                   "-c",
+                                   config_filename,
+                                   NULL);
+    if (NULL == sps->arm)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  _ ("Failed to start `%s': %s\n"),
+                  main_binary,
+                  strerror (errno));
+      GNUNET_TESTING_FAIL (is);
+    }
+    GNUNET_free (config_filename);
+    GNUNET_free (main_binary);
+    GNUNET_free (args);
+  }
+
+  sps->ah = GNUNET_ARM_connect (sps->cfg,
+                                &conn_status,
+                                sps);
+  if (NULL == sps->ah)
+    GNUNET_TESTING_FAIL (is);
+}
+
+
+/**
+ * The cleanup function of this cmd frees resources the cmd allocated.
+ *
+ */
+static void
+start_peer_cleanup (void *cls)
+{
+  struct GNUNET_TESTING_StartPeerState *sps = cls;
+
+  if (NULL != sps->ah)
+  {
+    GNUNET_ARM_disconnect (sps->ah);
+    sps->ah = NULL;
+  }
+  if (NULL != sps->arm)
+  {
+    GNUNET_break (0 ==
+                  GNUNET_OS_process_kill (sps->arm,
+                                          SIGTERM));
+    GNUNET_break (GNUNET_OK ==
+                  GNUNET_OS_process_wait (sps->arm));
+    GNUNET_OS_process_destroy (sps->arm);
+    sps->ah = NULL;
+  }
+
+  if (NULL != sps->cfg)
+  {
+    GNUNET_CONFIGURATION_destroy (sps->cfg);
+    sps->cfg = NULL;
+  }
+  GNUNET_free (sps);
+}
+
+
+/**
+ * This function prepares an array with traits.
+ *
+ */
+static enum GNUNET_GenericReturnValue
+start_peer_traits (void *cls,
+                   const void **ret,
+                   const char *trait,
+                   unsigned int index)
+{
+  struct GNUNET_TESTING_StartPeerState *sps = cls;
+  struct GNUNET_TESTING_Trait traits[] = {
+    GNUNET_TESTING_make_trait_process (
+      &sps->arm),
+    // FIXME: expose sps->cfg as trait...
+    GNUNET_TESTING_ARM_make_trait_arm_handle (
+      sps->ah),
+    GNUNET_TESTING_trait_end ()
+  };
+
+  return GNUNET_TESTING_get_trait (traits,
+                                   ret,
+                                   trait,
+                                   index);
+}
+
+
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_ARM_cmd_start_peer (
+  const char *label,
+  const char *system_label,
+  const char *cfgname)
+{
+  struct GNUNET_TESTING_StartPeerState *sps;
+
+  sps = GNUNET_new (struct GNUNET_TESTING_StartPeerState);
+  sps->system_label = GNUNET_strdup (system_label);
+  sps->cfgname = cfgname;
+  return GNUNET_TESTING_command_new_ac (sps,
+                                        label,
+                                        &start_peer_run,
+                                        &start_peer_cleanup,
+                                        &start_peer_traits,
+                                        &sps->ac);
+}
diff --git a/src/service/arm/testing_arm_cmd_stop_peer.c b/src/service/arm/testing_arm_cmd_stop_peer.c
new file mode 100644
index 000000000..e83b2bf29
--- /dev/null
+++ b/src/service/arm/testing_arm_cmd_stop_peer.c
@@ -0,0 +1,174 @@
+/*
+      This file is part of GNUnet
+      Copyright (C) 2021 GNUnet e.V.
+
+      GNUnet is free software: you can redistribute it and/or modify it
+      under the terms of the GNU Affero General Public License as published
+      by the Free Software Foundation, either version 3 of the License,
+      or (at your option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Affero General Public License for more details.
+
+      You should have received a copy of the GNU Affero General Public License
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+/**
+ * @file testing_api_cmd_stop_peer.c
+ * @brief cmd to stop a peer.
+ * @author t3sserakt
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testing_lib.h"
+#include "gnunet_testbed_lib.h"
+#include "gnunet_testing_arm_lib.h"
+#include "gnunet_arm_service.h"
+
+
+/**
+ * Struct to hold information for callbacks.
+ */
+struct StopPeerState
+{
+  /**
+   * Label of the cmd to start the peer.
+   */
+  const char *start_label;
+
+  /**
+   * Label of the cmd.
+   */
+  const char *label;
+
+  struct GNUNET_ARM_Operation *op;
+
+  struct GNUNET_TESTING_Interpreter *is;
+
+  struct GNUNET_TESTING_AsyncContext ac;
+};
+
+
+/**
+ * Function called in response to a start/stop request.
+ * Will be called when request was not sent successfully,
+ * or when a reply comes. If the request was not sent successfully,
+ * @a rs will indicate that, and @a result will be undefined.
+ *
+ * @param cls closure
+ * @param rs status of the request
+ * @param result result of the operation
+ */
+static void
+stop_cb (
+  void *cls,
+  enum GNUNET_ARM_RequestStatus rs,
+  enum GNUNET_ARM_Result result)
+{
+  struct StopPeerState *stop_ps = cls;
+
+  stop_ps->op = NULL;
+  if (GNUNET_ARM_RESULT_STOPPED != result)
+  {
+    GNUNET_TESTING_async_fail (&stop_ps->ac);
+    return;
+  }
+  GNUNET_TESTING_async_finish (&stop_ps->ac);
+}
+
+
+/**
+ * The run method of this cmd will stop all services of a peer which were used to test the transport service.
+ *
+ */
+static void
+stop_peer_run (void *cls,
+               struct GNUNET_TESTING_Interpreter *is)
+{
+  struct StopPeerState *stop_ps = cls;
+  const struct GNUNET_TESTING_Command *start_cmd;
+  struct GNUNET_ARM_Handle *ah;
+
+  stop_ps->is = is;
+  start_cmd
+    = GNUNET_TESTING_interpreter_lookup_command (is,
+                                                 stop_ps->start_label);
+  if (NULL == start_cmd)
+    GNUNET_TESTING_FAIL (is);
+  if (GNUNET_OK !=
+      GNUNET_TESTING_ARM_get_trait_arm_handle (start_cmd,
+                                               &ah))
+    GNUNET_TESTING_FAIL (is);
+  stop_ps->op = GNUNET_ARM_request_service_stop (ah,
+                                                 "arm",
+                                                 &stop_cb,
+                                                 stop_ps);
+  if (NULL == stop_ps->op)
+    GNUNET_TESTING_FAIL (is);
+}
+
+
+/**
+ * The cleanup function of this cmd frees resources the cmd allocated.
+ *
+ */
+static void
+stop_peer_cleanup (void *cls)
+{
+  struct StopPeerState *sps = cls;
+
+  if (NULL != sps->op)
+  {
+    GNUNET_TESTING_command_incomplete (sps->is,
+                                       sps->label);
+    GNUNET_ARM_operation_cancel (sps->op);
+    sps->op = NULL;
+  }
+  GNUNET_free (sps);
+}
+
+
+/**
+ * Trait function of this cmd does nothing.
+ *
+ */
+static int
+stop_peer_traits (void *cls,
+                  const void **ret,
+                  const char *trait,
+                  unsigned int index)
+{
+  struct GNUNET_TESTING_Trait traits[] = {
+    GNUNET_TESTING_trait_end ()
+  };
+
+  (void) cls;
+  return GNUNET_TESTING_get_trait (traits,
+                                   ret,
+                                   trait,
+                                   index);
+}
+
+
+struct GNUNET_TESTING_Command
+GNUNET_TESTING_cmd_stop_peer (const char *label,
+                              const char *start_label)
+{
+  struct StopPeerState *sps;
+
+  sps = GNUNET_new (struct StopPeerState);
+  sps->start_label = start_label;
+  sps->label = label;
+  return GNUNET_TESTING_command_new_ac (
+    sps,
+    label,
+    &stop_peer_run,
+    &stop_peer_cleanup,
+    &stop_peer_traits,
+    &sps->ac);
+}
diff --git a/src/service/transport/transport_api_traits.c b/src/service/arm/testing_arm_traits.c
index ec53f6f2b..d965220a2 100644
--- a/src/service/transport/transport_api_traits.c
+++ b/src/service/arm/testing_arm_traits.c
@@ -24,9 +24,10 @@
  * @author t3sserakt
  */
 #include "platform.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_netjail_lib.h"
-#include "transport-testing-cmds.h"
 #include "gnunet_util_lib.h"
+#include "gnunet_testing_lib.h"
+#include "gnunet_testing_arm_lib.h"
 
-GNUNET_TRANSPORT_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_IMPL_SIMPLE_TRAIT, GNUNET_TRANSPORT_TESTING)
+
+GNUNET_TESTING_ARM_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_IMPL_SIMPLE_TRAIT,
+                                  GNUNET_TESTING_ARM)
diff --git a/src/service/cadet/gnunet-service-cadet_dht.c b/src/service/cadet/gnunet-service-cadet_dht.c
index 28b5448fd..dcd1efaa2 100644
--- a/src/service/cadet/gnunet-service-cadet_dht.c
+++ b/src/service/cadet/gnunet-service-cadet_dht.c
@@ -217,6 +217,7 @@ announce_id (void *cls)
                   expiration,  /* Data expiration */
                   NULL,         /* Continuation */
                   NULL);        /* Continuation closure */
+  GNUNET_free (block);
 }
 
 
diff --git a/src/service/cadet/gnunet-service-cadet_hello.c b/src/service/cadet/gnunet-service-cadet_hello.c
index cc28f0fde..889f3d588 100644
--- a/src/service/cadet/gnunet-service-cadet_hello.c
+++ b/src/service/cadet/gnunet-service-cadet_hello.c
@@ -24,7 +24,6 @@
  * @author Bartlomiej Polot
  * @author Christian Grothoff
  */
-#include "gnunet_common.h"
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"
diff --git a/src/service/cadet/meson.build b/src/service/cadet/meson.build
index 0f465e0e2..d49dcdd2a 100644
--- a/src/service/cadet/meson.build
+++ b/src/service/cadet/meson.build
@@ -57,6 +57,8 @@ executable ('gnunet-service-cadet',
             install: true,
             install_dir: get_option('libdir') / 'gnunet' / 'libexec')
 
+if false
+
 testcadetlocalmq = executable ('test_cadet_local_mq',
             ['test_cadet_local_mq.c'],
             dependencies: [libgnunetcadet_dep,
@@ -70,3 +72,5 @@ configure_file(input : 'test_cadet.conf',
                install: false)
 test('test_cadet_local_mq', testcadetlocalmq, workdir: meson.current_build_dir(), suite: 'cadet')
 
+
+endif
\ No newline at end of file
diff --git a/src/service/core/Makefile.am b/src/service/core/Makefile.am
index 220da838f..6de6762b1 100644
--- a/src/service/core/Makefile.am
+++ b/src/service/core/Makefile.am
@@ -15,15 +15,12 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
-plugin_LTLIBRARIES = \
-  libgnunet_test_core_plugin_cmd_just_run.la
-
-TESTING_LIBS = \
-  libgnunetcoretesting.la
+#plugin_LTLIBRARIES = \
+#  libgnunet_test_core_plugin_cmd_just_run.la
 
 lib_LTLIBRARIES = \
-  libgnunetcore.la \
-  $(TESTING_LIBS)
+  libgnunetcore.la
+# libgnunettestingcore.la
 
 libgnunetcore_la_SOURCES = \
   core_api.c core.h \
@@ -38,13 +35,13 @@ libgnunetcore_la_LDFLAGS = \
 libgnunet_test_core_plugin_cmd_just_run_la_SOURCES = \
  test_core_plugin_cmd_just_run.c
 libgnunet_test_core_plugin_cmd_just_run_la_LIBADD = \
-  libgnunetcoretesting.la \
+  libgnunettestingcore.la \
+  $(top_builddir)/src/service/transport/libgnunettestingtransport.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/service/transport/libgnunettransportapplication.la \
   $(top_builddir)/src/service/transport/libgnunettransportcore.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
   $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
-  $(top_builddir)/src/service/transport/libgnunettransporttesting2.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/service/arm/libgnunetarm.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
@@ -52,18 +49,18 @@ libgnunet_test_core_plugin_cmd_just_run_la_LIBADD = \
 libgnunet_test_core_plugin_cmd_just_run_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS)
 
-libgnunetcoretesting_la_SOURCES = \
-  core_api_cmd_connecting_peers.c 
-libgnunetcoretesting_la_LIBADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
+libgnunettestingcore_la_SOURCES = \
+  testing_core_cmd_connecting_peers.c
+libgnunettestingcore_la_LIBADD = \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
+  $(top_builddir)/src/service/transport/libgnunettestingtransport.la \
   $(top_builddir)/src/service/arm/libgnunetarm.la \
   $(top_builddir)/src/service/transport/libgnunettransportapplication.la \
-  $(top_builddir)/src/service/transport/libgnunettransporttesting2.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
   $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/service/transport/libgnunettransportcore.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
-libgnunetcoretesting_la_LDFLAGS = \
+libgnunettestingcore_la_LDFLAGS = \
   $(GN_LIBINTL) \
   $(GN_LIB_LDFLAGS) \
   -version-info 0:0:0
@@ -85,8 +82,8 @@ gnunet_service_core_LDADD = \
   $(GN_LIBINTL) $(Z_LIBS)
 
 
-TESTING_TESTS = \
-  test_core_api_send_to_self
+#TESTING_TESTS = \
+# test_core_api_send_to_self
 
 check_PROGRAMS = \
  test_core_api_start_only \
@@ -106,13 +103,13 @@ test_core_api_send_to_self_SOURCES = \
  test_core_api_send_to_self.c
 test_core_api_send_to_self_LDADD = \
  libgnunetcore.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_core_api_start_only_SOURCES = \
  test_core_api_start_only.c
 test_core_api_start_only_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  libgnunetcore.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
diff --git a/src/service/core/meson.build b/src/service/core/meson.build
index 09fdc8dab..57adfc687 100644
--- a/src/service/core/meson.build
+++ b/src/service/core/meson.build
@@ -31,11 +31,13 @@ libgnunetcore_dep = declare_dependency(link_with : libgnunetcore)
 pkg.generate(libgnunetcore, url: 'https://www.gnunet.org',
              description : 'Provides API for (encrypted) P2P communication')
 
+if false
+
 libgnunetcoretesting = library('gnunetcoretesting',
-          ['core_api_cmd_connecting_peers.c'],
+          ['testing_core_cmd_connecting_peers.c'],
           dependencies: [
             libgnunetutil_dep,
-            libgnunettransporttesting2_dep,
+            libgnunettestingtransport_dep,
             libgnunettesting_dep,
             libgnunetarm_dep,
             libgnunettransportapplication_dep,
@@ -53,7 +55,7 @@ shared_module('gnunet_test_core_plugin_cmd_just_run',
         dependencies: [libgnunetutil_dep,
                        libgnunettesting_dep,
                        libgnunetcoretesting_dep,
-                       libgnunettransporttesting2_dep,
+                       libgnunettestingtransport_dep,
                        libgnunettransportcore_dep,
                        libgnunettransportapplication_dep,
                        libgnunettesting_dep,
@@ -65,6 +67,8 @@ shared_module('gnunet_test_core_plugin_cmd_just_run',
         include_directories: [incdir, configuration_inc],
         install: false)
 
+endif
+
 executable ('gnunet-service-core',
             gnunetservicecore_src,
             dependencies: [libgnunetcore_dep, libgnunetutil_dep,
@@ -87,6 +91,8 @@ configure_file(input : 'test_core_api_peer1.conf',
                output : 'test_core_api_peer1.conf',
                copy: true)
 
+if false
+
 testcore_api_send_self = executable ('test_core_api_send_to_self',
             ['test_core_api_send_to_self.c'],
             dependencies: [
@@ -111,3 +117,5 @@ test('test_core_api_send_to_self', testcore_api_send_self,
   suite: 'core', workdir: meson.current_build_dir())
 test('test_core_api_start_only', testcore_api_start,
   suite: 'core', workdir: meson.current_build_dir())
+
+endif
\ No newline at end of file
diff --git a/src/service/core/test_core_plugin_cmd_just_run.c b/src/service/core/test_core_plugin_cmd_just_run.c
index 3c77c370d..a2b331c1f 100644
--- a/src/service/core/test_core_plugin_cmd_just_run.c
+++ b/src/service/core/test_core_plugin_cmd_just_run.c
@@ -24,15 +24,13 @@
  * @author t3sserakt
  */
 #include "platform.h"
-#include "gnunet_testing_barrier.h"
-#include "gnunet_testing_netjail_lib.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_transport_application_service.h"
 #include "gnunet_transport_core_service.h"
-#include "gnunet_testing_barrier.h"
 #include "gnunet_core_service.h"
-#include "gnunet_transport_testing_ng_lib.h"
-#include "gnunet_core_testing_lib.h"
+#include "gnunet_testing_lib.h"
+#include "gnunet_testing_transport_lib.h"
+#include "gnunet_testing_core_lib.h"
 
 /**
  * Generic logging shortcut
@@ -250,11 +248,11 @@ start_testcase (GNUNET_TESTING_cmd_helper_write_cb write_message,
   block_script = GNUNET_TESTING_cmd_block_until_external_trigger (
     "block-script");
   connect_peers = GNUNET_CORE_cmd_connect_peers ("connect-peers",
-                                                      "start-peer",
-                                                      "system-create",
-                                                      num,
-                                                      topology,
-                                                      0,
+                                                 "start-peer",
+                                                 "system-create",
+                                                 num,
+                                                 topology,
+                                                 0,
                                                  GNUNET_NO,
                                                  NULL);
   local_prepared = GNUNET_TESTING_cmd_local_test_prepared (
@@ -270,7 +268,7 @@ start_testcase (GNUNET_TESTING_cmd_helper_write_cb write_message,
   else
   {
     GNUNET_asprintf (&ts->cfgname,
-                   "test_core_just_run.conf");
+                     "test_core_just_run.conf");
   }
 
   LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -334,7 +332,7 @@ start_testcase (GNUNET_TESTING_cmd_helper_write_cb write_message,
                                         GNUNET_NO,
                                         write_message),
     GNUNET_TESTING_cmd_stop_peer ("stop-peer",
-                                    "start-peer"),
+                                  "start-peer"),
     GNUNET_TESTING_cmd_system_destroy ("system-destroy",
                                        "system-create"),
     GNUNET_TESTING_cmd_end ()
diff --git a/src/service/core/core_api_cmd_connecting_peers.c b/src/service/core/testing_core_cmd_connecting_peers.c
index a6aa818fa..731b2b202 100644
--- a/src/service/core/core_api_cmd_connecting_peers.c
+++ b/src/service/core/testing_core_cmd_connecting_peers.c
@@ -25,8 +25,8 @@
  */
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_core_testing_lib.h"
-#include "gnunet_transport_testing_ng_lib.h"
+#include "gnunet_testing_core_lib.h"
+#include "gnunet_testing_transport_lib.h"
 #include "gnunet_transport_application_service.h"
 #include "gnunet_transport_core_service.h"
 
@@ -64,9 +64,9 @@ connect_peers_run (void *cls,
   peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
                                                          cps->start_peer_label);
   GNUNET_TRANSPORT_TESTING_get_trait_broadcast (peer1_cmd,
-                                        &broadcast);
+                                                &broadcast);
   GNUNET_TRANSPORT_TESTING_get_trait_state (peer1_cmd,
-                                    &sps);
+                                            &sps);
 
   system_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
                                                           cps->create_label);
@@ -78,7 +78,7 @@ connect_peers_run (void *cls,
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "cps->num: %u \n",
        cps->num);
-  
+
 
   cps->ah = GNUNET_TRANSPORT_application_init (sps->cfg);
   if (NULL == cps->ah)
@@ -224,7 +224,7 @@ GNUNET_CORE_cmd_connect_peers (
   struct GNUNET_CONTAINER_MultiShortmap *connected_peers_map =
     GNUNET_CONTAINER_multishortmap_create (1,GNUNET_NO);
   unsigned int i;
-  
+
   node_additional_connects = GNUNET_TESTING_get_additional_connects (num,
                                                                      topology);
 
@@ -255,24 +255,23 @@ GNUNET_CORE_cmd_connect_peers (
                    handlers,
                    i * sizeof(struct GNUNET_MQ_MessageHandler));
   }
-
+  // FIXME: wrap with cmd_make_unblocking!
   if (GNUNET_YES == wait_for_connect)
-    return GNUNET_TESTING_command_new (cps,
-                                       label,
-                                       &connect_peers_run,
-                                       &connect_peers_cleanup,
-                                       &connect_peers_traits,
-                                       &cps->ac);
+    return GNUNET_TESTING_command_new_ac (cps,
+                                          label,
+                                          &connect_peers_run,
+                                          &connect_peers_cleanup,
+                                          &connect_peers_traits,
+                                          &cps->ac);
   else
     return GNUNET_TESTING_command_new (cps,
                                        label,
                                        &connect_peers_run,
                                        &connect_peers_cleanup,
-                                       &connect_peers_traits,
-                                       NULL);
+                                       &connect_peers_traits);
 }
 
 
 // FIXME: likely not ideally placed here, move to its own file
-GNUNET_CORE_TESTING_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_IMPL_SIMPLE_TRAIT, GNUNET_CORE_TESTING)
-
+GNUNET_CORE_TESTING_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_IMPL_SIMPLE_TRAIT,
+                                   GNUNET_CORE_TESTING)
diff --git a/src/service/datacache/Makefile.am b/src/service/datacache/Makefile.am
index 022b45253..08b6e15ac 100644
--- a/src/service/datacache/Makefile.am
+++ b/src/service/datacache/Makefile.am
@@ -59,42 +59,36 @@ endif
 test_datacache_sqlite_SOURCES = \
  test_datacache.c
 test_datacache_sqlite_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
  libgnunetdatacache.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_datacache_quota_sqlite_SOURCES = \
  test_datacache_quota.c
 test_datacache_quota_sqlite_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
  libgnunetdatacache.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_datacache_heap_SOURCES = \
  test_datacache.c
 test_datacache_heap_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
  libgnunetdatacache.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_datacache_quota_heap_SOURCES = \
  test_datacache_quota.c
 test_datacache_quota_heap_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
  libgnunetdatacache.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_datacache_postgres_SOURCES = \
  test_datacache.c
 test_datacache_postgres_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
  libgnunetdatacache.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_datacache_quota_postgres_SOURCES = \
  test_datacache_quota.c
 test_datacache_quota_postgres_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
  libgnunetdatacache.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 
diff --git a/src/service/datastore/Makefile.am b/src/service/datastore/Makefile.am
index 22f98482a..165bd2519 100644
--- a/src/service/datastore/Makefile.am
+++ b/src/service/datastore/Makefile.am
@@ -60,16 +60,16 @@ endif
   $(POSTGRES_BENCHMARKS)
 endif
 
-check_PROGRAMS = \
-  test_datastore_api_heap \
-  test_datastore_api_management_heap \
-  perf_datastore_api_heap \
-  $(SQLITE_TESTS) \
-  $(POSTGRES_TESTS)
+#check_PROGRAMS = \
+#  test_datastore_api_heap \
+#  test_datastore_api_management_heap \
+#  perf_datastore_api_heap \
+#  $(SQLITE_TESTS) \
+#  $(POSTGRES_TESTS)
 
 if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = $(check_PROGRAMS)
+ TESTS = $(check_PROGRAMS)
 endif
 
 test_datastore_api_heap_SOURCES = \
diff --git a/src/service/datastore/meson.build b/src/service/datastore/meson.build
index 802ebb0a0..61ef9d7a9 100644
--- a/src/service/datastore/meson.build
+++ b/src/service/datastore/meson.build
@@ -38,6 +38,8 @@ executable ('gnunet-service-datastore',
   install: true,
   install_dir: get_option('libdir')/'gnunet'/'libexec')
 
+if false
+
 testds_sqlite = executable ('test_store_api_sqlite',
   ['test_datastore_api.c'],
   dependencies: [
@@ -130,3 +132,4 @@ test('test_datastore_api_management_postgres', testds_mgmt_pq,
   is_parallel: false,
   suite: 'datastore', workdir: meson.current_build_dir())
 
+endif
diff --git a/src/service/dht/gnunet-service-dht.c b/src/service/dht/gnunet-service-dht.c
index ab9e179bc..4579bfc2b 100644
--- a/src/service/dht/gnunet-service-dht.c
+++ b/src/service/dht/gnunet-service-dht.c
@@ -79,11 +79,6 @@ struct GDS_Underlay
    * Name of the underlay (i.e. "gnunet" or "ip").
    */
   char *name;
-
-  /**
-   * Name of the library providing the underlay.
-   */
-  char *libname;
 };
 
 
@@ -383,8 +378,6 @@ shutdown_task (void *cls)
 
   while (NULL != (u = u_head))
   {
-    GNUNET_PLUGIN_unload (u->libname,
-                          u->dhtu);
     GNUNET_CONTAINER_DLL_remove (u_head,
                                  u_tail,
                                  u);
diff --git a/src/service/dht/meson.build b/src/service/dht/meson.build
index 45157243d..a27918fbe 100644
--- a/src/service/dht/meson.build
+++ b/src/service/dht/meson.build
@@ -54,6 +54,8 @@ executable ('gnunet-service-dht',
             install: true,
             install_dir: get_option('libdir')/'gnunet'/'libexec')
 
+if false
+
 libgnunettestingdhtu = library('gnunettestingdhtu',
         ['testing_dhtu_cmd_send.c'],
         soversion: '0',
@@ -95,3 +97,5 @@ test('test_dhtu_ip', testdhtu_ip, suite: 'dhtu',
      workdir: meson.current_build_dir())
 
 
+
+endif
\ No newline at end of file
diff --git a/src/service/fs/Makefile.am b/src/service/fs/Makefile.am
index 0a10f688a..15e73f496 100644
--- a/src/service/fs/Makefile.am
+++ b/src/service/fs/Makefile.am
@@ -100,26 +100,28 @@ gnunet_service_fs_LDADD =  \
  $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
  $(GN_LIBINTL) -lm
 
+# test_fs_download \
+# test_fs_download_cadet \
+# test_fs_download_indexed \
+# test_fs_download_persistence \
+# test_fs_publish \
+# test_fs_list_indexed \
+# test_fs_namespace \
+# test_fs_namespace_list_updateable \
+# test_fs_search \
+# test_fs_search_with_and \
+# test_fs_search_probes \
+# test_fs_search_persistence \
+# test_fs_publish_persistence \
+# test_fs_unindex \
+# test_fs_start_stop \
+# test_fs_unindex_persistence
+
+
 check_PROGRAMS = \
  test_fs_directory \
- test_fs_download \
- test_fs_download_cadet \
- test_fs_download_indexed \
- test_fs_download_persistence \
  test_fs_file_information \
  test_fs_getopt \
- test_fs_list_indexed \
- test_fs_namespace \
- test_fs_namespace_list_updateable \
- test_fs_publish \
- test_fs_publish_persistence \
- test_fs_search \
- test_fs_search_with_and \
- test_fs_search_probes \
- test_fs_search_persistence \
- test_fs_start_stop \
- test_fs_unindex \
- test_fs_unindex_persistence \
  test_fs_uri \
  test_fs_meta_data \
  $(FS_BENCHMARKS)
@@ -127,17 +129,7 @@ check_PROGRAMS = \
 
 if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-TESTS = test_fs_directory \
- test_fs_file_information \
- test_fs_namespace \
- test_fs_namespace_list_updateable \
- test_fs_search \
- test_fs_search_with_and \
- test_fs_search_probes \
- test_fs_search_persistence \
- test_fs_start_stop \
- test_fs_uri \
- test_fs_meta_data
+TESTS = $(check_PROGRAMS)
 endif
 
 
diff --git a/src/service/gns/gns_tld_api.c b/src/service/gns/gns_tld_api.c
index 63b5ac552..7a6864010 100644
--- a/src/service/gns/gns_tld_api.c
+++ b/src/service/gns/gns_tld_api.c
@@ -23,8 +23,8 @@
  * @author Martin Schanzenbach
  * @author Christian Grothoff
  */
-#include "gnunet_common.h"
 #include "platform.h"
+#include "gnunet_common.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_constants.h"
 #include "gnunet_arm_service.h"
diff --git a/src/service/hostlist/gnunet-daemon-hostlist_server.c b/src/service/hostlist/gnunet-daemon-hostlist_server.c
index f243deb00..7cfeaec63 100644
--- a/src/service/hostlist/gnunet-daemon-hostlist_server.c
+++ b/src/service/hostlist/gnunet-daemon-hostlist_server.c
@@ -25,8 +25,8 @@
  * @author David Barksdale
  * @brief application to provide an integrated hostlist HTTP server
  */
-#include "gnunet_common.h"
 #include "platform.h"
+#include "gnunet_common.h"
 #include <microhttpd.h>
 #include "gnunet-daemon-hostlist_server.h"
 #include "gnunet_hello_uri_lib.h"
diff --git a/src/service/identity/Makefile.am b/src/service/identity/Makefile.am
index 455fcab31..df7d6dd4d 100644
--- a/src/service/identity/Makefile.am
+++ b/src/service/identity/Makefile.am
@@ -44,8 +44,8 @@ gnunet_service_identity_LDADD = \
   $(GN_LIBINTL)
 
 
-check_PROGRAMS = \
- test_identity
+#check_PROGRAMS = \
+# test_identity
 
 # if ENABLE_TEST_RUN
 # AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
@@ -62,5 +62,3 @@ test_identity_LDADD = \
 
 EXTRA_DIST = \
   test_identity.conf
-
-
diff --git a/src/service/meson.build b/src/service/meson.build
index ff874a1ec..b40ce9422 100644
--- a/src/service/meson.build
+++ b/src/service/meson.build
@@ -6,8 +6,8 @@ endif
 
 subdir('util')
 subdir('statistics')
+# FIXME: subdir('testbed')
 subdir('arm')
-subdir('testing')
 subdir('peerstore')
 subdir('nat')
 subdir('nat-auto')
diff --git a/src/service/messenger/Makefile.am b/src/service/messenger/Makefile.am
index 93dcf9a78..8da31dfdc 100644
--- a/src/service/messenger/Makefile.am
+++ b/src/service/messenger/Makefile.am
@@ -21,16 +21,13 @@ libexec_PROGRAMS = \
  gnunet-service-messenger \
  $(EXP_LIBEXEC)
 
-plugin_LTLIBRARIES = \
-  libgnunet_test_messenger_plugin_cmd_simple_join.la
-
-TESTING_LIBS = \
-  libgnunetmessengertesting.la
+#plugin_LTLIBRARIES = \
+#  libgnunet_test_messenger_plugin_cmd_simple_join.la
 
 lib_LTLIBRARIES = \
   libgnunetmessenger.la \
-  $(EXP_LIB) \
-  $(TESTING_LIBS)
+  $(EXP_LIB)
+#  libgnunettestingmessenger.la
 
 libgnunetmessenger_la_SOURCES = \
   messenger_api.c \
@@ -54,17 +51,17 @@ libgnunetmessenger_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  \
   -version-info 0:0:0
 
-libgnunetmessengertesting_la_SOURCES = \
-  messenger_api_cmd_join_room.c \
-  messenger_api_cmd_start_service.c \
-  messenger_api_cmd_stop_service.c \
-  messenger_api_traits.c \
-  messenger-testing.c messenger-testing.h
-libgnunetmessengertesting_la_LIBADD = \
+libgnunettestingmessenger_la_SOURCES = \
+  testing_messenger_cmd_join_room.c \
+  testing_messenger_cmd_start_service.c \
+  testing_messenger_cmd_stop_service.c \
+  testing_messenger_traits.c \
+  testing_messenger.c testing_messenger.h
+libgnunettestingmessenger_la_LIBADD = \
   libgnunetmessenger.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/service/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/service/transport/libgnunettransporttesting2.la \
+  $(top_builddir)/src/service/transport/libgnunettestingtransporttesting.la \
   $(top_builddir)/src/service/transport/libgnunettransportapplication.la \
   $(top_builddir)/src/service/transport/libgnunettransportcore.la \
   $(top_builddir)/src/service/core/libgnunetcore.la \
@@ -83,14 +80,14 @@ libgnunet_test_messenger_plugin_cmd_simple_join_la_SOURCES = \
   test_messenger_plugin_cmd_simple_join.c
 libgnunet_test_messenger_plugin_cmd_simple_join_la_LIBADD = \
   libgnunetmessenger.la \
-  libgnunetmessengertesting.la \
+  libgnunettestingmessenger.la \
+  $(top_builddir)/src/service/core/libgnunettestingcore.la \
+  $(top_builddir)/src/service/transport/libgnunettestingtransport.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/service/cadet/libgnunetcadet.la \
   $(top_builddir)/src/service/core/libgnunetcore.la \
-  $(top_builddir)/src/service/core/libgnunetcoretesting.la \
-  $(top_builddir)/src/service/transport/libgnunettransporttesting2.la \
   $(top_builddir)/src/service/transport/libgnunettransportapplication.la \
   $(top_builddir)/src/service/transport/libgnunettransportcore.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
   $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
@@ -130,9 +127,9 @@ gnunet_service_messenger_LDADD = \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(GN_LIBINTL)
 
-check_PROGRAMS = \
-  test_messenger_api \
-  test_messenger_anonymous
+#check_PROGRAMS = \
+#  test_messenger_api \
+#  test_messenger_anonymous
 
 #check_SCRIPTS= \
 #  test_messenger_start_testcase.sh
@@ -147,14 +144,14 @@ test_messenger_api_SOURCES = \
   test_messenger.c
 test_messenger_api_LDADD = \
   libgnunetmessenger.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_messenger_anonymous_SOURCES = \
   test_messenger_anonymous.c
 test_messenger_anonymous_LDADD = \
   libgnunetmessenger.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 EXTRA_DIST = \
diff --git a/src/service/messenger/messenger-testing-cmds.h b/src/service/messenger/messenger-testing-cmds.h
index 222633355..0b70d62f1 100644
--- a/src/service/messenger/messenger-testing-cmds.h
+++ b/src/service/messenger/messenger-testing-cmds.h
@@ -26,9 +26,7 @@
 #ifndef MESSENGER_TESTING_CMDS_H
 #define MESSENGER_TESTING_CMDS_H
 
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_plugin.h"
-
+#include "gnunet_testing_lib.h"
 #include "messenger-testing.h"
 
 struct GNUNET_TESTING_Command
@@ -57,7 +55,7 @@ GNUNET_MESSENGER_cmd_join_room (const char *label,
         enum GNUNET_GenericReturnValue                          \
         GNUNET_MESSENGER_get_trait_ ## name (                    \
           const struct GNUNET_TESTING_Command *cmd,              \
-          type **ret);                                          \
+          type * *ret);                                          \
         struct GNUNET_TESTING_Trait                              \
         GNUNET_MESSENGER_make_trait_ ## name (                   \
           type * value);
diff --git a/src/service/messenger/messenger_api.c b/src/service/messenger/messenger_api.c
index df4499fe0..12a326202 100644
--- a/src/service/messenger/messenger_api.c
+++ b/src/service/messenger/messenger_api.c
@@ -745,25 +745,33 @@ dequeue_messages_from_room (struct GNUNET_MESSENGER_Room *room)
     if (message)
       destroy_message (message);
 
+    memset (&key, 0, sizeof(key));
     message = dequeue_from_messages (&(room->queue), &key, &transcript);
 
     if (! message)
     {
       message = transcript;
+      transcript = NULL;
       continue;
     }
 
     send_message_to_room (room, message, &key, &hash);
 
     if (! transcript)
+    {
+      GNUNET_CRYPTO_private_key_clear (&key);
       continue;
+    }
 
     GNUNET_memcpy (&(transcript->body.transcript.hash), &hash, sizeof(hash));
+
+    memset (&pubkey, 0, sizeof(pubkey));
     GNUNET_CRYPTO_key_get_public (&key, &pubkey);
 
     if (GNUNET_YES == encrypt_message (transcript, &pubkey))
     {
       send_message_to_room (room, transcript, &key, &other);
+      GNUNET_CRYPTO_private_key_clear (&key);
 
       link_room_message (room, &hash, &other);
       link_room_message (room, &other, &hash);
@@ -773,6 +781,7 @@ dequeue_messages_from_room (struct GNUNET_MESSENGER_Room *room)
                   "Sending transcript aborted: Encryption failed!\n");
 
     destroy_message (transcript);
+    transcript = NULL;
   } while (message);
 
   return GNUNET_YES;
@@ -885,7 +894,9 @@ GNUNET_MESSENGER_set_key (struct GNUNET_MESSENGER_Handle *handle,
   GNUNET_memcpy (&priv, key, sizeof (priv));
 
   GNUNET_MESSENGER_find_rooms (handle, NULL, iterate_send_key_to_room, &priv);
-  set_handle_key (handle, &priv);
+  GNUNET_CRYPTO_private_key_clear (&priv);
+
+  set_handle_key (handle, key);
   return GNUNET_YES;
 }
 
diff --git a/src/service/messenger/messenger_api_message.c b/src/service/messenger/messenger_api_message.c
index 04234adb5..fa281cb37 100644
--- a/src/service/messenger/messenger_api_message.c
+++ b/src/service/messenger/messenger_api_message.c
@@ -32,7 +32,7 @@
 struct GNUNET_MESSENGER_MessageSignature
 {
   struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
-  struct GNUNET_HashCode hash;
+  struct GNUNET_HashCode hash GNUNET_PACKED;
 };
 
 struct GNUNET_MESSENGER_ShortMessage
@@ -964,7 +964,7 @@ sign_message (struct GNUNET_MESSENGER_Message *message,
   signature.purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_CHAT_MESSAGE);
   signature.purpose.size = htonl (sizeof(signature));
 
-  GNUNET_memcpy (&(signature.hash), hash, sizeof(struct GNUNET_HashCode));
+  GNUNET_memcpy (&(signature.hash), hash, sizeof(signature.hash));
   GNUNET_CRYPTO_sign (key, &signature, &(message->header.signature));
 
   message->header.signature.type = key->type;
@@ -991,8 +991,8 @@ sign_message_by_peer (struct GNUNET_MESSENGER_Message *message,
   signature.purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_CHAT_MESSAGE);
   signature.purpose.size = htonl (sizeof(signature));
 
-  GNUNET_memcpy (&(signature.hash), hash, sizeof(struct GNUNET_HashCode));
-  GNUNET_CRYPTO_sign_by_peer_identity (cfg, &signature.purpose,
+  GNUNET_memcpy (&(signature.hash), hash, sizeof(signature.hash));
+  GNUNET_CRYPTO_sign_by_peer_identity (cfg, &(signature.purpose),
                                        &(message->header.signature.
                                          eddsa_signature));
 
@@ -1018,7 +1018,7 @@ verify_message (const struct GNUNET_MESSENGER_Message *message,
   signature.purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_CHAT_MESSAGE);
   signature.purpose.size = htonl (sizeof(signature));
 
-  GNUNET_memcpy (&(signature.hash), hash, sizeof(struct GNUNET_HashCode));
+  GNUNET_memcpy (&(signature.hash), hash, sizeof(signature.hash));
 
   return GNUNET_CRYPTO_signature_verify (
     GNUNET_SIGNATURE_PURPOSE_CHAT_MESSAGE, &signature,
@@ -1041,10 +1041,10 @@ verify_message_by_peer (const struct GNUNET_MESSENGER_Message *message,
   signature.purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_CHAT_MESSAGE);
   signature.purpose.size = htonl (sizeof(signature));
 
-  GNUNET_memcpy (&(signature.hash), hash, sizeof(struct GNUNET_HashCode));
+  GNUNET_memcpy (&(signature.hash), hash, sizeof(signature.hash));
 
   return GNUNET_CRYPTO_verify_peer_identity (
-    GNUNET_SIGNATURE_PURPOSE_CHAT_MESSAGE, &signature.purpose,
+    GNUNET_SIGNATURE_PURPOSE_CHAT_MESSAGE, &(signature.purpose),
     &(message->header.signature.
       eddsa_signature), identity);
 }
diff --git a/src/service/messenger/test_messenger.c b/src/service/messenger/test_messenger.c
index 3c3dbd14d..4f7a51e34 100644
--- a/src/service/messenger/test_messenger.c
+++ b/src/service/messenger/test_messenger.c
@@ -74,6 +74,7 @@ end (void *cls)
     messenger = NULL;
   }
 
+  GNUNET_CRYPTO_private_key_clear (&identity);
   status = 0;
 }
 
diff --git a/src/service/messenger/test_messenger_plugin_cmd_simple_join.c b/src/service/messenger/test_messenger_plugin_cmd_simple_join.c
index 4f50e4c06..c5d2be4e0 100644
--- a/src/service/messenger/test_messenger_plugin_cmd_simple_join.c
+++ b/src/service/messenger/test_messenger_plugin_cmd_simple_join.c
@@ -25,15 +25,13 @@
  */
 
 #include "platform.h"
-#include "gnunet_testing_barrier.h"
-#include "gnunet_testing_netjail_lib.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_transport_application_service.h"
 #include "gnunet_transport_core_service.h"
-#include "gnunet_testing_barrier.h"
 #include "gnunet_core_service.h"
-#include "gnunet_core_testing_lib.h"
-#include "gnunet_transport_testing_ng_lib.h"
+#include "gnunet_testing_lib.h"
+#include "gnunet_testing_core_lib.h"
+#include "gnunet_testing_transport_lib.h"
 #include "messenger-testing-cmds.h"
 
 /**
diff --git a/src/service/messenger/messenger-testing.c b/src/service/messenger/testing_messenger.c
index b3f7e3137..b3f7e3137 100644
--- a/src/service/messenger/messenger-testing.c
+++ b/src/service/messenger/testing_messenger.c
diff --git a/src/service/messenger/messenger-testing.h b/src/service/messenger/testing_messenger.h
index 850c37243..850c37243 100644
--- a/src/service/messenger/messenger-testing.h
+++ b/src/service/messenger/testing_messenger.h
diff --git a/src/service/messenger/messenger_api_cmd_join_room.c b/src/service/messenger/testing_messenger_cmd_join_room.c
index 8151dc88e..85f0d30da 100644
--- a/src/service/messenger/messenger_api_cmd_join_room.c
+++ b/src/service/messenger/testing_messenger_cmd_join_room.c
@@ -23,10 +23,10 @@
  * @brief cmd to join a room in a messenger service.
  * @author Tobias Frisch
  */
-
+#include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_core_testing_lib.h"
-#include "gnunet_transport_testing_ng_lib.h"
+#include "gnunet_testing_core_lib.h"
+#include "gnunet_testing_transport_lib.h"
 #include "gnunet_messenger_service.h"
 #include "messenger-testing-cmds.h"
 
@@ -177,6 +177,5 @@ GNUNET_MESSENGER_cmd_join_room (const char *label,
                                      label,
                                      &join_room_run,
                                      &join_room_cleanup,
-                                     NULL,
                                      NULL);
 }
diff --git a/src/service/messenger/messenger_api_cmd_start_service.c b/src/service/messenger/testing_messenger_cmd_start_service.c
index 49e20eac4..eba3e1e4f 100644
--- a/src/service/messenger/messenger_api_cmd_start_service.c
+++ b/src/service/messenger/testing_messenger_cmd_start_service.c
@@ -23,11 +23,10 @@
  * @brief cmd to start a messenger service.
  * @author Tobias Frisch
  */
-
+#include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_netjail_lib.h"
-#include "gnunet_transport_testing_ng_lib.h"
+#include "gnunet_testing_lib.h"
+#include "gnunet_testing_transport_lib.h"
 #include "gnunet_messenger_service.h"
 #include "messenger-testing-cmds.h"
 
@@ -58,7 +57,8 @@ on_message_cb (void *cls,
     return;
 
   if (GNUNET_OK != GNUNET_CONTAINER_multipeermap_put (rs->doors,
-                                                      &(message->body.peer.peer),
+                                                      &(message->body.peer.peer)
+                                                      ,
                                                       NULL,
                                                       GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE))
   {
@@ -167,6 +167,5 @@ GNUNET_MESSENGER_cmd_start_service (const char *label,
                                      label,
                                      &start_service_run,
                                      &start_service_cleanup,
-                                     &start_service_traits,
-                                     NULL);
+                                     &start_service_traits);
 }
diff --git a/src/service/messenger/messenger_api_cmd_stop_service.c b/src/service/messenger/testing_messenger_cmd_stop_service.c
index 774237d25..e6b79d395 100644
--- a/src/service/messenger/messenger_api_cmd_stop_service.c
+++ b/src/service/messenger/testing_messenger_cmd_stop_service.c
@@ -25,7 +25,7 @@
  */
 
 #include "gnunet_util_lib.h"
-#include "gnunet_testing_ng_lib.h"
+#include "gnunet_testing_lib.h"
 #include "gnunet_messenger_service.h"
 #include "messenger-testing-cmds.h"
 
@@ -91,6 +91,5 @@ GNUNET_MESSENGER_cmd_stop_service (const char *label,
                                      label,
                                      &stop_service_run,
                                      &stop_service_cleanup,
-                                     NULL,
                                      NULL);
 }
diff --git a/src/service/messenger/messenger_api_traits.c b/src/service/messenger/testing_messenger_traits.c
index b6affc90d..b6affc90d 100644
--- a/src/service/messenger/messenger_api_traits.c
+++ b/src/service/messenger/testing_messenger_traits.c
diff --git a/src/service/namecache/Makefile.am b/src/service/namecache/Makefile.am
index 78e9eb48c..7a8305491 100644
--- a/src/service/namecache/Makefile.am
+++ b/src/service/namecache/Makefile.am
@@ -20,8 +20,8 @@ TESTING_TESTS = \
  test_namecache_api_cache_block
 
 if HAVE_SQLITE
-check_PROGRAMS = \
- $(TESTING_TESTS)
+#check_PROGRAMS = \
+# $(TESTING_TESTS)
 endif
 
 if ENABLE_TEST_RUN
diff --git a/src/service/namestore/Makefile.am b/src/service/namestore/Makefile.am
index 514c8bec6..68ba883ee 100644
--- a/src/service/namestore/Makefile.am
+++ b/src/service/namestore/Makefile.am
@@ -87,9 +87,9 @@ POSTGRES_TESTS += test_namestore_api_edit_records_postgres
 endif
 endif
 
-check_PROGRAMS = \
- $(SQLITE_TESTS) \
- $(POSTGRES_TESTS)
+#check_PROGRAMS = \
+# $(SQLITE_TESTS) \
+# $(POSTGRES_TESTS)
 
 if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
@@ -381,4 +381,3 @@ EXTRA_DIST = \
   test_namestore_api_sqlite.conf \
   perf_namestore_api_postgres.conf \
   perf_namestore_api_sqlite.conf
-
diff --git a/src/service/namestore/gnunet-service-namestore.c b/src/service/namestore/gnunet-service-namestore.c
index 448a9d2b3..6f3a77b84 100644
--- a/src/service/namestore/gnunet-service-namestore.c
+++ b/src/service/namestore/gnunet-service-namestore.c
@@ -1091,7 +1091,7 @@ struct RecordLookupContext
   /**
    * The editor hint for set
    */
-  const char *editor_hint;
+  char *editor_hint;
 
   /**
    * The record result.
diff --git a/src/service/namestore/meson.build b/src/service/namestore/meson.build
index ba4110729..9e6678deb 100644
--- a/src/service/namestore/meson.build
+++ b/src/service/namestore/meson.build
@@ -53,6 +53,8 @@ configure_file(copy: true,
                input: 'test_namestore_api_postgres.conf',
                output: 'test_namestore_api_postgres.conf')
 
+if false
+
 namestoreapitestnames = [
   'test_namestore_api_lookup_nick',
   'test_namestore_api_monitoring',
@@ -100,4 +102,6 @@ foreach tn : namestoreapitestnames
   endif
 endforeach
 
+endif
+
 # FIXME perf tests missing
diff --git a/src/service/nat/gnunet-service-nat.c b/src/service/nat/gnunet-service-nat.c
index 00584ab8a..a36e8da1c 100644
--- a/src/service/nat/gnunet-service-nat.c
+++ b/src/service/nat/gnunet-service-nat.c
@@ -1816,10 +1816,9 @@ check_request_connection_reversal (void *cls,
  * @param message the message received
  */
 static void
-handle_request_connection_reversal (void *cls,
-                                    const struct
-                                    GNUNET_NAT_RequestConnectionReversalMessage
-                                    *message)
+handle_request_connection_reversal (
+  void *cls,
+  const struct GNUNET_NAT_RequestConnectionReversalMessage *message)
 {
   struct ClientHandle *ch = cls;
   const char *buf = (const char *) &message[1];
@@ -1871,47 +1870,29 @@ handle_request_connection_reversal (void *cls,
  * @param message the message received
  * @return #GNUNET_OK if message is well-formed
  */
-static int
-check_add_global_address(void *cls,
-                         const struct GNUNET_NAT_AddGlobalAddressMessage *message)
+static enum GNUNET_GenericReturnValue
+check_add_global_address (
+  void *cls,
+  const struct GNUNET_NAT_AddGlobalAddressMessage *message)
 {
-  char *addr = GNUNET_malloc (ntohs (message->address_length));
+  const char *buf = (const char *) &message[1];
+  uint16_t blen = ntohs (message->address_length);
   size_t left = ntohs (message->header.size) - sizeof(*message);
 
-  GNUNET_memcpy (addr, (const char *) &message[1], ntohs (message->address_length));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "message size %u natting address %s length %u left %u\n",
-              ntohs (message->header.size),
-              addr,
-              ntohs (message->address_length),
-              left);
-
   if (left != ntohs (message->address_length))
   {
-    GNUNET_break (0);
+    GNUNET_break_op (0);
+    return GNUNET_SYSERR;
+  }
+  if ('\0' != buf[blen - 1])
+  {
+    GNUNET_break_op (0);
     return GNUNET_SYSERR;
   }
-  GNUNET_free (addr);
   return GNUNET_OK;
 }
 
 
-static int
-is_nat_v4 (const struct in_addr *ip);
-
-
-static int
-is_nat_v6 (const struct in6_addr *ip);
-
-
-static void
-notify_client (enum GNUNET_NAT_AddressClass ac,
-               struct ClientHandle *ch,
-               int add,
-               const void *addr,
-               size_t addr_len);
-
-
 /**
  * Handle #GNUNET_MESSAGE_TYPE_NAT_ADD_GLOBAL_ADDRESS message from
  * client.
@@ -1920,72 +1901,29 @@ notify_client (enum GNUNET_NAT_AddressClass ac,
  * @param message the message received
  */
 static void
-handle_add_global_address(void *cls,
-                         const struct GNUNET_NAT_AddGlobalAddressMessage *message)
+handle_add_global_address (
+  void *cls,
+  const struct GNUNET_NAT_AddGlobalAddressMessage *message)
 {
   struct ClientHandle *ch = cls;
-  char *buf = GNUNET_malloc (ntohs (message->address_length));
-  //= (const char *) &message[1];
-  struct sockaddr *sockaddr = NULL;
-  socklen_t addr_len;
-  struct sockaddr_in *sockaddr_ipv4 = GNUNET_malloc(sizeof(struct sockaddr_in));
-  enum GNUNET_NAT_AddressClass ac;
-
-  GNUNET_memcpy (buf, (const char *) &message[1], ntohs (message->address_length));
-  memset(sockaddr_ipv4, 0, sizeof(struct sockaddr_in));
-  sockaddr_ipv4->sin_family = AF_INET;
-
-  if (1 == inet_pton(AF_INET, buf, &(sockaddr_ipv4->sin_addr)))
-  {
-    sockaddr = (struct sockaddr *)sockaddr_ipv4;
-    addr_len = sizeof(struct sockaddr_in);
-    ac = is_nat_v4 (&((const struct sockaddr_in *)sockaddr_ipv4)->sin_addr)
-         ? GNUNET_NAT_AC_LAN
-          : GNUNET_NAT_AC_EXTERN;
-  }
-  else
-  {
-    GNUNET_free(sockaddr_ipv4);
-    sockaddr_ipv4 = NULL;
-  }
-
-  if (NULL == sockaddr)
-  {
-    struct sockaddr_in6 *sockaddr_ipv6 = malloc(sizeof(struct sockaddr_in6));
-
-    if (sockaddr_ipv6 != NULL)
-    {
-      memset(sockaddr_ipv6, 0, sizeof(struct sockaddr_in6));
-      sockaddr_ipv6->sin6_family = AF_INET6;
-
-      if (1 == inet_pton(AF_INET6, buf, &(sockaddr_ipv6->sin6_addr)))
-      {
-        GNUNET_break (0);
-        GNUNET_SERVICE_client_continue (ch->client);
-        GNUNET_free (buf);
-        return;
-      }
-      else
-      {
-        GNUNET_free(sockaddr_ipv6);
-        sockaddr_ipv6 = NULL;
-      }
-    }
-  }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "3 natting address %s\n",
-              buf);
-  if (NULL == sockaddr)
+  const char *buf = (const char *) &message[1];
+  uint16_t blen = ntohs (message->address_length);
+  struct sockaddr_in sockaddr_ipv4 = {
+    .sin_family = AF_INET
+  };
+
+  GNUNET_assert ('\0' == buf[blen - 1]);
+  if (1 != inet_pton (AF_INET,
+                      buf,
+                      &sockaddr_ipv4.sin_addr))
   {
     GNUNET_break (0);
     GNUNET_SERVICE_client_continue (ch->client);
-    GNUNET_free (buf);
     return;
   }
-  notify_clients_stun_change (sockaddr_ipv4, GNUNET_YES);
+  notify_clients_stun_change (&sockaddr_ipv4,
+                              GNUNET_YES);
   GNUNET_SERVICE_client_continue (ch->client);
-  GNUNET_free (buf);
 }
 
 
diff --git a/src/service/nat/nat_api.c b/src/service/nat/nat_api.c
index 219a11e81..52c74d5db 100644
--- a/src/service/nat/nat_api.c
+++ b/src/service/nat/nat_api.c
@@ -455,31 +455,6 @@ GNUNET_NAT_register (const struct GNUNET_CONFIGURATION_Handle *cfg,
   return nh;
 }
 
-
-/**
- * Get the IP address without the port number.
- *
- * @param address The string contains a communicator prefix, IP address and port
- *        like this 'tcp-92.68.150.1:55452'.
- * @return String with prefix and IP address only.
- */
-static char *
-get_address_without_port (const char *address)
-{
-  const char *colon;
-  char *colon_rest;
-  size_t colon_rest_length;
-  char *address_without_port;
-
-  colon = strchr (address,':');
-  colon_rest = GNUNET_strndup (address, colon - address);
-  colon_rest_length = strlen (colon_rest);
-  address_without_port = GNUNET_strndup (&colon_rest[4], colon_rest_length - 4);
-  GNUNET_free (colon_rest);
-
-  return address_without_port;
-}
-
 void
 GNUNET_NAT_add_global_address (struct GNUNET_NAT_Handle *nh,
                                char *addr,
diff --git a/src/service/nse/Makefile.am b/src/service/nse/Makefile.am
index 40690e81c..99c8c3e5a 100644
--- a/src/service/nse/Makefile.am
+++ b/src/service/nse/Makefile.am
@@ -49,9 +49,9 @@ if HAVE_BENCHMARKS
 endif
 
 check_PROGRAMS = \
- test_nse_api \
- perf_kdf \
- $(MULTIPEER_TEST)
+  perf_kdf
+# test_nse_api \
+# $(MULTIPEER_TEST)
 
 if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
diff --git a/src/service/peerstore/Makefile.am b/src/service/peerstore/Makefile.am
index 1f6385bb7..3cdb01912 100644
--- a/src/service/peerstore/Makefile.am
+++ b/src/service/peerstore/Makefile.am
@@ -41,11 +41,11 @@ libgnunetpeerstore_la_LDFLAGS = \
   $(GN_LIBINTL) \
   $(GN_LIB_LDFLAGS)
 
-check_PROGRAMS = \
- test_peerstore_api_store \
- test_peerstore_api_iterate \
- test_peerstore_api_watch \
- perf_peerstore_store
+#check_PROGRAMS = \
+# test_peerstore_api_store \
+# test_peerstore_api_iterate \
+# test_peerstore_api_watch \
+# perf_peerstore_store
 
 EXTRA_DIST = \
  test_peerstore_api_data.conf
diff --git a/src/service/peerstore/gnunet-service-peerstore.c b/src/service/peerstore/gnunet-service-peerstore.c
index 5d0f037a1..9f3eb9bde 100644
--- a/src/service/peerstore/gnunet-service-peerstore.c
+++ b/src/service/peerstore/gnunet-service-peerstore.c
@@ -23,9 +23,9 @@
  * @brief peerstore service implementation
  * @author Omar Tarabai
  */
+#include "platform.h"
 #include "gnunet_peerstore_service.h"
 #include "gnunet_protocols.h"
-#include "platform.h"
 #include "gnunet_util_lib.h"
 #include "peerstore.h"
 #include "gnunet_peerstore_plugin.h"
@@ -491,6 +491,16 @@ iterate_proc (void *cls,
   proc->limit--;
 }
 
+
+static void
+destroy_iteration (struct Iteration *ic)
+{
+  GNUNET_free (ic->key);
+  GNUNET_free (ic->sub_system);
+  GNUNET_free (ic);
+}
+
+
 /**
  * Function called once we are done with the iteration and
  * allow the zone iteration client to send us more messages.
@@ -512,15 +522,12 @@ iteration_done_client_continue (struct Iteration *ic)
   endmsg->rid = htons (ic->request_id);
   endmsg->result = htonl (GNUNET_OK);
   GNUNET_MQ_send (ic->pc->mq, env);
-  GNUNET_free (ic->key);
-  GNUNET_free (ic->sub_system);
   GNUNET_CONTAINER_DLL_remove (ic->pc->op_head, ic->pc->op_tail, ic);
-  GNUNET_free (ic);
+  destroy_iteration (ic);
   return;
 }
 
 
-
 /**
  * Perform the next round of the zone iteration.
  *
@@ -657,7 +664,7 @@ handle_iterate_stop (void *cls,
     return;
   }
   GNUNET_CONTAINER_DLL_remove (pc->op_head, pc->op_tail, ic);
-  GNUNET_free (ic);
+  destroy_iteration (ic);
   GNUNET_SERVICE_client_continue (pc->client);
 }
 
@@ -1098,7 +1105,7 @@ client_disconnect_cb (void *cls,
   while (NULL != (iter = pc->op_head))
   {
     GNUNET_CONTAINER_DLL_remove (pc->op_head, pc->op_tail, iter);
-    GNUNET_free (iter);
+    destroy_iteration (iter);
   }
   GNUNET_free (pc);
 }
diff --git a/src/service/peerstore/meson.build b/src/service/peerstore/meson.build
index 8f0950b93..2c1ef4a67 100644
--- a/src/service/peerstore/meson.build
+++ b/src/service/peerstore/meson.build
@@ -38,6 +38,8 @@ executable ('gnunet-service-peerstore',
             install: true,
             install_dir: get_option('libdir') / 'gnunet' / 'libexec')
 
+if false
+
 testpeerstore_api_iterate = executable ('test_peerstore_api_iterate',
             ['test_peerstore_api_iterate.c'],
             dependencies: [
@@ -90,6 +92,4 @@ test('test_peerstore_api_iterate', testpeerstore_api_iterate,
 test('perf_peerstore_api_store', testpeerstore_api_perf,
   suite: 'peerstore', workdir: meson.current_build_dir())
 
-
-
-
+endif
\ No newline at end of file
diff --git a/src/service/peerstore/peerstore_api.c b/src/service/peerstore/peerstore_api.c
index 898d58a2c..45f347b6a 100644
--- a/src/service/peerstore/peerstore_api.c
+++ b/src/service/peerstore/peerstore_api.c
@@ -23,11 +23,9 @@
  * @author Omar Tarabai
  * @author Christian Grothoff
  */
-#include "gnunet_time_lib.h"
 #include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_protocols.h"
 #include "gnunet_util_lib.h"
+#include "gnunet_protocols.h"
 #include "gnunet_hello_uri_lib.h"
 #include "peerstore.h"
 #include "peerstore_common.h"
@@ -455,7 +453,7 @@ GNUNET_PEERSTORE_disconnect (struct GNUNET_PEERSTORE_Handle *h)
 /******************************************************************************/
 
 static void
-destroy_storecontext(struct GNUNET_PEERSTORE_StoreContext *sc)
+destroy_storecontext (struct GNUNET_PEERSTORE_StoreContext *sc)
 {
   GNUNET_CONTAINER_DLL_remove (sc->h->store_head, sc->h->store_tail, sc);
   GNUNET_free (sc->sub_system);
@@ -464,6 +462,7 @@ destroy_storecontext(struct GNUNET_PEERSTORE_StoreContext *sc)
   GNUNET_free (sc);
 }
 
+
 /**
  * Cancel a store request
  *
@@ -475,7 +474,7 @@ GNUNET_PEERSTORE_store_cancel (struct GNUNET_PEERSTORE_StoreContext *sc)
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "store cancel with sc %p \n",
        sc);
-  destroy_storecontext(sc);
+  destroy_storecontext (sc);
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "store cancel with sc %p is null\n",
        sc);
@@ -591,7 +590,7 @@ handle_store_result (void *cls, const struct PeerstoreResultMessage *msg)
 /******************************************************************************/
 
 static void
-destroy_iteratecontext(struct GNUNET_PEERSTORE_IterateContext *ic)
+destroy_iteratecontext (struct GNUNET_PEERSTORE_IterateContext *ic)
 {
   GNUNET_CONTAINER_DLL_remove (ic->h->iterate_head, ic->h->iterate_tail, ic);
   GNUNET_free (ic->sub_system);
diff --git a/src/service/peerstore/peerstore_api_monitor.c b/src/service/peerstore/peerstore_api_monitor.c
index da5af3c86..2c527103c 100644
--- a/src/service/peerstore/peerstore_api_monitor.c
+++ b/src/service/peerstore/peerstore_api_monitor.c
@@ -22,10 +22,9 @@
  * @brief API for peerstore
  * @author Martin Schanzenbach
  */
-#include "gnunet_common.h"
-#include "gnunet_protocols.h"
 #include "platform.h"
 #include "gnunet_util_lib.h"
+#include "gnunet_protocols.h"
 #include "peerstore.h"
 #include "peerstore_common.h"
 #include "gnunet_peerstore_service.h"
@@ -85,7 +84,7 @@ struct GNUNET_PEERSTORE_Monitor
   /**
    * The sub system requested the watch.
    */
-  const char *sub_system;
+  char *sub_system;
 
   /**
    * Request ID
@@ -237,17 +236,18 @@ reconnect (struct GNUNET_PEERSTORE_Monitor *mc)
 
 
 struct GNUNET_PEERSTORE_Monitor *
-GNUNET_PEERSTORE_monitor_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                                int iterate_first,
-                                const char *sub_system,
-                                const struct GNUNET_PeerIdentity *peer,
-                                const char *key,
-                                GNUNET_SCHEDULER_TaskCallback error_cb,
-                                void *error_cb_cls,
-                                GNUNET_SCHEDULER_TaskCallback sync_cb,
-                                void *sync_cb_cls,
-                                GNUNET_PEERSTORE_Processor callback,
-                                void *callback_cls)
+GNUNET_PEERSTORE_monitor_start (
+  const struct GNUNET_CONFIGURATION_Handle *cfg,
+  int iterate_first,
+  const char *sub_system,
+  const struct GNUNET_PeerIdentity *peer,
+  const char *key,
+  GNUNET_SCHEDULER_TaskCallback error_cb,
+  void *error_cb_cls,
+  GNUNET_SCHEDULER_TaskCallback sync_cb,
+  void *sync_cb_cls,
+  GNUNET_PEERSTORE_Processor callback,
+  void *callback_cls)
 {
   struct GNUNET_PEERSTORE_Monitor *mc;
 
diff --git a/src/service/peerstore/peerstore_common.c b/src/service/peerstore/peerstore_common.c
index 435444917..a326392ea 100644
--- a/src/service/peerstore/peerstore_common.c
+++ b/src/service/peerstore/peerstore_common.c
@@ -22,7 +22,6 @@
  * @brief Helper peerstore functions
  * @author Omar Tarabai
  */
-
 #include "platform.h"
 #include "peerstore_common.h"
 
diff --git a/src/service/pt/Makefile.am b/src/service/pt/Makefile.am
index 7622f2c1a..e1bab6e18 100644
--- a/src/service/pt/Makefile.am
+++ b/src/service/pt/Makefile.am
@@ -37,7 +37,7 @@ if LINUX
  test_gns_vpn
 endif
 
-check_PROGRAMS = $(VPN_TEST)
+# check_PROGRAMS = $(VPN_TEST)
 
 if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
@@ -56,7 +56,7 @@ test_gns_vpn_LDADD = $(MHD_LIBS) @LIBCURL@ \
  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
  $(top_builddir)/src/service/identity/libgnunetidentity.la \
  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 test_gns_vpn_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
 
@@ -64,7 +64,7 @@ test_gnunet_vpn_4_over_SOURCES = \
  test_gnunet_vpn.c
 test_gnunet_vpn_4_over_LDADD = $(MHD_LIBS) @LIBCURL@ \
  $(top_builddir)/src/service/vpn/libgnunetvpn.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 test_gnunet_vpn_4_over_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
 
@@ -72,7 +72,7 @@ test_gnunet_vpn_6_over_SOURCES = \
  test_gnunet_vpn.c
 test_gnunet_vpn_6_over_LDADD = $(MHD_LIBS) @LIBCURL@ \
  $(top_builddir)/src/service/vpn/libgnunetvpn.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 test_gnunet_vpn_6_over_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
 
@@ -80,7 +80,7 @@ test_gnunet_vpn_4_to_6_SOURCES = \
  test_gnunet_vpn.c
 test_gnunet_vpn_4_to_6_LDADD = $(MHD_LIBS) @LIBCURL@ \
  $(top_builddir)/src/service/vpn/libgnunetvpn.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 test_gnunet_vpn_4_to_6_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
 
@@ -88,6 +88,6 @@ test_gnunet_vpn_6_to_4_SOURCES = \
  test_gnunet_vpn.c
 test_gnunet_vpn_6_to_4_LDADD = $(MHD_LIBS) @LIBCURL@ \
  $(top_builddir)/src/service/vpn/libgnunetvpn.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 test_gnunet_vpn_6_to_4_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
diff --git a/src/service/regex/Makefile.am b/src/service/regex/Makefile.am
index 0ce42880d..63c166a23 100644
--- a/src/service/regex/Makefile.am
+++ b/src/service/regex/Makefile.am
@@ -75,13 +75,13 @@ gnunet_daemon_regexprofiler_LDADD = -lm \
 gnunet_daemon_regexprofiler_LDFLAGS = \
   $(GN_LIBINTL)
 
-check_PROGRAMS = \
-  test_regex_integration \
-  test_regex_eval_api \
-  test_regex_iterate_api \
-  test_regex_proofs \
-  test_regex_graph_api \
-  test_regex_api
+#check_PROGRAMS = \
+#  test_regex_integration \
+#  test_regex_eval_api \
+#  test_regex_iterate_api \
+#  test_regex_proofs \
+#  test_regex_graph_api \
+#  test_regex_api
 
 if ENABLE_TEST_RUN
  AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
diff --git a/src/service/rest/oidc_helper.c b/src/service/rest/oidc_helper.c
index c0b2459f6..08c99dc8b 100644
--- a/src/service/rest/oidc_helper.c
+++ b/src/service/rest/oidc_helper.c
@@ -27,6 +27,8 @@
 #include <inttypes.h>
 #include <jansson.h>
 #include <jose/jose.h>
+#include "gnunet_gns_service.h"
+#include "gnunet_gnsrecord_lib.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_reclaim_lib.h"
 #include "gnunet_reclaim_service.h"
@@ -587,7 +589,8 @@ OIDC_build_authz_code (const struct GNUNET_CRYPTO_PrivateKey *issuer,
   /** PLAINTEXT **/
   // Assign ticket
   memset (&params, 0, sizeof(params));
-  params.ticket = *ticket;
+  memcpy (params.ticket.gns_name, ticket->gns_name, strlen (ticket->gns_name)
+          + 1);
   // Assign nonce
   payload_len = sizeof(struct OIDC_Parameters);
   if ((NULL != nonce_str) && (strcmp ("", nonce_str) != 0))
@@ -756,7 +759,7 @@ OIDC_parse_authz_code (const char *rp_uri,
                        struct GNUNET_RECLAIM_AttributeList **attrs,
                        struct GNUNET_RECLAIM_PresentationList **presentations,
                        char **nonce_str,
-                       enum OIDC_VerificationOptions opts)
+                       enum OIDC_VerificationOptions opts, char **emsg)
 {
   char *code_payload;
   char *ptr;
@@ -766,6 +769,7 @@ OIDC_parse_authz_code (const char *rp_uri,
   char *code_challenge;
   struct GNUNET_CRYPTO_EccSignaturePurpose *purpose;
   struct GNUNET_CRYPTO_Signature *signature;
+  struct GNUNET_CRYPTO_PublicKey iss;
   uint32_t code_challenge_len;
   uint32_t attrs_ser_len;
   uint32_t pres_ser_len;
@@ -774,6 +778,8 @@ OIDC_parse_authz_code (const char *rp_uri,
   uint32_t nonce_len = 0;
   struct OIDC_Parameters *params;
 
+
+  GNUNET_GNS_parse_ztld (ticket->gns_name, &iss);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Trying to decode `%s'\n", code);
   code_payload = NULL;
   code_payload_len =
@@ -807,6 +813,8 @@ OIDC_parse_authz_code (const char *rp_uri,
                                            code_challenge_len,
                                            code_verifier))
     {
+      GNUNET_asprintf (emsg, "Code verifier `%s' invalid for challenge `%s'",
+                       code_verifier, code_challenge);
       GNUNET_free (code_payload);
       return GNUNET_SYSERR;
     }
@@ -828,12 +836,13 @@ OIDC_parse_authz_code (const char *rp_uri,
         GNUNET_SIGNATURE_PURPOSE_RECLAIM_CODE_SIGN,
         purpose,
         signature,
-        cid))
+        &iss))
   {
     GNUNET_free (code_payload);
     if (NULL != *nonce_str)
       GNUNET_free (*nonce_str);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Signature of AuthZ code invalid!\n");
+    *emsg = GNUNET_strdup ("Signature verification failed");
     return GNUNET_SYSERR;
   }
   // Attributes
@@ -899,6 +908,7 @@ OIDC_access_token_new (const struct GNUNET_RECLAIM_Ticket *ticket,
                                 sizeof(*ticket),
                                 &tkt_b64);
   GNUNET_asprintf (&access_token, "%s-%s", tkt_b64, rp_uri);
+  GNUNET_free (tkt_b64);
   return access_token;
 }
 
diff --git a/src/service/rest/oidc_helper.h b/src/service/rest/oidc_helper.h
index 1732a044b..d706daa6b 100644
--- a/src/service/rest/oidc_helper.h
+++ b/src/service/rest/oidc_helper.h
@@ -138,7 +138,7 @@ OIDC_parse_authz_code (const char *rp_uri,
                        struct GNUNET_RECLAIM_AttributeList **attrs,
                        struct GNUNET_RECLAIM_PresentationList **presentations,
                        char **nonce,
-                       enum OIDC_VerificationOptions opts);
+                       enum OIDC_VerificationOptions opts, char **emsg);
 
 /**
  * Build a token response for a token request
diff --git a/src/service/rest/openid_plugin.c b/src/service/rest/openid_plugin.c
index cd3f975a4..fc1125690 100644
--- a/src/service/rest/openid_plugin.c
+++ b/src/service/rest/openid_plugin.c
@@ -2265,14 +2265,16 @@ token_endpoint (struct GNUNET_REST_RequestHandle *con_handle,
   }
 
   // decode code
+  char *emsg = NULL;
   if (GNUNET_OK != OIDC_parse_authz_code (received_cid, &cid, code,
                                           code_verifier,
                                           &ticket,
                                           &cl, &pl, &nonce,
-                                          OIDC_VERIFICATION_DEFAULT))
+                                          OIDC_VERIFICATION_DEFAULT,
+                                          &emsg))
   {
     handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_REQUEST);
-    handle->edesc = GNUNET_strdup ("invalid code");
+    handle->edesc = emsg;
     handle->response_code = MHD_HTTP_BAD_REQUEST;
     GNUNET_free (code);
     if (NULL != code_verifier)
@@ -2313,14 +2315,8 @@ token_endpoint (struct GNUNET_REST_RequestHandle *con_handle,
     jwa = JWT_ALG_VALUE_RSA;
   }
 
-  char *tmp = GNUNET_strdup (ticket.gns_name);
-  GNUNET_assert (NULL != strtok (tmp, "."));
-  char *key = strtok (NULL, ".");
   struct GNUNET_CRYPTO_PublicKey issuer;
-  GNUNET_assert (NULL != key);
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CRYPTO_public_key_from_string (key, &issuer));
-  GNUNET_free (tmp);
+  GNUNET_GNS_parse_ztld (ticket.gns_name, &issuer);
 
   if (! strcmp (jwa, JWT_ALG_VALUE_RSA))
   {
@@ -2394,7 +2390,7 @@ token_endpoint (struct GNUNET_REST_RequestHandle *con_handle,
 
   if (NULL != nonce)
     GNUNET_free (nonce);
-  access_token = OIDC_access_token_new (&ticket);
+  access_token = OIDC_access_token_new (&ticket, handle->oidc->redirect_uri);
   /**
    * Store mapping from access token to code so we can later
    * fall back on the provided attributes in userinfo one time.
@@ -2598,13 +2594,14 @@ consume_fail (void *cls)
                                  sizeof(struct GNUNET_CRYPTO_PublicKey));
 
   // decode code
+  char *emsg;
   if (GNUNET_OK != OIDC_parse_authz_code (received_cid, &cid,
                                           cached_code, NULL, &ticket,
                                           &cl, &pl, &nonce,
-                                          OIDC_VERIFICATION_NO_CODE_VERIFIER))
+                                          OIDC_VERIFICATION_NO_CODE_VERIFIER, &emsg))
   {
     handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_REQUEST);
-    handle->edesc = GNUNET_strdup ("invalid code");
+    handle->edesc = emsg;
     handle->response_code = MHD_HTTP_BAD_REQUEST;
     GNUNET_free (cached_code);
     if (NULL != nonce)
@@ -2700,8 +2697,9 @@ userinfo_endpoint (struct GNUNET_REST_RequestHandle *con_handle,
     return;
   }
 
+  char *rp_uri;
   if (GNUNET_OK != OIDC_access_token_parse (authorization_access_token,
-                                            &ticket))
+                                            &ticket, &rp_uri))
   {
     handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_TOKEN);
     handle->edesc = GNUNET_strdup ("The access token is invalid");
@@ -2727,9 +2725,11 @@ userinfo_endpoint (struct GNUNET_REST_RequestHandle *con_handle,
                                                              handle);
   handle->idp_op = GNUNET_RECLAIM_ticket_consume (idp,
                                                   &handle->ticket,
+                                                  rp_uri,
                                                   &consume_ticket,
                                                   handle);
   GNUNET_free (authorization);
+  GNUNET_free (rp_uri);
 }
 
 
diff --git a/src/service/rest/reclaim_plugin.c b/src/service/rest/reclaim_plugin.c
index ed86601d1..10b6b7bdc 100644
--- a/src/service/rest/reclaim_plugin.c
+++ b/src/service/rest/reclaim_plugin.c
@@ -24,8 +24,8 @@
  * @brief GNUnet reclaim REST plugin
  *
  */
-#include "gnunet_json_lib.h"
 #include "platform.h"
+#include "gnunet_json_lib.h"
 #include "microhttpd.h"
 #include <inttypes.h>
 #include <jansson.h>
@@ -1231,7 +1231,7 @@ consume_ticket_cont (struct GNUNET_REST_RequestHandle *con_handle,
   json_error_t err;
   struct GNUNET_JSON_Specification tktspec[] =
   { GNUNET_RECLAIM_JSON_spec_ticket (&ticket),
-    GNUNET_JSON_spec_string("rp_uri", &rp_uri),
+    GNUNET_JSON_spec_string ("rp_uri", &rp_uri),
     GNUNET_JSON_spec_end () };
 
   if (0 >= handle->rest_handle->data_size)
diff --git a/src/service/setu/gnunet-service-setu_strata_estimator.c b/src/service/setu/gnunet-service-setu_strata_estimator.c
index 43ccf3afd..e5af92980 100644
--- a/src/service/setu/gnunet-service-setu_strata_estimator.c
+++ b/src/service/setu/gnunet-service-setu_strata_estimator.c
@@ -331,6 +331,12 @@ strata_estimator_create (unsigned int strata_count,
                     "Failed to allocate memory for strata estimator\n");
         for (j = 0; j < i; j++)
           ibf_destroy (se->stratas[strata_ctr]->strata[i]);
+        for (j = 0; j <= strata_ctr; j++)
+        {
+          GNUNET_free (se->stratas[j]->strata);
+          GNUNET_free (se->stratas[j]);
+        }
+        GNUNET_free (se->stratas);
         GNUNET_free (se);
         return NULL;
       }
@@ -463,6 +469,8 @@ strata_estimator_destroy (struct MultiStrataEstimator *se)
     for (i = 0; i < se->stratas[strata_ctr]->strata_count; i++)
       ibf_destroy (se->stratas[strata_ctr]->strata[i]);
     GNUNET_free (se->stratas[strata_ctr]->strata);
+    GNUNET_free (se->stratas[strata_ctr]);
   }
+  GNUNET_free (se->stratas);
   GNUNET_free (se);
 }
diff --git a/src/service/testbed/.gitignore b/src/service/testbed/.gitignore
new file mode 100644
index 000000000..a5fa57a36
--- /dev/null
+++ b/src/service/testbed/.gitignore
@@ -0,0 +1 @@
+gnunet-testbed
diff --git a/src/service/testbed/Makefile.am b/src/service/testbed/Makefile.am
new file mode 100644
index 000000000..6ba64ffbc
--- /dev/null
+++ b/src/service/testbed/Makefile.am
@@ -0,0 +1,53 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+  XLIB = -lgcov
+endif
+
+libexecdir= $(pkglibdir)/libexec/
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+lib_LTLIBRARIES = \
+  libgnunettestbed.la \
+  libgnunettestingtestbed.la
+
+libgnunettestbed_la_SOURCES = \
+  testbed.c
+libgnunettestbed_la_LIBADD = \
+ $(top_builddir)/src/lib/util/libgnunetutil.la
+
+libgnunettestingtestbed_la_SOURCES = \
+  testbed_api_cmd_system_create.c \
+  testing_testbed_traits.c
+libgnunettestingtestbed_la_LIBADD = \
+  libgnunettestbed.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la
+
+
+bin_PROGRAMS = \
+ gnunet-testbed
+
+gnunet_testbed_SOURCES = \
+ gnunet-testbed.c
+gnunet_testbed_LDADD = \
+ libgnunettestbed.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
+ $(GN_LIBINTL)
+
+check_PROGRAMS = \
+ test_testbed_portreservation
+
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
+# TESTS = \
+#  test_testbed_portreservation
+
+test_testbed_portreservation_SOURCES = \
+ test_testbed_portreservation.c
+test_testbed_portreservation_LDADD = \
+ libgnunettestbed.la \
+ $(top_builddir)/src/lib/util/libgnunetutil.la
diff --git a/src/service/testbed/gnunet-testbed.c b/src/service/testbed/gnunet-testbed.c
new file mode 100644
index 000000000..59864085d
--- /dev/null
+++ b/src/service/testbed/gnunet-testbed.c
@@ -0,0 +1,230 @@
+/*
+     This file is part of GNUnet.
+     Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 GNUnet e.V.
+
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FORp A PARTICULAR PURPOSE.  See the GNU
+     Affero General Public License for more details.
+
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+/**
+ * @file testbed/gnunet-testbed.c
+ * @brief tool to use testing functionality from cmd line
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testbed_lib.h"
+
+
+#define LOG(kind, ...) GNUNET_log_from (kind, "gnunet-testbed", __VA_ARGS__)
+
+
+/**
+ * Final status code.
+ */
+static int ret;
+
+/**
+ * Number of config files to create.
+ */
+static unsigned int create_no;
+
+/**
+ * Filename of the config template to be written.
+ */
+static char *create_cfg_template;
+
+
+static int
+create_unique_cfgs (const char *template,
+                    const unsigned int no)
+{
+  struct GNUNET_TESTBED_System *system;
+  int fail;
+  char *cur_file;
+  struct GNUNET_CONFIGURATION_Handle *cfg_new;
+  struct GNUNET_CONFIGURATION_Handle *cfg_tmpl;
+
+  if (GNUNET_NO == GNUNET_DISK_file_test (template))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Configuration template `%s': file not found\n",
+                create_cfg_template);
+    return 1;
+  }
+  cfg_tmpl = GNUNET_CONFIGURATION_create ();
+
+  /* load template */
+  if ((create_cfg_template != NULL) &&
+      (GNUNET_OK !=
+       GNUNET_CONFIGURATION_load (cfg_tmpl,
+                                  create_cfg_template)))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Could not load template `%s'\n",
+                create_cfg_template);
+    GNUNET_CONFIGURATION_destroy (cfg_tmpl);
+
+    return 1;
+  }
+  /* load defaults */
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_load (cfg_tmpl,
+                                 NULL))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Could not load template `%s'\n",
+                create_cfg_template);
+    GNUNET_CONFIGURATION_destroy (cfg_tmpl);
+    return 1;
+  }
+
+  fail = GNUNET_NO;
+  system =
+    GNUNET_TESTBED_system_create ("testing",
+                                  NULL /* controller */,
+                                  NULL);
+  for (unsigned int cur = 0; cur < no; cur++)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Creating configuration no. %u \n",
+                cur);
+    if (create_cfg_template != NULL)
+      GNUNET_asprintf (&cur_file, "%04u-%s", cur, create_cfg_template);
+    else
+      GNUNET_asprintf (&cur_file, "%04u%s", cur, ".conf");
+
+    cfg_new = GNUNET_CONFIGURATION_dup (cfg_tmpl);
+    if (GNUNET_OK !=
+        GNUNET_TESTBED_configuration_create (system,
+                                             cfg_new,
+                                             NULL,
+                                             NULL))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Could not create another configuration\n");
+      GNUNET_CONFIGURATION_destroy (cfg_new);
+      fail = GNUNET_YES;
+      break;
+    }
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Writing configuration no. %u to file `%s' \n",
+                cur,
+                cur_file);
+    if (GNUNET_OK !=
+        GNUNET_CONFIGURATION_write (cfg_new,
+                                    cur_file))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Failed to write configuration no. %u \n",
+                  cur);
+      fail = GNUNET_YES;
+    }
+    GNUNET_CONFIGURATION_destroy (cfg_new);
+    GNUNET_free (cur_file);
+    if (GNUNET_YES == fail)
+      break;
+  }
+  GNUNET_CONFIGURATION_destroy (cfg_tmpl);
+  GNUNET_TESTBED_system_destroy (system,
+                                 false);
+  if (GNUNET_YES == fail)
+    return 1;
+  return 0;
+}
+
+
+/**
+ * Main function that will be running without scheduler.
+ *
+ * @param cls closure
+ * @param args remaining command-line arguments
+ * @param cfgfile name of the configuration file used (for saving, can be NULL!)
+ * @param cfg configuration
+ */
+static void
+run_no_scheduler (void *cls,
+                  char *const *args,
+                  const char *cfgfile,
+                  const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  if (create_no > 0)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Creating %u configuration files based on template `%s'\n",
+                create_no,
+                create_cfg_template);
+    ret = create_unique_cfgs (create_cfg_template,
+                              create_no);
+  }
+  else
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Missing arguments!\n");
+    ret = 1;
+  }
+}
+
+
+/**
+ * The main function.
+ *
+ * @param argc number of arguments from the command line
+ * @param argv command line arguments
+ * @return 0 ok, 1 on error
+ */
+int
+main (int argc, char *const *argv)
+{
+  struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_option_uint (
+      'n',
+      "number",
+      "NUMBER",
+      gettext_noop ("number of unique configuration files to create"),
+      &create_no),
+    GNUNET_GETOPT_option_string (
+      't',
+      "template",
+      "FILENAME",
+      gettext_noop ("configuration template"),
+      &create_cfg_template),
+    GNUNET_GETOPT_OPTION_END
+  };
+
+  if (GNUNET_OK !=
+      GNUNET_STRINGS_get_utf8_args (argc, argv,
+                                    &argc, &argv))
+    return 2;
+
+  ret =
+    (GNUNET_OK ==
+     GNUNET_PROGRAM_run2 (argc,
+                          argv,
+                          "gnunet-testing",
+                          gettext_noop (
+                            "Command line tool to access the testing library"),
+                          options,
+                          &run_no_scheduler,
+                          NULL,
+                          GNUNET_YES))
+    ? ret
+    : 1;
+  GNUNET_free_nz ((void *) argv);
+  return ret;
+}
+
+
+/* end of gnunet-testbed.c */
diff --git a/src/service/testing/test_testing_portreservation.c b/src/service/testbed/test_testbed_portreservation.c
index df3d8d523..90e0f9f57 100644
--- a/src/service/testing/test_testing_portreservation.c
+++ b/src/service/testbed/test_testbed_portreservation.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * @file testing/test_testing_new_portreservation.c
+ * @file testing/test_testbed_portreservation.c
  * @brief test case for testing port reservation routines from the new testing
  *          library API
  * @author Sree Harsha Totakura
@@ -27,10 +27,10 @@
 
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_testing_lib.h"
+#include "gnunet_testbed_lib.h"
 
 #define LOG(kind, ...) \
-  GNUNET_log (kind, __VA_ARGS__)
+        GNUNET_log (kind, __VA_ARGS__)
 
 /**
  * The status of the test
@@ -44,39 +44,39 @@ static void
 run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-  struct GNUNET_TESTING_System *system;
+  struct GNUNET_TESTBED_System *system;
   uint16_t new_port1;
   uint16_t new_port2;
   uint16_t old_port1;
 
-  system = GNUNET_TESTING_system_create ("/tmp/gnunet-testing-new",
-                                         "localhost", NULL, NULL);
+  system = GNUNET_TESTBED_system_create ("/tmp/gnunet-testing-new",
+                                         "localhost", NULL);
   GNUNET_assert (NULL != system);
-  new_port1 = GNUNET_TESTING_reserve_port (system);
+  new_port1 = GNUNET_TESTBED_reserve_port (system);
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Reserved TCP port %u\n", new_port1);
   if (0 == new_port1)
     goto end;
-  new_port2 = GNUNET_TESTING_reserve_port (system);
+  new_port2 = GNUNET_TESTBED_reserve_port (system);
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Reserved TCP port %u\n", new_port2);
   if (0 == new_port2)
     goto end;
   GNUNET_assert (new_port1 != new_port2);
-  GNUNET_TESTING_release_port (system, new_port1);
+  GNUNET_TESTBED_release_port (system, new_port1);
   old_port1 = new_port1;
   new_port1 = 0;
-  new_port1 = GNUNET_TESTING_reserve_port (system);
+  new_port1 = GNUNET_TESTBED_reserve_port (system);
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Reserved TCP port %u\n", new_port1);
   GNUNET_assert (0 != new_port1);
   GNUNET_assert (old_port1 == new_port1);
-  GNUNET_TESTING_release_port (system, new_port1);
-  GNUNET_TESTING_release_port (system, new_port2);
+  GNUNET_TESTBED_release_port (system, new_port1);
+  GNUNET_TESTBED_release_port (system, new_port2);
   status = GNUNET_OK;
 
 end:
-  GNUNET_TESTING_system_destroy (system, GNUNET_YES);
+  GNUNET_TESTBED_system_destroy (system, GNUNET_YES);
 }
 
 
@@ -91,9 +91,9 @@ main (int argc, char *argv[])
   if (GNUNET_OK !=
       GNUNET_PROGRAM_run (argc,
                           argv,
-                          "test_testing_new_portreservation",
+                          "test_testbed_new_portreservation",
                           "test case for testing port reservation routines"
-                          " from the new testing library API",
+                          " from the new testeb library API",
                           options,
                           &run,
                           NULL))
@@ -102,4 +102,4 @@ main (int argc, char *argv[])
 }
 
 
-/* end of test_testing_portreservation.c */
+/* end of test_testbed_portreservation.c */
diff --git a/src/service/testbed/testbed.c b/src/service/testbed/testbed.c
new file mode 100644
index 000000000..395907cae
--- /dev/null
+++ b/src/service/testbed/testbed.c
@@ -0,0 +1,579 @@
+/*
+      This file is part of GNUnet
+      Copyright (C) 2008, 2009, 2012 GNUnet e.V.
+
+      GNUnet is free software: you can redistribute it and/or modify it
+      under the terms of the GNU Affero General Public License as published
+      by the Free Software Foundation, either version 3 of the License,
+      or (at your option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Affero General Public License for more details.
+
+      You should have received a copy of the GNU Affero General Public License
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+/**
+ * @file testbed.c
+ * @brief
+ * @author Christian Grothoff
+ *
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testbed_lib.h"
+
+#define LOG(kind, ...) GNUNET_log_from (kind, "testing-api", __VA_ARGS__)
+
+/**
+ * Lowest port used for GNUnet testing.  Should be high enough to not
+ * conflict with other applications running on the hosts but be low
+ * enough to not conflict with client-ports (typically starting around
+ * 32k).
+ */
+#define LOW_PORT 12000
+
+/**
+ * Highest port used for GNUnet testing.  Should be low enough to not
+ * conflict with the port range for "local" ports (client apps; see
+ * /proc/sys/net/ipv4/ip_local_port_range on Linux for example).
+ */
+#define HIGH_PORT 56000
+
+
+/**
+ * Handle for a system on which GNUnet peers are executed;
+ * a system is used for reserving unique paths and ports.
+ */
+struct GNUNET_TESTBED_System
+{
+  /**
+   * Prefix (e.g. "/tmp/gnunet-testing/") we prepend to each
+   * GNUNET_HOME.
+   */
+  char *tmppath;
+
+  /**
+   * The trusted ip. Can either be a single ip address or a network address in
+   * CIDR notation.
+   */
+  char *trusted_ip;
+
+  /**
+   * our hostname
+   */
+  char *hostname;
+
+  /**
+   * Bitmap where each port that has already been reserved for some GNUnet peer
+   * is recorded.  Note that we make no distinction between TCP and UDP ports
+   * and test if a port is already in use before assigning it to a peer/service.
+   * If we detect that a port is already in use, we also mark it in this bitmap.
+   * So all the bits that are zero merely indicate ports that MIGHT be available
+   * for peers.
+   */
+  uint32_t reserved_ports[65536 / 32];
+
+  /**
+   * Counter we use to make service home paths unique on this system;
+   * the full path consists of the tmppath and this number.  Each
+   * UNIXPATH for a peer is also modified to include the respective
+   * path counter to ensure uniqueness.  This field is incremented
+   * by one for each configured peer.  Even if peers are destroyed,
+   * we never re-use path counters.
+   */
+  uint32_t path_counter;
+
+  /**
+   * Lowest port we are allowed to use.
+   */
+  uint16_t lowport;
+
+  /**
+   * Highest port we are allowed to use.
+   */
+  uint16_t highport;
+};
+
+
+struct GNUNET_TESTBED_System *
+GNUNET_TESTBED_system_create_with_portrange (
+  const char *testdir,
+  const char *trusted_ip,
+  const char *hostname,
+  uint16_t lowport,
+  uint16_t highport)
+{
+  struct GNUNET_TESTBED_System *system;
+
+  GNUNET_assert (NULL != testdir);
+  system = GNUNET_new (struct GNUNET_TESTBED_System);
+  if (NULL == (system->tmppath = getenv (GNUNET_TESTBED_PREFIX)))
+    system->tmppath = GNUNET_DISK_mkdtemp (testdir);
+  else
+    system->tmppath = GNUNET_strdup (system->tmppath);
+  system->lowport = lowport;
+  system->highport = highport;
+  if (NULL == system->tmppath)
+  {
+    GNUNET_free (system);
+    return NULL;
+  }
+  if (NULL != trusted_ip)
+    system->trusted_ip = GNUNET_strdup (trusted_ip);
+  if (NULL != hostname)
+    system->hostname = GNUNET_strdup (hostname);
+  return system;
+}
+
+
+struct GNUNET_TESTBED_System *
+GNUNET_TESTBED_system_create (
+  const char *testdir,
+  const char *trusted_ip,
+  const char *hostname)
+{
+  return GNUNET_TESTBED_system_create_with_portrange (testdir,
+                                                      trusted_ip,
+                                                      hostname,
+                                                      LOW_PORT,
+                                                      HIGH_PORT);
+}
+
+
+void
+GNUNET_TESTBED_system_destroy (struct GNUNET_TESTBED_System *system,
+                               bool remove_paths)
+{
+  if (remove_paths)
+    GNUNET_DISK_directory_remove (system->tmppath);
+  GNUNET_free (system->tmppath);
+  GNUNET_free (system->trusted_ip);
+  GNUNET_free (system->hostname);
+  GNUNET_free (system);
+}
+
+
+uint16_t
+GNUNET_TESTBED_reserve_port (struct GNUNET_TESTBED_System *system)
+{
+  struct GNUNET_NETWORK_Handle *socket;
+  struct addrinfo hint;
+  struct addrinfo *ret;
+  struct addrinfo *ai;
+  uint32_t *port_buckets;
+  char *open_port_str;
+  int bind_status;
+  uint32_t xor_image;
+  uint16_t index;
+  uint16_t open_port;
+  uint16_t pos;
+
+  /*
+     FIXME: Instead of using getaddrinfo we should try to determine the port
+         status by the following heurestics.
+
+         On systems which support both IPv4 and IPv6, only ports open on both
+         address families are considered open.
+         On system with either IPv4 or IPv6. A port is considered open if it's
+         open in the respective address family
+   */hint.ai_family = AF_UNSPEC; /* IPv4 and IPv6 */
+  hint.ai_socktype = 0;
+  hint.ai_protocol = 0;
+  hint.ai_addrlen = 0;
+  hint.ai_addr = NULL;
+  hint.ai_canonname = NULL;
+  hint.ai_next = NULL;
+  hint.ai_flags = AI_PASSIVE | AI_NUMERICSERV; /* Wild card address */
+  port_buckets = system->reserved_ports;
+  for (index = (system->lowport / 32) + 1; index < (system->highport / 32);
+       index++)
+  {
+    xor_image = (UINT32_MAX ^ port_buckets[index]);
+    if (0 == xor_image)   /* Ports in the bucket are full */
+      continue;
+    pos = system->lowport % 32;
+    while (pos < 32)
+    {
+      if (0 == ((xor_image >> pos) & 1U))
+      {
+        pos++;
+        continue;
+      }
+      open_port = (index * 32) + pos;
+      if (open_port >= system->highport)
+        return 0;
+      GNUNET_asprintf (&open_port_str, "%u", (unsigned int) open_port);
+      ret = NULL;
+      GNUNET_assert (0 == getaddrinfo (NULL, open_port_str, &hint, &ret));
+      GNUNET_free (open_port_str);
+      bind_status = GNUNET_NO;
+      for (ai = ret; NULL != ai; ai = ai->ai_next)
+      {
+        socket = GNUNET_NETWORK_socket_create (ai->ai_family, SOCK_STREAM, 0);
+        if (NULL == socket)
+          continue;
+        bind_status =
+          GNUNET_NETWORK_socket_bind (socket, ai->ai_addr, ai->ai_addrlen);
+        GNUNET_NETWORK_socket_close (socket);
+        if (GNUNET_OK != bind_status)
+          break;
+        socket = GNUNET_NETWORK_socket_create (ai->ai_family, SOCK_DGRAM, 0);
+        if (NULL == socket)
+          continue;
+        bind_status =
+          GNUNET_NETWORK_socket_bind (socket, ai->ai_addr, ai->ai_addrlen);
+        GNUNET_NETWORK_socket_close (socket);
+        if (GNUNET_OK != bind_status)
+          break;
+      }
+      port_buckets[index] |= (1U << pos);     /* Set the port bit */
+      freeaddrinfo (ret);
+      if (GNUNET_OK == bind_status)
+      {
+        LOG (GNUNET_ERROR_TYPE_DEBUG,
+             "Found a free port %u\n",
+             (unsigned int) open_port);
+        return open_port;
+      }
+      pos++;
+    }
+  }
+  return 0;
+}
+
+
+void
+GNUNET_TESTBED_release_port (struct GNUNET_TESTBED_System *system,
+                             uint16_t port)
+{
+  uint32_t *port_buckets;
+  uint16_t bucket;
+  uint16_t pos;
+
+  port_buckets = system->reserved_ports;
+  bucket = port / 32;
+  pos = port % 32;
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Releasing port %u\n", port);
+  if (0 == (port_buckets[bucket] & (1U << pos)))
+  {
+    GNUNET_break (0);  /* Port was not reserved by us using reserve_port() */
+    return;
+  }
+  port_buckets[bucket] &= ~(1U << pos);
+}
+
+
+/**
+ * Structure for holding data to build new configurations from a configuration
+ * template
+ */
+struct UpdateContext
+{
+  /**
+   * The system for which we are building configurations
+   */
+  struct GNUNET_TESTBED_System *system;
+
+  /**
+   * The configuration we are building
+   */
+  struct GNUNET_CONFIGURATION_Handle *cfg;
+
+  /**
+   * The customized service home path for this peer
+   */
+  char *gnunet_home;
+
+  /**
+   * Array of ports currently allocated to this peer.  These ports will be
+   * released upon peer destroy and can be used by other peers which are
+   * configured after.
+   */
+  uint16_t *ports;
+
+  /**
+   * The number of ports in the above array
+   */
+  unsigned int nports;
+
+  /**
+   * build status - to signal error while building a configuration
+   */
+  int status;
+};
+
+
+/**
+ * Function to iterate over options.  Copies
+ * the options to the target configuration,
+ * updating PORT values as needed.
+ *
+ * @param cls the UpdateContext
+ * @param section name of the section
+ * @param option name of the option
+ * @param value value of the option
+ */
+static void
+update_config (void *cls,
+               const char *section,
+               const char *option,
+               const char *value)
+{
+  struct UpdateContext *uc = cls;
+  unsigned int ival;
+  char cval[12];
+  char uval[PATH_MAX];
+  char *single_variable;
+  char *per_host_variable;
+  unsigned long long num_per_host;
+  uint16_t new_port;
+
+  if (GNUNET_OK != uc->status)
+    return;
+  if (! ((0 == strcmp (option, "PORT")) || (0 == strcmp (option, "UNIXPATH")) ||
+         (0 == strcmp (option, "HOSTNAME"))))
+    return;
+  GNUNET_asprintf (&single_variable, "single_%s_per_host", section);
+  GNUNET_asprintf (&per_host_variable, "num_%s_per_host", section);
+  if ((0 == strcmp (option, "PORT")) && (1 == sscanf (value, "%u", &ival)))
+  {
+    if ((ival != 0) &&
+        (GNUNET_YES != GNUNET_CONFIGURATION_get_value_yesno (uc->cfg,
+                                                             "testing",
+                                                             single_variable)))
+    {
+      new_port = GNUNET_TESTBED_reserve_port (uc->system);
+      if (0 == new_port)
+      {
+        uc->status = GNUNET_SYSERR;
+        GNUNET_free (single_variable);
+        GNUNET_free (per_host_variable);
+        return;
+      }
+      GNUNET_snprintf (cval, sizeof(cval), "%u", new_port);
+      value = cval;
+      GNUNET_array_append (uc->ports, uc->nports, new_port);
+    }
+    else if ((ival != 0) &&
+             (GNUNET_YES ==
+              GNUNET_CONFIGURATION_get_value_yesno (uc->cfg,
+                                                    "testing",
+                                                    single_variable)) &&
+             GNUNET_CONFIGURATION_get_value_number (uc->cfg,
+                                                    "testing",
+                                                    per_host_variable,
+                                                    &num_per_host))
+    {
+      /* GNUNET_snprintf (cval, sizeof (cval), "%u", */
+      /*                  ival + ctx->fdnum % num_per_host); */
+      /* value = cval; */
+      GNUNET_break (0);    /* FIXME */
+    }
+  }
+  if (0 == strcmp (option, "UNIXPATH"))
+  {
+    if (GNUNET_YES != GNUNET_CONFIGURATION_get_value_yesno (uc->cfg,
+                                                            "testing",
+                                                            single_variable))
+    {
+      GNUNET_snprintf (uval,
+                       sizeof(uval),
+                       "%s/%s.sock",
+                       uc->gnunet_home,
+                       section);
+      value = uval;
+    }
+    else if ((GNUNET_YES ==
+              GNUNET_CONFIGURATION_get_value_number (uc->cfg,
+                                                     "testing",
+                                                     per_host_variable,
+                                                     &num_per_host)) &&
+             (num_per_host > 0))
+    {
+      GNUNET_break (0);    /* FIXME */
+    }
+  }
+  if (0 == strcmp (option, "HOSTNAME"))
+  {
+    value = (NULL == uc->system->hostname) ? "localhost" : uc->system->hostname;
+  }
+  GNUNET_free (single_variable);
+  GNUNET_free (per_host_variable);
+  GNUNET_CONFIGURATION_set_value_string (uc->cfg, section, option, value);
+}
+
+
+/**
+ * Section iterator to set ACCEPT_FROM/ACCEPT_FROM6 to include the address of
+ * 'trusted_hosts' in all sections
+ *
+ * @param cls the UpdateContext
+ * @param section name of the section
+ */
+static void
+update_config_sections (void *cls,
+                        const char *section)
+{
+  struct UpdateContext *uc = cls;
+  char **ikeys;
+  char *val;
+  char *ptr;
+  char *orig_allowed_hosts;
+  char *allowed_hosts;
+  char *ACCEPT_FROM_key;
+  uint16_t ikeys_cnt;
+  uint16_t key;
+
+  ikeys_cnt = 0;
+  val = NULL;
+  /* Ignore certain options from sections.  See
+     https://gnunet.org/bugs/view.php?id=2476 */
+  if (GNUNET_YES ==
+      GNUNET_CONFIGURATION_have_value (uc->cfg,
+                                       section,
+                                       "TESTBED_IGNORE_KEYS"))
+  {
+    GNUNET_assert (GNUNET_YES ==
+                   GNUNET_CONFIGURATION_get_value_string (uc->cfg,
+                                                          section,
+                                                          "TESTBED_IGNORE_KEYS",
+                                                          &val));
+    ptr = val;
+    for (ikeys_cnt = 0; NULL != (ptr = strstr (ptr, ";")); ikeys_cnt++)
+      ptr++;
+    if (0 == ikeys_cnt)
+      GNUNET_break (0);
+    else
+    {
+      ikeys = GNUNET_malloc ((sizeof(char *)) * ikeys_cnt);
+      ptr = val;
+      for (key = 0; key < ikeys_cnt; key++)
+      {
+        ikeys[key] = ptr;
+        ptr = strstr (ptr, ";");
+        GNUNET_assert (NULL != ptr);      /* worked just before... */
+        *ptr = '\0';
+        ptr++;
+      }
+    }
+  }
+  if (0 != ikeys_cnt)
+  {
+    for (key = 0; key < ikeys_cnt; key++)
+    {
+      if (NULL != strstr (ikeys[key], "ADVERTISED_PORT"))
+        break;
+    }
+    if ((key == ikeys_cnt) &&
+        (GNUNET_YES ==
+         GNUNET_CONFIGURATION_have_value (uc->cfg,
+                                          section,
+                                          "ADVERTISED_PORT")))
+    {
+      if (GNUNET_OK ==
+          GNUNET_CONFIGURATION_get_value_string (uc->cfg,
+                                                 section,
+                                                 "PORT",
+                                                 &ptr))
+      {
+        GNUNET_CONFIGURATION_set_value_string (uc->cfg,
+                                               section,
+                                               "ADVERTISED_PORT",
+                                               ptr);
+        GNUNET_free (ptr);
+      }
+    }
+    for (key = 0; key < ikeys_cnt; key++)
+    {
+      if (NULL != strstr (ikeys[key], "ACCEPT_FROM"))
+      {
+        GNUNET_free (ikeys);
+        GNUNET_free (val);
+        return;
+      }
+    }
+    GNUNET_free (ikeys);
+  }
+  GNUNET_free (val);
+  ACCEPT_FROM_key = "ACCEPT_FROM";
+  if ((NULL != uc->system->trusted_ip) &&
+      (NULL != strstr (uc->system->trusted_ip, ":"))) /* IPv6 in use */
+    ACCEPT_FROM_key = "ACCEPT_FROM6";
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (uc->cfg,
+                                                          section,
+                                                          ACCEPT_FROM_key,
+                                                          &orig_allowed_hosts))
+  {
+    orig_allowed_hosts = GNUNET_strdup ("127.0.0.1;");
+  }
+  if (NULL == uc->system->trusted_ip)
+    allowed_hosts = GNUNET_strdup (orig_allowed_hosts);
+  else
+    GNUNET_asprintf (&allowed_hosts,
+                     "%s%s;",
+                     orig_allowed_hosts,
+                     uc->system->trusted_ip);
+  GNUNET_free (orig_allowed_hosts);
+  GNUNET_CONFIGURATION_set_value_string (uc->cfg,
+                                         section,
+                                         ACCEPT_FROM_key,
+                                         allowed_hosts);
+  GNUNET_free (allowed_hosts);
+}
+
+
+enum GNUNET_GenericReturnValue
+GNUNET_TESTBED_configuration_create (
+  struct GNUNET_TESTBED_System *system,
+  struct GNUNET_CONFIGURATION_Handle *cfg,
+  uint16_t **ports,
+  unsigned int *nports)
+{
+  struct UpdateContext uc;
+  char *default_config;
+
+  uc.system = system;
+  uc.cfg = cfg;
+  uc.status = GNUNET_OK;
+  uc.ports = NULL;
+  uc.nports = 0;
+  GNUNET_asprintf (&uc.gnunet_home,
+                   "%s/%u",
+                   system->tmppath,
+                   system->path_counter++);
+  GNUNET_asprintf (&default_config, "%s/config", uc.gnunet_home);
+  GNUNET_CONFIGURATION_set_value_string (cfg,
+                                         "PATHS",
+                                         "DEFAULTCONFIG",
+                                         default_config);
+  GNUNET_CONFIGURATION_set_value_string (cfg, "arm", "CONFIG", default_config);
+  GNUNET_free (default_config);
+  GNUNET_CONFIGURATION_set_value_string (cfg,
+                                         "PATHS",
+                                         "GNUNET_HOME",
+                                         uc.gnunet_home);
+  /* make PORTs and UNIXPATHs unique */
+  GNUNET_CONFIGURATION_iterate (cfg, &update_config, &uc);
+  /* allow connections to services from system trusted_ip host */
+  GNUNET_CONFIGURATION_iterate_sections (cfg, &update_config_sections, &uc);
+  /* enable loopback-based connections between peers */
+  GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "USE_LOCALADDR", "YES");
+  GNUNET_free (uc.gnunet_home);
+  if ((NULL != ports) && (NULL != nports))
+  {
+    *ports = uc.ports;
+    *nports = uc.nports;
+  }
+  else
+    GNUNET_free (uc.ports);
+  return uc.status;
+}
+
+
+/* end of testbed.c */
diff --git a/src/service/testing/testing_api_cmd_system_create.c b/src/service/testbed/testbed_api_cmd_system_create.c
index 46fbd706e..2f780ec73 100644
--- a/src/service/testing/testing_api_cmd_system_create.c
+++ b/src/service/testbed/testbed_api_cmd_system_create.c
@@ -25,10 +25,9 @@
  */
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_plugin.h"
-#include "gnunet_testing_netjail_lib.h"
 #include "gnunet_testing_lib.h"
+#include "gnunet_testbed_lib.h"
+#include "gnunet_testing_testbed_lib.h"
 
 /**
  * Struct to hold information for callbacks.
@@ -36,7 +35,7 @@
  */
 struct TestSystemState
 {
-  struct GNUNET_TESTING_System *test_system;
+  struct GNUNET_TESTBED_System *test_system;
 
   const char *testdir;
 };
@@ -52,15 +51,9 @@ system_create_run (void *cls,
 {
   struct TestSystemState *tss = cls;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "system create\n");
-
-  tss->test_system = GNUNET_TESTING_system_create (tss->testdir,
-                                                   NULL,
+  tss->test_system = GNUNET_TESTBED_system_create (tss->testdir,
                                                    NULL,
                                                    NULL);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "system created\n");
 }
 
 
@@ -75,10 +68,9 @@ system_create_traits (void *cls,
                       unsigned int index)
 {
   struct TestSystemState *tss = cls;
-  struct GNUNET_TESTING_System *test_system = tss->test_system;
-
   struct GNUNET_TESTING_Trait traits[] = {
-    GNUNET_TESTING_make_trait_test_system ((const void *) test_system),
+    GNUNET_TESTING_TESTBED_make_trait_test_system (
+      tss->test_system),
     GNUNET_TESTING_trait_end ()
   };
 
@@ -98,6 +90,9 @@ system_create_cleanup (void *cls)
 {
   struct TestSystemState *tss = cls;
 
+  GNUNET_TESTBED_system_destroy (tss->test_system,
+                                 GNUNET_YES);
+
   GNUNET_free (tss);
 }
 
@@ -110,7 +105,7 @@ system_create_cleanup (void *cls)
  * @return command.
  */
 struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_system_create (const char *label,
+GNUNET_TESTBED_cmd_system_create (const char *label,
                                   const char *testdir)
 {
   struct TestSystemState *tss;
@@ -118,7 +113,9 @@ GNUNET_TESTING_cmd_system_create (const char *label,
   tss = GNUNET_new (struct TestSystemState);
   tss->testdir = testdir;
 
-  return GNUNET_TESTING_command_new (tss, label, &system_create_run,
+  return GNUNET_TESTING_command_new (tss,
+                                     label,
+                                     &system_create_run,
                                      &system_create_cleanup,
-                                     &system_create_traits, NULL);
+                                     &system_create_traits);
 }
diff --git a/src/service/testbed/testing_testbed_traits.c b/src/service/testbed/testing_testbed_traits.c
new file mode 100644
index 000000000..b7fd605e5
--- /dev/null
+++ b/src/service/testbed/testing_testbed_traits.c
@@ -0,0 +1,34 @@
+/*
+      This file is part of GNUnet
+      Copyright (C) 2021 GNUnet e.V.
+
+      GNUnet is free software: you can redistribute it and/or modify it
+      under the terms of the GNU Affero General Public License as published
+      by the Free Software Foundation, either version 3 of the License,
+      or (at your option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Affero General Public License for more details.
+
+      You should have received a copy of the GNU Affero General Public License
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+/**
+ * @file transport/test_transport_start_with_config.c
+ * @brief Generic program to start testcases in an configurable topology.
+ * @author t3sserakt
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testing_lib.h"
+#include "gnunet_testing_testbed_lib.h"
+
+
+GNUNET_TESTING_TESTBED_SIMPLE_TRAITS (
+  GNUNET_TESTING_MAKE_IMPL_SIMPLE_TRAIT,
+  GNUNET_TESTING_TESTBED)
diff --git a/src/service/testing/Makefile.am b/src/service/testing/Makefile.am
deleted file mode 100644
index 5cd4aae9b..000000000
--- a/src/service/testing/Makefile.am
+++ /dev/null
@@ -1,134 +0,0 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if USE_COVERAGE
-  AM_CFLAGS = --coverage -O0
-  XLIB = -lgcov
-endif
-
-libexecdir= $(pkglibdir)/libexec/
-
-pkgcfgdir= $(pkgdatadir)/config.d/
-
-dist_pkgcfg_DATA = \
-  testing.conf
-
-libexec_PROGRAMS = \
- test_testing_start_with_config \
-  gnunet-cmds-helper
-
-plugindir = $(libdir)/gnunet
-
-lib_LTLIBRARIES = \
-  libgnunettesting.la
-
-gnunet_cmds_helper_SOURCES = \
-  gnunet-cmds-helper.c
-gnunet_cmds_helper_LDADD = $(XLIB) \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- libgnunettesting.la \
- $(LTLIBINTL) $(Z_LIBS)
-
-libgnunettesting_la_SOURCES = \
-  testing_api_cmd_exec_bash_script.c \
-  testing_api_cmd_barrier.c \
-  testing_api_cmd_barrier_reached.c \
-  testing_api_cmd_finish.c \
-  testing_api_cmd_local_test_prepared.c \
-  testing_api_cmd_send_peer_ready.c \
-  testing_api_cmd_block_until_external_trigger.c \
-  testing_api_cmd_netjail_start.c \
-  testing_api_cmd_netjail_start_cmds_helper.c \
-  testing_api_cmd_netjail_stop_cmds_helper.c \
-  testing_api_cmd_netjail_stop.c \
-  testing.c testing.h \
-  testing_api_cmd_system_create.c \
-  testing_api_cmd_system_destroy.c \
-  testing_api_cmd_batch.c \
-  testing_api_loop.c \
-  testing_api_traits.c
-libgnunettesting_la_LIBADD = \
- $(top_builddir)/src/service/arm/libgnunetarm.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(LTLIBINTL)
-libgnunettesting_la_LDFLAGS = \
- $(GN_LIB_LDFLAGS) \
- -version-info 2:0:1
-
-bin_PROGRAMS = \
- gnunet-testing
-
-noinst_PROGRAMS = \
- list-keys
-
-gnunet_testing_SOURCES = \
- gnunet-testing.c
-gnunet_testing_LDADD = \
- libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(GN_LIBINTL)
-
-list_keys_SOURCES = \
- list-keys.c
-list_keys_LDADD = \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(GN_LIBINTL)
-
-
-check_PROGRAMS = \
- test_testing_portreservation \
- test_testing_servicestartup \
- test_testing_peerstartup \
- test_testing_peerstartup2 \
- test_testing_sharedservices
-
-# if ENABLE_TEST_RUN_TESTING
-# AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
-# TESTS = \
-#  test_testing_portreservation \
-#  test_testing_peerstartup \
-#  test_testing_peerstartup2 \
-#  test_testing_servicestartup
-# endif
-
-test_testing_start_with_config_SOURCES = \
- test_testing_start_with_config.c
-test_testing_start_with_config_LDADD = \
- libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/lib/hello/libgnunethello.la
-
-test_testing_portreservation_SOURCES = \
- test_testing_portreservation.c
-test_testing_portreservation_LDADD = \
- libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_testing_peerstartup_SOURCES = \
- test_testing_peerstartup.c
-test_testing_peerstartup_LDADD = \
- libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_testing_peerstartup2_SOURCES = \
- test_testing_peerstartup2.c
-test_testing_peerstartup2_LDADD = \
- libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_testing_servicestartup_SOURCES = \
- test_testing_servicestartup.c
-test_testing_servicestartup_LDADD = \
- libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_testing_sharedservices_SOURCES = \
- test_testing_sharedservices.c
-test_testing_sharedservices_LDADD = \
- libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la
-
-EXTRA_DIST = \
-  test_testing_defaults.conf \
-  test_testing_sharedservices.conf \
-  testing_cmds.h
diff --git a/src/service/testing/gnunet-cmds-helper.c b/src/service/testing/gnunet-cmds-helper.c
deleted file mode 100644
index a54191abf..000000000
--- a/src/service/testing/gnunet-cmds-helper.c
+++ /dev/null
@@ -1,713 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2021 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testbed/gnunet-cmds-helper.c
- * @brief Helper binary that is started from a remote interpreter loop to start
- *        a local interpreter loop.
- *
- *        This helper monitors for three termination events.  They are: (1)The
- *        stdin of the helper is closed for reading; (2)the helper received
- *        SIGTERM/SIGINT; (3)the local loop crashed.  In case of events 1 and 2
- *        the helper kills the interpreter loop.  When the interpreter loop
- *        crashed (event 3), the helper should send a SIGTERM to its own process
- *        group; this behaviour will help terminate any child processes the loop
- *        has started and prevents them from leaking and running forever.
- *
- * @author t3sserakt
- * @author Sree Harsha Totakura <sreeharsha@totakura.in>
- */
-
-
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_plugin.h"
-#include "gnunet_testing_netjail_lib.h"
-#include "testing.h"
-#include "testing_cmds.h"
-#include "gnunet_testing_plugin.h"
-#include "gnunet_testing_barrier.h"
-#include <zlib.h>
-
-
-/**
- * Generic logging shortcut
- */
-#define LOG(kind, ...) GNUNET_log (kind, __VA_ARGS__)
-
-/**
- * Debug logging shorthand
- */
-#define LOG_DEBUG(...) LOG (GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__)
-
-#define NODE_BASE_IP "192.168.15."
-
-#define KNOWN_BASE_IP "92.68.151."
-
-#define ROUTER_BASE_IP "92.68.150."
-
-/* Use the IP addresses below instead of the public ones,
- * if the start script was not started from within a new namespace
- * created by unshare. The UPNP test case needs public IP
- * addresse for miniupnpd to function.
- * FIXME We should introduce a switch indicating if public
- * addresses should be used or not. This info has to be
- * propagated from the start script to the c code.
-#define KNOWN_BASE_IP "172.16.151."
-
-#define ROUTER_BASE_IP "172.16.150."
-*/
-
-struct GNUNET_SCHEDULER_Task *finished_task;
-
-struct GNUNET_TESTING_Interpreter *is;
-
-/**
- * Struct with information about a specific node and the whole network namespace setup.
- *
- */
-struct NodeIdentifier
-{
-  /**
-   * The number of the namespace this node is in.
-   *
-   */
-  char *n;
-
-  /**
-   * The number of the node in the namespace.
-   *
-   */
-  char *m;
-
-  /**
-   * The number of namespaces
-   *
-   */
-  char *global_n;
-
-  /**
-   * The number of local nodes per namespace.
-   *
-   */
-  char *local_m;
-
-  /**
-   * Shall we read the topology from file, or from a string.
-   */
-  unsigned int *read_file;
-
-  /**
-   * String with topology data or name of topology file.
-   */
-  char *topology_data;
-};
-
-/**
- * Context for a single write on a chunk of memory
- */
-struct WriteContext
-{
-  /**
-   * The data to write
-   */
-  void *data;
-
-  /**
-   * The length of the data
-   */
-  size_t length;
-
-  /**
-   * The current position from where the write operation should begin
-   */
-  size_t pos;
-};
-
-/**
- * The process handle to the testbed service
-
-static struct GNUNET_OS_Process *cmd_binary_process;*/
-
-/**
- * Plugin to dynamically load a test case.
- */
-struct TestcasePlugin *plugin;
-
-/**
- * Our message stream tokenizer
- */
-struct GNUNET_MessageStreamTokenizer *tokenizer;
-
-/**
- * Disk handle from stdin
- */
-static struct GNUNET_DISK_FileHandle *stdin_fd;
-
-/**
- * Disk handle for stdout
- */
-static struct GNUNET_DISK_FileHandle *stdout_fd;
-
-/**
- * Pipe used to communicate shutdown via signal.
- */
-static struct GNUNET_DISK_PipeHandle *sigpipe;
-
-/**
- * Task identifier for the read task
- */
-static struct GNUNET_SCHEDULER_Task *read_task_id;
-
-/**
- * Task identifier for the write task
- */
-static struct GNUNET_SCHEDULER_Task *write_task_id;
-
-/**
- * Are we done reading messages from stdin?
- */
-static int done_reading;
-
-/**
- * Result to return in case we fail
- */
-static int status;
-
-
-/**
- * Task to shut down cleanly
- *
- * @param cls NULL
- */
-static void
-do_shutdown (void *cls)
-{
-
-  LOG_DEBUG ("Shutting down.\n");
-
-  if (NULL != read_task_id)
-  {
-    GNUNET_SCHEDULER_cancel (read_task_id);
-    read_task_id = NULL;
-  }
-  if (NULL != write_task_id)
-  {
-    struct WriteContext *wc;
-
-    wc = GNUNET_SCHEDULER_cancel (write_task_id);
-    write_task_id = NULL;
-    GNUNET_free (wc->data);
-    GNUNET_free (wc);
-  }
-  if (NULL != stdin_fd)
-    (void) GNUNET_DISK_file_close (stdin_fd);
-  if (NULL != stdout_fd)
-    (void) GNUNET_DISK_file_close (stdout_fd);
-  GNUNET_MST_destroy (tokenizer);
-  tokenizer = NULL;
-  GNUNET_PLUGIN_unload (plugin->library_name,
-                        NULL);
-  GNUNET_free (plugin);
-}
-
-
-/**
- * Task to write to the standard out
- *
- * @param cls the WriteContext
- */
-static void
-write_task (void *cls)
-{
-  struct WriteContext *wc = cls;
-  ssize_t bytes_wrote;
-
-  GNUNET_assert (NULL != wc);
-  write_task_id = NULL;
-  bytes_wrote = GNUNET_DISK_file_write (stdout_fd,
-                                        wc->data + wc->pos,
-                                        wc->length - wc->pos);
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              "message send to master loop\n");
-  if (GNUNET_SYSERR == bytes_wrote)
-  {
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-         "Cannot reply back successful initialization\n");
-    GNUNET_free (wc->data);
-    GNUNET_free (wc);
-    return;
-  }
-  wc->pos += bytes_wrote;
-  if (wc->pos == wc->length)
-  {
-    GNUNET_free (wc->data);
-    GNUNET_free (wc);
-    return;
-  }
-  write_task_id = GNUNET_SCHEDULER_add_write_file (GNUNET_TIME_UNIT_FOREVER_REL,
-                                                   stdout_fd,
-                                                   &write_task,
-                                                   wc);
-}
-
-
-/**
- * Callback to write a message to the master loop.
- *
- */
-static void
-write_message (struct GNUNET_MessageHeader *message,
-               size_t msg_length)
-{
-  struct WriteContext *wc;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              "write message to master loop\n");
-  wc = GNUNET_new (struct WriteContext);
-  wc->length = msg_length;
-  wc->data = message;
-  write_task_id = GNUNET_SCHEDULER_add_write_file (
-    GNUNET_TIME_UNIT_FOREVER_REL,
-    stdout_fd,
-    &write_task,
-    wc);
-}
-
-
-static void
-delay_shutdown_cb ()
-{
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "doing shutdown after delay\n");
-  GNUNET_SCHEDULER_shutdown ();
-}
-
-
-struct GNUNET_MessageHeader *
-GNUNET_TESTING_send_local_test_finished_msg ()
-{
-  struct GNUNET_TESTING_CommandLocalFinished *reply;
-  size_t msg_length;
-
-  msg_length = sizeof(struct GNUNET_TESTING_CommandLocalFinished);
-  reply = GNUNET_new (struct GNUNET_TESTING_CommandLocalFinished);
-  reply->header.type = htons (GNUNET_MESSAGE_TYPE_CMDS_HELPER_LOCAL_FINISHED);
-  reply->header.size = htons ((uint16_t) msg_length);
-
-  return (struct GNUNET_MessageHeader *) reply;
-}
-
-
-static void
-finished_cb (enum GNUNET_GenericReturnValue rv)
-{
-  struct GNUNET_TESTING_CommandLocalFinished *reply;
-  size_t msg_length;
-
-  msg_length = sizeof(struct GNUNET_TESTING_CommandLocalFinished);
-  reply = GNUNET_new (struct GNUNET_TESTING_CommandLocalFinished);
-  reply->header.type = htons (GNUNET_MESSAGE_TYPE_CMDS_HELPER_LOCAL_FINISHED);
-  reply->header.size = htons ((uint16_t) msg_length);
-  reply->rv = rv;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "message prepared\n");
-  write_message ((struct GNUNET_MessageHeader *) reply, msg_length);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "message send\n");
-  // FIXME: bad hack, do not write 1s, have continuation after write_message() is done!
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "delaying shutdown\n");
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                &delay_shutdown_cb,
-                                NULL);
-}
-
-
-/**
- * Functions with this signature are called whenever a
- * complete message is received by the tokenizer.
- *
- * Do not call #GNUNET_mst_destroy() in this callback
- *
- * @param cls identification of the client
- * @param message the actual message
- * @return #GNUNET_OK on success,
- *    #GNUNET_NO to stop further processing (no error)
- *    #GNUNET_SYSERR to stop further processing with error
- */
-static enum GNUNET_GenericReturnValue
-tokenizer_cb (void *cls,
-              const struct GNUNET_MessageHeader *message)
-{
-  struct NodeIdentifier *ni = cls;
-  const struct GNUNET_TESTING_CommandHelperInit *msg;
-  struct GNUNET_TESTING_CommandHelperReply *reply;
-  char *binary;
-  char *plugin_name;
-  size_t plugin_name_size;
-  uint16_t msize;
-  uint16_t type;
-  size_t msg_length;
-  char *router_ip;
-  char *node_ip;
-  unsigned int namespace_n;
-
-  type = ntohs (message->type);
-  msize = ntohs (message->size);
-  LOG (GNUNET_ERROR_TYPE_ERROR,
-       "Received message type %u and size %u\n",
-       type,
-       msize);
-  switch (type)
-  {
-  case GNUNET_MESSAGE_TYPE_CMDS_HELPER_INIT:
-    {
-      msg = (const struct GNUNET_TESTING_CommandHelperInit *) message;
-      plugin_name_size = ntohs (msg->plugin_name_size);
-      if ((sizeof(struct GNUNET_TESTING_CommandHelperInit) + plugin_name_size) >
-          msize)
-      {
-        GNUNET_break (0);
-        LOG (GNUNET_ERROR_TYPE_WARNING,
-             "Received unexpected message -- exiting\n");
-        goto error;
-      }
-      plugin_name = GNUNET_malloc (plugin_name_size + 1);
-      GNUNET_strlcpy (plugin_name,
-                      ((char *) &msg[1]),
-                      plugin_name_size + 1);
-
-      binary = GNUNET_OS_get_libexec_binary_path ("gnunet-cmd");
-
-      plugin = GNUNET_new (struct TestcasePlugin);
-      plugin->api = GNUNET_PLUGIN_load (plugin_name,
-                                        NULL);
-      plugin->library_name = GNUNET_strdup (basename (plugin_name));
-
-      plugin->global_n = ni->global_n;
-      plugin->local_m = ni->local_m;
-      plugin->n = ni->n;
-      plugin->m = ni->m;
-
-      GNUNET_asprintf (&router_ip,
-                       ROUTER_BASE_IP "%s",
-                       plugin->n);
-      {
-        char dummy;
-
-        if (1 !=
-            sscanf (plugin->n,
-                    "%u%c",
-                    &namespace_n,
-                    &dummy))
-        {
-          // FIXME: how to handle error nicely?
-          GNUNET_break (0);
-          namespace_n = 0;
-        }
-      }
-
-      if (0 == namespace_n)
-      {
-        LOG (GNUNET_ERROR_TYPE_DEBUG,
-             "known node n: %s\n",
-             plugin->n);
-        GNUNET_asprintf (&node_ip,
-                         KNOWN_BASE_IP "%s",
-                         plugin->m);
-      }
-      else
-      {
-        LOG (GNUNET_ERROR_TYPE_DEBUG,
-             "subnet node n: %s\n",
-             plugin->n);
-        GNUNET_asprintf (&node_ip,
-                         NODE_BASE_IP "%s",
-                         plugin->m);
-      }
-
-      is = plugin->api->start_testcase (&write_message,
-                                        router_ip,
-                                        node_ip,
-                                        plugin->m,
-                                        plugin->n,
-                                        plugin->local_m,
-                                        ni->topology_data,
-                                        ni->read_file,
-                                        &finished_cb);
-      GNUNET_free (node_ip);
-      GNUNET_free (binary);
-      GNUNET_free (router_ip);
-      GNUNET_free (plugin_name);
-
-      msg_length = sizeof(struct GNUNET_TESTING_CommandHelperReply);
-      reply = GNUNET_new (struct GNUNET_TESTING_CommandHelperReply);
-      reply->header.type = htons (GNUNET_MESSAGE_TYPE_CMDS_HELPER_REPLY);
-      reply->header.size = htons ((uint16_t) msg_length);
-      write_message (&reply->header,
-                     msg_length);
-      return GNUNET_OK;
-    }
-  case GNUNET_MESSAGE_TYPE_CMDS_HELPER_BARRIER_CROSSABLE:
-    {
-      const char *barrier_name;
-      struct CommandBarrierCrossable *adm = (struct
-                                             CommandBarrierCrossable *) message;
-
-      barrier_name = (const char *) &adm[1];
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "cross barrier %s\n",
-           barrier_name);
-      GNUNET_TESTING_finish_barrier_ (is,
-                                      barrier_name);
-      return GNUNET_OK;
-    }
-  case GNUNET_MESSAGE_TYPE_CMDS_HELPER_ALL_PEERS_STARTED:
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "all peers started\n");
-      plugin->api->all_peers_started ();
-      return GNUNET_OK;
-    }
-  case GNUNET_MESSAGE_TYPE_CMDS_HELPER_ALL_LOCAL_TESTS_PREPARED:
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "all local tests prepared\n");
-      plugin->api->all_local_tests_prepared ();
-      return GNUNET_OK;
-    }
-  default:
-    LOG (GNUNET_ERROR_TYPE_WARNING, "Received unexpected message -- exiting\n");
-    goto error;
-  }
-
-error:
-  status = GNUNET_SYSERR;
-  LOG (GNUNET_ERROR_TYPE_ERROR,
-       "tokenizer shutting down!\n");
-  GNUNET_SCHEDULER_shutdown ();
-  return GNUNET_SYSERR;
-}
-
-
-/**
- * Task to read from stdin
- *
- * @param cls NULL
- */
-static void
-read_task (void *cls)
-{
-  char buf[GNUNET_MAX_MESSAGE_SIZE];
-  ssize_t sread;
-
-  read_task_id = NULL;
-  sread = GNUNET_DISK_file_read (stdin_fd, buf, sizeof(buf));
-  if ((GNUNET_SYSERR == sread) || (0 == sread))
-  {
-    LOG_DEBUG ("STDIN closed\n");
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-  if (GNUNET_YES == done_reading)
-  {
-    /* didn't expect any more data! */
-    GNUNET_break_op (0);
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "tokenizer shutting down during reading, didn't expect any more data!\n");
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-  LOG_DEBUG ("Read %u bytes\n", (unsigned int) sread);
-  /* FIXME: could introduce a GNUNET_MST_read2 to read
-     directly from 'stdin_fd' and save a memcpy() here */
-  if (GNUNET_OK !=
-      GNUNET_MST_from_buffer (tokenizer, buf, sread, GNUNET_NO, GNUNET_NO))
-  {
-    GNUNET_break (0);
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "tokenizer shutting down during reading, writing to buffer failed!\n");
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-  read_task_id /* No timeout while reading */
-    = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
-                                      stdin_fd,
-                                      &read_task,
-                                      NULL);
-}
-
-
-/**
- * Main function that will be run.
- *
- * @param cls closure
- * @param args remaining command-line arguments
- * @param cfgfile name of the configuration file used (for saving, can be NULL!)
- * @param cfg configuration
- */
-static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  struct NodeIdentifier *ni = cls;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Starting interpreter loop helper...\n");
-
-  tokenizer = GNUNET_MST_create (&tokenizer_cb,
-                                 ni);
-  stdin_fd = GNUNET_DISK_get_handle_from_native (stdin);
-  stdout_fd = GNUNET_DISK_get_handle_from_native (stdout);
-  read_task_id = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
-                                                 stdin_fd,
-                                                 &read_task,
-                                                 NULL);
-  GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
-                                 NULL);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Interpreter loop helper started.\n");
-}
-
-
-/**
- * Signal handler called for SIGCHLD.
- */
-static void
-sighandler_child_death ()
-{
-  static char c;
-  int old_errno; /* back-up errno */
-
-  old_errno = errno;
-  GNUNET_break (
-    1 ==
-    GNUNET_DISK_file_write (GNUNET_DISK_pipe_handle (sigpipe,
-                                                     GNUNET_DISK_PIPE_END_WRITE),
-                            &c,
-                            sizeof(c)));
-  errno = old_errno;
-}
-
-
-/**
- * Main function
- *
- * @param argc the number of command line arguments
- * @param argv command line arg array
- * @return return code
- */
-int
-main (int argc, char **argv)
-{
-  struct NodeIdentifier *ni;
-  struct GNUNET_SIGNAL_Context *shc_chld;
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-  int ret;
-  unsigned int sscanf_ret;
-  int i;
-  size_t topology_data_length = 0;
-  unsigned int read_file;
-  char cr[2] = "\n\0";
-
-  GNUNET_log_setup ("gnunet-cmds-helper",
-                    "DEBUG",
-                    NULL);
-  ni = GNUNET_new (struct NodeIdentifier);
-  ni->global_n = argv[1];
-  ni->local_m = argv[2];
-  ni->m = argv[3];
-  ni->n = argv[4];
-
-  errno = 0;
-  sscanf_ret = sscanf (argv[5], "%u", &read_file);
-
-  if (errno != 0)
-  {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "sscanf");
-  }
-  else if (1 == read_file)
-    ni->topology_data = argv[6];
-  else if (0 == read_file)
-  {
-    for (i = 6; i<argc; i++)
-      topology_data_length += strlen (argv[i]) + 1;
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "topo data length %llu\n",
-         (unsigned long long) topology_data_length);
-    ni->topology_data = GNUNET_malloc (topology_data_length);
-    memset (ni->topology_data, '\0', topology_data_length);
-    for (i = 6; i<argc; i++)
-    {
-      strcat (ni->topology_data, argv[i]);
-      strcat (ni->topology_data, cr);
-    }
-  }
-  else
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Wrong input for the fourth argument\n");
-  }
-  GNUNET_assert (0 < sscanf_ret);
-  ni->read_file = &read_file;
-  ni->topology_data[topology_data_length - 1] = '\0';
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "topo data %s\n",
-       ni->topology_data);
-
-  status = GNUNET_OK;
-  if (NULL ==
-      (sigpipe = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE)))
-  {
-    GNUNET_break (0);
-    return 1;
-  }
-  shc_chld =
-    GNUNET_SIGNAL_handler_install (GNUNET_SIGCHLD,
-                                   &sighandler_child_death);
-  ret = GNUNET_PROGRAM_run (argc,
-                            argv,
-                            "gnunet-cmds-helper",
-                            "Helper for starting a local interpreter loop",
-                            options,
-                            &run,
-                            ni);
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Finishing helper\n");
-  GNUNET_SIGNAL_handler_uninstall (shc_chld);
-  shc_chld = NULL;
-  GNUNET_DISK_pipe_close (sigpipe);
-  GNUNET_free (ni);
-  if (GNUNET_OK != ret)
-    return 1;
-  return (GNUNET_OK == status) ? 0 : 1;
-}
-
-
-/* end of gnunet-cmds-helper.c */
diff --git a/src/service/testing/gnunet-testing.c b/src/service/testing/gnunet-testing.c
deleted file mode 100644
index 88906e5fa..000000000
--- a/src/service/testing/gnunet-testing.c
+++ /dev/null
@@ -1,444 +0,0 @@
-/*
-     This file is part of GNUnet.
-     Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2009 GNUnet e.V.
-
-     GNUnet is free software: you can redistribute it and/or modify it
-     under the terms of the GNU Affero General Public License as published
-     by the Free Software Foundation, either version 3 of the License,
-     or (at your option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Affero General Public License for more details.
-
-     You should have received a copy of the GNU Affero General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testing/gnunet-testing.c
- * @brief tool to use testing functionality from cmd line
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib.h"
-
-
-#define LOG(kind, ...) GNUNET_log_from (kind, "gnunet-testing", __VA_ARGS__)
-
-
-/**
- * Final status code.
- */
-static int ret;
-
-/**
- * Filename of the hostkey file we should write,
- * null if we should not write a hostkey file.
- */
-static char *create_hostkey;
-
-/**
- * Non-zero if we should create config files.
- */
-static int create_cfg;
-
-/**
- * Number of config files to create.
- */
-static unsigned int create_no;
-
-/**
- * Filename of the config template to be written.
- */
-static char *create_cfg_template;
-
-/**
- * Service we are supposed to run.
- */
-static char *run_service_name;
-
-/**
- * File handle to STDIN, for reading restart/quit commands.
- */
-static struct GNUNET_DISK_FileHandle *fh;
-
-/**
- * Temporary filename, used with '-r' to write the configuration to.
- */
-static char *tmpfilename;
-
-/**
- * Task identifier of the task that waits for stdin.
- */
-static struct GNUNET_SCHEDULER_Task *tid;
-
-/**
- * Peer started for '-r'.
- */
-static struct GNUNET_TESTING_Peer *my_peer;
-
-
-static int
-create_unique_cfgs (const char *template, const unsigned int no)
-{
-  struct GNUNET_TESTING_System *system;
-  int fail;
-  unsigned int cur;
-  char *cur_file;
-  struct GNUNET_CONFIGURATION_Handle *cfg_new;
-  struct GNUNET_CONFIGURATION_Handle *cfg_tmpl;
-
-  if (GNUNET_NO == GNUNET_DISK_file_test (template))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Configuration template `%s': file not found\n",
-                create_cfg_template);
-    return 1;
-  }
-  cfg_tmpl = GNUNET_CONFIGURATION_create ();
-
-  /* load template */
-  if ((create_cfg_template != NULL) &&
-      (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg_tmpl, create_cfg_template)))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Could not load template `%s'\n",
-                create_cfg_template);
-    GNUNET_CONFIGURATION_destroy (cfg_tmpl);
-
-    return 1;
-  }
-  /* load defaults */
-  if (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg_tmpl, NULL))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Could not load template `%s'\n",
-                create_cfg_template);
-    GNUNET_CONFIGURATION_destroy (cfg_tmpl);
-    return 1;
-  }
-
-  fail = GNUNET_NO;
-  system =
-    GNUNET_TESTING_system_create ("testing", NULL /* controller */, NULL, NULL);
-  for (cur = 0; cur < no; cur++)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Creating configuration no. %u \n",
-                cur);
-    if (create_cfg_template != NULL)
-      GNUNET_asprintf (&cur_file, "%04u-%s", cur, create_cfg_template);
-    else
-      GNUNET_asprintf (&cur_file, "%04u%s", cur, ".conf");
-
-    cfg_new = GNUNET_CONFIGURATION_dup (cfg_tmpl);
-    if (GNUNET_OK != GNUNET_TESTING_configuration_create (system, cfg_new))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Could not create another configuration\n");
-      GNUNET_CONFIGURATION_destroy (cfg_new);
-      fail = GNUNET_YES;
-      break;
-    }
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Writing configuration no. %u to file `%s' \n",
-                cur,
-                cur_file);
-    if (GNUNET_OK != GNUNET_CONFIGURATION_write (cfg_new, cur_file))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Failed to write configuration no. %u \n",
-                  cur);
-      fail = GNUNET_YES;
-    }
-    GNUNET_CONFIGURATION_destroy (cfg_new);
-    GNUNET_free (cur_file);
-    if (GNUNET_YES == fail)
-      break;
-  }
-  GNUNET_CONFIGURATION_destroy (cfg_tmpl);
-  GNUNET_TESTING_system_destroy (system, GNUNET_NO);
-  if (GNUNET_YES == fail)
-    return 1;
-  return 0;
-}
-
-
-static int
-create_hostkeys (const unsigned int no)
-{
-  struct GNUNET_TESTING_System *system;
-  struct GNUNET_PeerIdentity id;
-  struct GNUNET_DISK_FileHandle *fd;
-  struct GNUNET_CRYPTO_EddsaPrivateKey *pk;
-
-  system = GNUNET_TESTING_system_create ("testing", NULL, NULL, NULL);
-  pk = GNUNET_TESTING_hostkey_get (system, create_no, &id);
-  if (NULL == pk)
-  {
-    fprintf (stderr,
-             _ ("Could not extract hostkey %u (offset too large?)\n"),
-             create_no);
-    GNUNET_TESTING_system_destroy (system, GNUNET_YES);
-    return 1;
-  }
-  (void) GNUNET_DISK_directory_create_for_file (create_hostkey);
-  fd =
-    GNUNET_DISK_file_open (create_hostkey,
-                           GNUNET_DISK_OPEN_READWRITE | GNUNET_DISK_OPEN_CREATE,
-                           GNUNET_DISK_PERM_USER_READ
-                           | GNUNET_DISK_PERM_USER_WRITE);
-  GNUNET_assert (fd != NULL);
-  ret = GNUNET_DISK_file_write (fd,
-                                pk,
-                                sizeof(struct GNUNET_CRYPTO_EddsaPrivateKey));
-  GNUNET_assert (GNUNET_OK == GNUNET_DISK_file_close (fd));
-  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG,
-                   "transport-testing",
-                   "Wrote hostkey to file: `%s'\n",
-                   create_hostkey);
-  GNUNET_free (pk);
-  GNUNET_TESTING_system_destroy (system, GNUNET_YES);
-  return 0;
-}
-
-
-/**
- * Cleanup called by signal handlers and when stdin is closed.
- * Removes the temporary file.
- *
- * @param cls unused
- */
-static void
-cleanup (void *cls)
-{
-  if (NULL != tmpfilename)
-  {
-    if (0 != unlink (tmpfilename))
-      GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
-                                "unlink",
-                                tmpfilename);
-  }
-  if (NULL != tid)
-  {
-    GNUNET_SCHEDULER_cancel (tid);
-    tid = NULL;
-  }
-  if (NULL != fh)
-  {
-    GNUNET_DISK_file_close (fh);
-    fh = NULL;
-  }
-}
-
-
-/**
- * Called whenever we can read stdin non-blocking
- *
- * @param cls unused
- */
-static void
-stdin_cb (void *cls)
-{
-  int c;
-
-  tid = NULL;
-  c = getchar ();
-  switch (c)
-  {
-  case EOF:
-  case 'q':
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-
-  case 'r':
-    if (GNUNET_OK != GNUNET_TESTING_peer_stop (my_peer))
-      LOG (GNUNET_ERROR_TYPE_ERROR, "Failed to stop the peer\n");
-    if (GNUNET_OK != GNUNET_TESTING_peer_start (my_peer))
-      LOG (GNUNET_ERROR_TYPE_ERROR, "Failed to start the peer\n");
-    printf ("restarted\n");
-    fflush (stdout);
-    break;
-
-  case '\n':
-  case '\r':
-    /* ignore whitespace */
-    break;
-
-  default:
-    fprintf (stderr,
-             _ ("Unknown command, use 'q' to quit or 'r' to restart peer\n"));
-    break;
-  }
-  tid = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
-                                        fh,
-                                        &stdin_cb,
-                                        NULL);
-}
-
-
-/**
- * Main function called by the testing library.
- * Executed inside a running scheduler.
- *
- * @param cls unused
- * @param cfg configuration of the peer that was started
- * @param peer handle to the peer
- */
-static void
-testing_main (void *cls,
-              const struct GNUNET_CONFIGURATION_Handle *cfg,
-              struct GNUNET_TESTING_Peer *peer)
-{
-  my_peer = peer;
-  if (NULL == (tmpfilename = GNUNET_DISK_mktemp ("gnunet-testing")))
-  {
-    GNUNET_break (0);
-    GNUNET_SCHEDULER_shutdown ();
-    return;
-  }
-  if (GNUNET_SYSERR ==
-      GNUNET_CONFIGURATION_write ((struct GNUNET_CONFIGURATION_Handle *) cfg,
-                                  tmpfilename))
-  {
-    GNUNET_break (0);
-    return;
-  }
-  printf ("ok\n%s\n", tmpfilename);
-  fflush (stdout);
-  GNUNET_SCHEDULER_add_shutdown (&cleanup, NULL);
-  fh = GNUNET_DISK_get_handle_from_native (stdin);
-  tid = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
-                                        fh,
-                                        &stdin_cb,
-                                        NULL);
-}
-
-
-/**
- * Main function that will be running without scheduler.
- *
- * @param cls closure
- * @param args remaining command-line arguments
- * @param cfgfile name of the configuration file used (for saving, can be NULL!)
- * @param cfg configuration
- */
-static void
-run_no_scheduler (void *cls,
-                  char *const *args,
-                  const char *cfgfile,
-                  const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  if (NULL != run_service_name)
-  {
-    ret = GNUNET_TESTING_service_run ("gnunet_service_test",
-                                      run_service_name,
-                                      cfgfile,
-                                      &testing_main,
-                                      NULL);
-    return;
-  }
-
-  if (GNUNET_YES == create_cfg)
-  {
-    if (create_no > 0)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Creating %u configuration files based on template `%s'\n",
-                  create_no,
-                  create_cfg_template);
-      ret = create_unique_cfgs (create_cfg_template, create_no);
-    }
-    else
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Missing arguments! \n");
-      ret = 1;
-    }
-  }
-  if (NULL != create_hostkey)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Extracting hostkey %u\n", create_no);
-    ret = create_hostkeys (create_no);
-  }
-  GNUNET_free (create_cfg_template);
-}
-
-
-/**
- * The main function.
- *
- * @param argc number of arguments from the command line
- * @param argv command line arguments
- * @return 0 ok, 1 on error
- */
-int
-main (int argc, char *const *argv)
-{
-  struct GNUNET_GETOPT_CommandLineOption options[] =
-  { GNUNET_GETOPT_option_flag ('C',
-                               "cfg",
-                               gettext_noop (
-                                 "create unique configuration files"),
-                               &create_cfg),
-    GNUNET_GETOPT_option_string (
-      'k',
-      "key",
-      "FILENAME",
-      gettext_noop ("extract hostkey file from pre-computed hostkey list"),
-      &create_hostkey),
-
-    GNUNET_GETOPT_option_uint (
-      'n',
-      "number",
-      "NUMBER",
-      gettext_noop (
-        "number of unique configuration files to create, or number of the hostkey to extract"),
-      &create_no),
-
-
-    GNUNET_GETOPT_option_string ('t',
-                                 "template",
-                                 "FILENAME",
-                                 gettext_noop ("configuration template"),
-                                 &create_cfg_template),
-
-    GNUNET_GETOPT_option_string (
-      'r',
-      "run",
-      "SERVICE",
-      gettext_noop (
-        "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"),
-      &run_service_name),
-    GNUNET_GETOPT_OPTION_END };
-
-  if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
-    return 2;
-
-  /* Run without scheduler, because we may want to call
-   * GNUNET_TESTING_service_run, which starts the scheduler on its own.
-   * Furthermore, the other functionality currently does not require the scheduler, too,
-   * but beware when extending gnunet-testing. */
-  ret =
-    (GNUNET_OK ==
-     GNUNET_PROGRAM_run2 (argc,
-                          argv,
-                          "gnunet-testing",
-                          gettext_noop (
-                            "Command line tool to access the testing library"),
-                          options,
-                          &run_no_scheduler,
-                          NULL,
-                          GNUNET_YES))
-    ? ret
-    : 1;
-  GNUNET_free_nz ((void *) argv);
-  return ret;
-}
-
-
-/* end of gnunet-testing.c */
diff --git a/src/service/testing/list-keys.c b/src/service/testing/list-keys.c
deleted file mode 100644
index f65b45a77..000000000
--- a/src/service/testing/list-keys.c
+++ /dev/null
@@ -1,112 +0,0 @@
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib.h"
-
-static unsigned int nkeys;
-static unsigned int nskip;
-static int result;
-
-/**
- * Main run function.
- *
- * @param cls NULL
- * @param args arguments passed to GNUNET_PROGRAM_run
- * @param cfgfile the path to configuration file
- * @param cfg the configuration file handle
- */
-static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *config)
-{
-  char *idfile;
-  struct GNUNET_DISK_FileHandle *f;
-  void *data;
-  struct GNUNET_DISK_MapHandle *map;
-  struct GNUNET_CRYPTO_EddsaPrivateKey pkey;
-  struct GNUNET_PeerIdentity id;
-  unsigned int cnt;
-  uint64_t fsize;
-  unsigned int nmax;
-
-  if ((NULL == args) || (NULL == args[0]))
-  {
-    fprintf (stderr, "Need the hostkey file\n");
-    return;
-  }
-  idfile = args[0];
-  if (GNUNET_OK !=
-      GNUNET_DISK_file_size (idfile, &fsize, GNUNET_YES, GNUNET_YES))
-  {
-    GNUNET_break (0);
-    return;
-  }
-  if (0 != (fsize % GNUNET_TESTING_HOSTKEYFILESIZE))
-  {
-    fprintf (stderr, _ ("Incorrect hostkey file format: %s\n"), idfile);
-    return;
-  }
-  f = GNUNET_DISK_file_open (idfile,
-                             GNUNET_DISK_OPEN_READ,
-                             GNUNET_DISK_PERM_NONE);
-  if (NULL == f)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  data = GNUNET_DISK_file_map (f, &map, GNUNET_DISK_MAP_TYPE_READ, fsize);
-  if (NULL == data)
-  {
-    GNUNET_break (0);
-    GNUNET_DISK_file_close (f);
-    return;
-  }
-  nmax = fsize / GNUNET_TESTING_HOSTKEYFILESIZE;
-  for (cnt = nskip; cnt < (nskip + nkeys); cnt++)
-  {
-    if (nskip + cnt >= nmax)
-    {
-      printf ("Max keys %u reached\n", nmax);
-      break;
-    }
-    GNUNET_memcpy (&pkey,
-                   data + (cnt * GNUNET_TESTING_HOSTKEYFILESIZE),
-                   GNUNET_TESTING_HOSTKEYFILESIZE);
-    GNUNET_CRYPTO_eddsa_key_get_public (&pkey, &id.public_key);
-    printf ("Key %u: %s\n", cnt, GNUNET_i2s_full (&id));
-  }
-  result = GNUNET_OK;
-  GNUNET_DISK_file_unmap (map);
-  GNUNET_DISK_file_close (f);
-}
-
-
-int
-main (int argc, char *argv[])
-{
-  struct GNUNET_GETOPT_CommandLineOption option[] =
-  { GNUNET_GETOPT_option_uint ('n',
-                               "num-keys",
-                               "COUNT",
-                               gettext_noop ("list COUNT number of keys"),
-                               &nkeys),
-    GNUNET_GETOPT_OPTION_END };
-  int ret;
-
-  result = GNUNET_SYSERR;
-  nkeys = 10;
-  ret =
-    GNUNET_PROGRAM_run (argc,
-                        argv,
-                        "list-keys",
-                        "Lists the peer IDs corresponding to the given keys file\n",
-                        option,
-                        &run,
-                        NULL);
-  if (GNUNET_OK != ret)
-    return 1;
-  if (GNUNET_SYSERR == result)
-    return 1;
-  return 0;
-}
diff --git a/src/service/testing/meson.build b/src/service/testing/meson.build
deleted file mode 100644
index ea8956c1b..000000000
--- a/src/service/testing/meson.build
+++ /dev/null
@@ -1,62 +0,0 @@
-libgnunettesting_src = [
-                        'testing_api_cmd_exec_bash_script.c',
-                        'testing_api_cmd_barrier.c',
-                        'testing_api_cmd_barrier_reached.c',
-                        'testing_api_cmd_finish.c',
-                        'testing_api_cmd_local_test_prepared.c',
-                        'testing_api_cmd_send_peer_ready.c',
-                        'testing_api_cmd_block_until_external_trigger.c',
-                        'testing_api_cmd_netjail_start.c',
-                        'testing_api_cmd_netjail_start_cmds_helper.c',
-                        'testing_api_cmd_netjail_stop_cmds_helper.c',
-                        'testing_api_cmd_netjail_stop.c',
-                        'testing.c',
-                        'testing_api_cmd_system_create.c',
-                        'testing_api_cmd_system_destroy.c',
-                        'testing_api_cmd_batch.c',
-                        'testing_api_loop.c',
-                        'testing_api_traits.c'
-                        ]
-
-gnunettesting_src = ['gnunet-testing.c']
-gnunetservicetesting_src = ['gnunet-service-testing.c']
-
-configure_file(input : 'testing.conf',
-               output : 'testing.conf',
-               configuration : cdata,
-               install: true,
-               install_dir: pkgcfgdir)
-
-
-libgnunettesting = library('gnunettesting',
-        libgnunettesting_src,
-        soversion: '1',
-        version: '1.1.0',
-        dependencies: [libgnunetutil_dep,
-                       m_dep,
-                       libgnunetarm_dep],
-        include_directories: [incdir, configuration_inc],
-        install: true,
-        install_dir: get_option('libdir'))
-libgnunettesting_dep = declare_dependency(link_with : libgnunettesting)
-pkg.generate(libgnunettesting, url: 'https://www.gnunet.org',
-             description : 'Provides API for gnunet testing')
-
-executable ('gnunet-testing',
-          gnunettesting_src,
-          dependencies: [libgnunettesting_dep,
-                         libgnunetutil_dep,
-                         ],
-          include_directories: [incdir, configuration_inc],
-        install: true,
-        install_dir: get_option('bindir'))
-
-executable ('gnunet-cmds-helper',
-            ['gnunet-cmds-helper.c'],
-            dependencies: [libgnunettesting_dep,
-                           libgnunetutil_dep,
-                           ],
-            include_directories: [incdir, configuration_inc],
-            install: true,
-            install_dir: get_option('libdir')/'gnunet'/'libexec')
-
diff --git a/src/service/testing/test_testing_defaults.conf b/src/service/testing/test_testing_defaults.conf
deleted file mode 100644
index 2e7c39113..000000000
--- a/src/service/testing/test_testing_defaults.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-testing/
-
-[transport]
-PLUGINS = tcp
-
-[transport-tcp]
-TESTING_IGNORE_KEYS = SOMETHING;KEY1;ACCEPT_FROM;
-
-[transport-tcp]
-BINDTO = 127.0.0.1
-
-[nat]
-DISABLEV6 = YES
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = NO
-
-
-[rps]
-START_ON_DEMAND = NO
-IMMEDIATE_START = NO
diff --git a/src/service/testing/test_testing_peerstartup.c b/src/service/testing/test_testing_peerstartup.c
deleted file mode 100644
index 25cbb2a9f..000000000
--- a/src/service/testing/test_testing_peerstartup.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2008, 2009, 2012 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testing/test_testing_new_peerstartup.c
- * @brief test case for testing peer startup and shutdown using new testing
- *          library
- * @author Sree Harsha Totakura
- */
-
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib.h"
-
-#define LOG(kind, ...)                           \
-  GNUNET_log (kind, __VA_ARGS__)
-
-/**
- * The status of the test
- */
-int status;
-
-/**
- * The testing context
- */
-struct TestingContext
-{
-  /**
-   * The testing system
-   */
-  struct GNUNET_TESTING_System *system;
-
-  /**
-   * The peer which has been started by the testing system
-   */
-  struct GNUNET_TESTING_Peer *peer;
-
-  /**
-   * The running configuration of the peer
-   */
-  struct GNUNET_CONFIGURATION_Handle *cfg;
-};
-
-
-/**
- * Task for shutdown
- *
- * @param cls the testing context
- */
-static void
-do_shutdown (void *cls)
-{
-  struct TestingContext *test_ctx = cls;
-
-  GNUNET_assert (NULL != test_ctx);
-  if (NULL != test_ctx->peer)
-  {
-    (void) GNUNET_TESTING_peer_stop (test_ctx->peer);
-    GNUNET_TESTING_peer_destroy (test_ctx->peer);
-  }
-  if (NULL != test_ctx->cfg)
-    GNUNET_CONFIGURATION_destroy (test_ctx->cfg);
-  if (NULL != test_ctx->system)
-    GNUNET_TESTING_system_destroy (test_ctx->system, GNUNET_YES);
-  GNUNET_free (test_ctx);
-}
-
-
-/**
- * Main point of test execution
- */
-static void
-run (void *cls, char *const *args, const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  struct TestingContext *test_ctx;
-  char *emsg;
-  struct GNUNET_PeerIdentity id;
-
-  test_ctx = GNUNET_new (struct TestingContext);
-  test_ctx->system =
-    GNUNET_TESTING_system_create ("test-gnunet-testing",
-                                  "127.0.0.1", NULL, NULL);
-  emsg = NULL;
-  if (NULL == test_ctx->system)
-    goto end;
-  test_ctx->cfg = GNUNET_CONFIGURATION_dup (cfg);
-  test_ctx->peer =
-    GNUNET_TESTING_peer_configure (test_ctx->system,
-                                   test_ctx->cfg,
-                                   0, &id, &emsg);
-  if (NULL == test_ctx->peer)
-  {
-    if (NULL != emsg)
-      printf ("Test failed upon error: %s", emsg);
-    goto end;
-  }
-  if (GNUNET_OK != GNUNET_TESTING_peer_start (test_ctx->peer))
-    goto end;
-  status = GNUNET_OK;
-
-end:
-  GNUNET_SCHEDULER_add_now (&do_shutdown, test_ctx);
-  GNUNET_free (emsg);
-}
-
-
-int
-main (int argc, char *argv[])
-{
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-
-  status = GNUNET_SYSERR;
-  if (GNUNET_OK !=
-      GNUNET_PROGRAM_run (argc, argv,
-                          "test_testing_peerstartup",
-                          "test case for peerstartup using new testing library",
-                          options, &run, NULL))
-    return 1;
-  return (GNUNET_OK == status) ? 0 : 1;
-}
-
-
-/* end of test_testing_peerstartup.c */
diff --git a/src/service/testing/test_testing_peerstartup2.c b/src/service/testing/test_testing_peerstartup2.c
deleted file mode 100644
index 8d357cb08..000000000
--- a/src/service/testing/test_testing_peerstartup2.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2008, 2009, 2012 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testing/test_testing_new_peerstartup.c
- * @brief test case for testing peer startup and shutdown using new testing
- *          library
- * @author Sree Harsha Totakura
- */
-
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib.h"
-
-#define LOG(kind, ...)                           \
-  GNUNET_log (kind, __VA_ARGS__)
-
-
-#define FAIL_TEST(cond)                         \
-  do {                                          \
-    if (! (cond)) {                              \
-      GNUNET_break (0);                         \
-      if (GNUNET_OK == status) {                \
-        status = GNUNET_SYSERR;                 \
-      }                                         \
-    }                                           \
-  } while (0)                                   \
-
-
-/**
- * The status of the test
- */
-int status;
-
-/**
- * The testing context
- */
-struct TestingContext
-{
-  /**
-   * The testing system
-   */
-  struct GNUNET_TESTING_System *system;
-
-  /**
-   * The peer which has been started by the testing system
-   */
-  struct GNUNET_TESTING_Peer *peer;
-
-  /**
-   * The running configuration of the peer
-   */
-  struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  /**
-   * State
-   */
-  enum
-  {
-    PEER_INIT,
-
-    PEER_STARTED,
-
-    PEER_STOPPED
-  } state;
-};
-
-
-static void
-do_shutdown2 (void *cls)
-{
-  struct TestingContext *test_ctx = cls;
-
-  if (NULL != test_ctx->peer)
-    GNUNET_TESTING_peer_destroy (test_ctx->peer);
-  if (NULL != test_ctx->cfg)
-    GNUNET_CONFIGURATION_destroy (test_ctx->cfg);
-  if (NULL != test_ctx->system)
-    GNUNET_TESTING_system_destroy (test_ctx->system, GNUNET_YES);
-  GNUNET_free (test_ctx);
-}
-
-
-/**
- * Task for shutdown
- *
- * @param cls the testing context
- */
-static void
-do_shutdown (void *cls);
-
-
-static void
-peer_status_cb (void *cls, struct GNUNET_TESTING_Peer *peer, int success)
-{
-  struct TestingContext *test_ctx = cls;
-
-  switch (test_ctx->state)
-  {
-  case PEER_INIT:
-    FAIL_TEST (0);
-    break;
-
-  case PEER_STARTED:
-    FAIL_TEST (GNUNET_YES == success);
-    test_ctx->state = PEER_STOPPED;
-    GNUNET_SCHEDULER_add_now (&do_shutdown2, cls);
-    break;
-
-  case PEER_STOPPED:
-    FAIL_TEST (0);
-  }
-}
-
-
-/**
- * Task for shutdown
- *
- * @param cls the testing context
- */
-static void
-do_shutdown (void *cls)
-{
-  struct TestingContext *test_ctx = cls;
-
-  GNUNET_assert (NULL != test_ctx);
-  if (NULL != test_ctx->peer)
-  {
-    FAIL_TEST (GNUNET_OK ==
-               GNUNET_TESTING_peer_stop_async (test_ctx->peer,
-                                               &peer_status_cb,
-                                               test_ctx));
-  }
-  else
-    do_shutdown2 (test_ctx);
-}
-
-
-/**
- * Main point of test execution
- */
-static void
-run (void *cls, char *const *args, const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  struct TestingContext *test_ctx;
-  char *emsg;
-  struct GNUNET_PeerIdentity id;
-
-  test_ctx = GNUNET_new (struct TestingContext);
-  test_ctx->system =
-    GNUNET_TESTING_system_create ("test-gnunet-testing",
-                                  "127.0.0.1", NULL, NULL);
-  emsg = NULL;
-  if (NULL == test_ctx->system)
-    goto end;
-  test_ctx->cfg = GNUNET_CONFIGURATION_dup (cfg);
-  test_ctx->peer =
-    GNUNET_TESTING_peer_configure (test_ctx->system,
-                                   test_ctx->cfg,
-                                   0, &id, &emsg);
-  if (NULL == test_ctx->peer)
-  {
-    if (NULL != emsg)
-      printf ("Test failed upon error: %s", emsg);
-    goto end;
-  }
-  if (GNUNET_OK != GNUNET_TESTING_peer_start (test_ctx->peer))
-    goto end;
-  test_ctx->state = PEER_STARTED;
-  FAIL_TEST (GNUNET_OK ==
-             GNUNET_TESTING_peer_stop_async (test_ctx->peer,
-                                             &peer_status_cb,
-                                             test_ctx));
-  GNUNET_TESTING_peer_stop_async_cancel (test_ctx->peer);
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                &do_shutdown, test_ctx);
-  return;
-
-end:
-  FAIL_TEST (0);
-  GNUNET_SCHEDULER_add_now (&do_shutdown, test_ctx);
-  GNUNET_free (emsg);
-}
-
-
-int
-main (int argc, char *argv[])
-{
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-
-  status = GNUNET_OK;
-  if (GNUNET_OK !=
-      GNUNET_PROGRAM_run (argc, argv,
-                          "test_testing_new_peerstartup",
-                          "test case for peerstartup using new testing library",
-                          options, &run, NULL))
-    return 1;
-  return (GNUNET_OK == status) ? 0 : 1;
-}
-
-
-/* end of test_testing_peerstartup.c */
diff --git a/src/service/testing/test_testing_servicestartup.c b/src/service/testing/test_testing_servicestartup.c
deleted file mode 100644
index 83458898b..000000000
--- a/src/service/testing/test_testing_servicestartup.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2008, 2009, 2012 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testing/test_testing_new_servicestartup.c
- * @brief test case for testing service startup using new testing API
- * @author Sree Harsha Totakura
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib.h"
-
-
-#define LOG(kind, ...)                           \
-  GNUNET_log (kind, __VA_ARGS__)
-
-
-/**
- * Global test status
- */
-static int test_success;
-
-
-/**
- * The testing callback function
- *
- * @param cls NULL
- * @param cfg the configuration with which the current testing service is run
- */
-static void
-test_run (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg,
-          struct GNUNET_TESTING_Peer *peer)
-{
-  GNUNET_assert (NULL == cls);
-  GNUNET_assert (NULL != cfg);
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Service arm started successfully\n");
-  test_success = GNUNET_YES;
-  GNUNET_SCHEDULER_shutdown ();
-}
-
-
-/**
- * The main point of execution
- */
-int
-main (int argc, char *argv[])
-{
-  test_success = GNUNET_NO;
-  GNUNET_assert (0 == GNUNET_TESTING_service_run ("test-testing-servicestartup",
-                                                  "arm",
-                                                  "test_testing_defaults.conf",
-                                                  &test_run,
-                                                  NULL));
-  return (GNUNET_YES == test_success) ? 0 : 1;
-}
-
-
-/* end of test_testing_servicestartup.c */
diff --git a/src/service/testing/test_testing_sharedservices.c b/src/service/testing/test_testing_sharedservices.c
deleted file mode 100644
index d2f760d7a..000000000
--- a/src/service/testing/test_testing_sharedservices.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2008, 2009, 2012 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testing/test_testing_sharedservices.c
- * @brief test case for testing service sharing among peers started by testing
- * @author Sree Harsha Totakura <sreeharsha@totakura.in>
- */
-
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib.h"
-
-#define LOG(kind, ...)                           \
-  GNUNET_log (kind, __VA_ARGS__)
-
-#define NUM_PEERS 4
-
-/**
- * The status of the test
- */
-int status;
-
-/**
- * The testing context
- */
-struct TestingContext
-{
-  /**
-   * The testing system
-   */
-  struct GNUNET_TESTING_System *system;
-
-  /**
-   * The peer which has been started by the testing system
-   */
-  struct GNUNET_TESTING_Peer *peers[NUM_PEERS];
-
-  /**
-   * The running configuration of the peer
-   */
-  struct GNUNET_CONFIGURATION_Handle *cfg;
-};
-
-
-/**
- * Task for shutdown
- *
- * @param cls the testing context
- */
-static void
-do_shutdown (void *cls)
-{
-  struct TestingContext *test_ctx = cls;
-  struct GNUNET_TESTING_Peer *peer;
-  unsigned int cnt;
-
-  GNUNET_assert (NULL != test_ctx);
-  for (cnt = 0; cnt < NUM_PEERS; cnt++)
-  {
-    peer = test_ctx->peers[cnt];
-    if (NULL == peer)
-      continue;
-    (void) GNUNET_TESTING_peer_stop (peer);
-    GNUNET_TESTING_peer_destroy (peer);
-  }
-  if (NULL != test_ctx->cfg)
-    GNUNET_CONFIGURATION_destroy (test_ctx->cfg);
-  if (NULL != test_ctx->system)
-    GNUNET_TESTING_system_destroy (test_ctx->system, GNUNET_YES);
-  GNUNET_free (test_ctx);
-}
-
-
-/**
- * Main point of test execution
- */
-static void
-run (void *cls, char *const *args, const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  struct TestingContext *test_ctx;
-  char *emsg;
-  struct GNUNET_PeerIdentity id;
-  struct GNUNET_TESTING_SharedService ss[] = {
-    { "peerinfo", cfg, 2 },
-    { NULL, NULL, 0 }
-  };
-  struct GNUNET_TESTING_Peer *peer;
-  unsigned int cnt;
-
-  test_ctx = GNUNET_new (struct TestingContext);
-  test_ctx->system =
-    GNUNET_TESTING_system_create ("test-gnunet-testing",
-                                  "127.0.0.1", NULL, ss);
-  emsg = NULL;
-  if (NULL == test_ctx->system)
-    goto end;
-  test_ctx->cfg = GNUNET_CONFIGURATION_dup (cfg);
-  for (cnt = 0; cnt < NUM_PEERS; cnt++)
-  {
-    peer = GNUNET_TESTING_peer_configure (test_ctx->system,
-                                          test_ctx->cfg,
-                                          0, &id, &emsg);
-    if (NULL == peer)
-    {
-      if (NULL != emsg)
-        printf ("Test failed upon error: %s", emsg);
-      goto end;
-    }
-    if (GNUNET_OK != GNUNET_TESTING_peer_start (peer))
-    {
-      GNUNET_TESTING_peer_destroy (peer);
-      goto end;
-    }
-    test_ctx->peers[cnt] = peer;
-  }
-  status = GNUNET_OK;
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
-                                &do_shutdown, test_ctx);
-  return;
-
-end:
-  GNUNET_SCHEDULER_add_now (&do_shutdown, test_ctx);
-  GNUNET_free (emsg);
-}
-
-
-int
-main (int argc, char *argv[])
-{
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-  char *const argv2[] = { "test_testing_sharedservices",
-                          "-c", "test_testing_sharedservices.conf",
-                          NULL };
-
-  status = GNUNET_SYSERR;
-  if (GNUNET_OK !=
-      GNUNET_PROGRAM_run ((sizeof(argv2) / sizeof(char *)) - 1, argv2,
-                          "test_testing_sharedservices",
-                          "test case for testing service sharing among peers started by testing",
-                          options, &run, NULL))
-    return 1;
-  return (GNUNET_OK == status) ? 0 : 3;
-}
-
-
-/* end of test_testing_sharedservices.c */
diff --git a/src/service/testing/test_testing_sharedservices.conf b/src/service/testing/test_testing_sharedservices.conf
deleted file mode 100644
index 92eac7e71..000000000
--- a/src/service/testing/test_testing_sharedservices.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-[PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-testing/
-
-[testbed-logger]
-PORT = 59132
-UNIXPATH = $GNUNET_RUNTIME_DIR/testbed-logger.sock
-DIR = $GNUNET_TMP/testbed-logger
-
-[transport]
-PLUGINS = tcp
-
-[transport-tcp]
-TESTING_IGNORE_KEYS = SOMETHING;KEY1;ACCEPT_FROM;
-
-[transport-tcp]
-BINDTO = 127.0.0.1
-
-[nat]
-DISABLEV6 = YES
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = NO
-
-
-[rps]
-START_ON_DEMAND = NO
-IMMEDIATE_START = NO
diff --git a/src/service/testing/test_testing_start_with_config.c b/src/service/testing/test_testing_start_with_config.c
deleted file mode 100644
index a2c692dbc..000000000
--- a/src/service/testing/test_testing_start_with_config.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2021 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file transport/test_transport_start_with_config.c
- * @brief Generic program to start testcases in an configurable topology.
- * @author t3sserakt
- */
-#include "platform.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_netjail_lib.h"
-#include "gnunet_util_lib.h"
-
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 600)
-
-
-int
-main (int argc,
-      char *const *argv)
-{
-  char *topology_data;
-  char *topology_data_script;
-  struct GNUNET_TESTING_NetjailTopology *topology;
-  unsigned int read_file = GNUNET_YES;
-  int ret;
-  char *rest = NULL;
-  char *token;
-  size_t single_line_len;
-  size_t data_len;
-
-  GNUNET_log_setup ("test-netjail",
-                    "INFO",
-                    NULL);
-
-  if (0 == strcmp ("-s", argv[1]))
-  {
-    data_len = strlen (argv[2]);
-    topology_data = GNUNET_malloc (data_len);
-    topology_data_script = GNUNET_malloc (data_len);
-    token = strtok_r (argv[2], "\n", &rest);
-    while (NULL != token)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "token1 %s\n",
-                  token);
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "token2 %s\n",
-                  token);
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "topology_data %s\n",
-                  topology_data);
-      strcat (topology_data_script, token);
-      strcat (topology_data_script, " ");
-      strcat (topology_data, token);
-      strcat (topology_data, "\n");
-      token = strtok_r (NULL, "\n", &rest);
-    }
-    single_line_len = strlen (topology_data);
-    topology_data_script [single_line_len - 1] = '\0';
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "read from string\n");
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "topology_data %s\n",
-                topology_data);
-    read_file = GNUNET_NO;
-    topology = GNUNET_TESTING_get_topo_from_string (topology_data);
-  }
-  else
-  {
-    topology_data = argv[1];
-    topology_data_script = argv[1];
-    topology = GNUNET_TESTING_get_topo_from_file (topology_data);
-  }
-
-  struct GNUNET_TESTING_Command commands[] = {
-    GNUNET_TESTING_cmd_netjail_start ("netjail-start",
-                                      topology_data_script,
-                                      &read_file),
-    GNUNET_TESTING_cmd_netjail_start_cmds_helper ("netjail-start-testbed",
-                                                     topology,
-                                                     &read_file,
-                                                     topology_data_script,
-                                                     TIMEOUT),
-    GNUNET_TESTING_cmd_stop_cmds_helper ("stop-testbed",
-                                            "netjail-start-testbed",
-                                            topology),
-    GNUNET_TESTING_cmd_netjail_stop ("netjail-stop",
-                                     topology_data_script,
-                                     &read_file),
-    GNUNET_TESTING_cmd_end ()
-  };
-
-  ret = GNUNET_TESTING_main (commands,
-                             TIMEOUT);
-
-  if (0 == strcmp ("-s", argv[1]))
-  {
-    GNUNET_free (topology_data_script);
-    GNUNET_free (topology_data);
-  }
-  GNUNET_TESTING_free_topology (topology);
-
-  return ret;
-}
diff --git a/src/service/testing/testing.c b/src/service/testing/testing.c
deleted file mode 100644
index fdfa80d87..000000000
--- a/src/service/testing/testing.c
+++ /dev/null
@@ -1,2830 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2008, 2009, 2012 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testing/testing.c
- * @brief convenience API for writing testcases for GNUnet
- *        Many testcases need to start and stop a peer/service
- *        and this library is supposed to make that easier
- *        for TESTCASES.  Normal programs should always
- *        use functions from gnunet_{util,arm}_lib.h.  This API is
- *        ONLY for writing testcases (or internal use of the testbed).
- * @author Christian Grothoff
- *
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_arm_service.h"
-#include "gnunet_testing_lib.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_plugin.h"
-#include "gnunet_testing_barrier.h"
-#include "gnunet_testing_netjail_lib.h"
-#include "testing_cmds.h"
-
-#define LOG(kind, ...) GNUNET_log_from (kind, "testing-api", __VA_ARGS__)
-
-#define CONNECT_ADDRESS_TEMPLATE "%s-192.168.15.%u"
-
-#define ROUTER_CONNECT_ADDRESS_TEMPLATE "%s-92.68.150.%u"
-
-#define KNOWN_CONNECT_ADDRESS_TEMPLATE "%s-92.68.151.%u"
-
-/* Use the IP addresses below instead of the public ones,
- * if the start script was not started from within a new namespace
- * created by unshare. The UPNP test case needs public IP
- * addresse for miniupnpd to function.
- * FIXME We should introduce a switch indicating if public
- * addresses should be used or not. This info has to be
- * propagated from the start script to the c code.
-#define ROUTER_CONNECT_ADDRESS_TEMPLATE "%s-172.16.150.%u"
-
-#define KNOWN_CONNECT_ADDRESS_TEMPLATE "%s-172.16.151.%u"
-*/
-
-#define PREFIX_TCP "tcp"
-
-#define PREFIX_UDP "udp"
-
-#define PREFIX_TCP_NATTED "tcp_natted"
-
-#define PREFIX_UDP_NATTED "udp_natted"
-
-/**
- * Lowest port used for GNUnet testing.  Should be high enough to not
- * conflict with other applications running on the hosts but be low
- * enough to not conflict with client-ports (typically starting around
- * 32k).
- */
-#define LOW_PORT 12000
-
-/**
- * Highest port used for GNUnet testing.  Should be low enough to not
- * conflict with the port range for "local" ports (client apps; see
- * /proc/sys/net/ipv4/ip_local_port_range on Linux for example).
- */
-#define HIGH_PORT 56000
-
-
-struct SharedServiceInstance
-{
-  struct SharedService *ss;
-
-  char *cfg_fn;
-
-  struct GNUNET_OS_Process *proc;
-
-  char *unix_sock;
-
-  char *port_str;
-
-  unsigned int n_refs;
-};
-
-struct SharedService
-{
-  char *sname;
-
-  struct SharedServiceInstance **instances;
-
-  struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  unsigned int n_peers;
-
-  unsigned int share;
-
-  unsigned int n_instances;
-};
-
-
-/**
- * Handle for a system on which GNUnet peers are executed;
- * a system is used for reserving unique paths and ports.
- */
-struct GNUNET_TESTING_System
-{
-  /**
-   * Prefix (e.g. "/tmp/gnunet-testing/") we prepend to each
-   * GNUNET_HOME.
-   */
-  char *tmppath;
-
-  /**
-   * The trusted ip. Can either be a single ip address or a network address in
-   * CIDR notation.
-   */
-  char *trusted_ip;
-
-  /**
-   * our hostname
-   */
-  char *hostname;
-
-  /**
-   * Hostkeys data, contains "GNUNET_TESTING_HOSTKEYFILESIZE * total_hostkeys" bytes.
-   */
-  char *hostkeys_data;
-
-  /**
-   * memory map for @e hostkeys_data.
-   */
-  struct GNUNET_DISK_MapHandle *map;
-
-  struct SharedService *shared_services;
-
-  unsigned int n_shared_services;
-
-  /**
-   * Bitmap where each port that has already been reserved for some GNUnet peer
-   * is recorded.  Note that we make no distinction between TCP and UDP ports
-   * and test if a port is already in use before assigning it to a peer/service.
-   * If we detect that a port is already in use, we also mark it in this bitmap.
-   * So all the bits that are zero merely indicate ports that MIGHT be available
-   * for peers.
-   */
-  uint32_t reserved_ports[65536 / 32];
-
-  /**
-   * Counter we use to make service home paths unique on this system;
-   * the full path consists of the tmppath and this number.  Each
-   * UNIXPATH for a peer is also modified to include the respective
-   * path counter to ensure uniqueness.  This field is incremented
-   * by one for each configured peer.  Even if peers are destroyed,
-   * we never re-use path counters.
-   */
-  uint32_t path_counter;
-
-  /**
-   * The number of hostkeys
-   */
-  uint32_t total_hostkeys;
-
-  /**
-   * Lowest port we are allowed to use.
-   */
-  uint16_t lowport;
-
-  /**
-   * Highest port we are allowed to use.
-   */
-  uint16_t highport;
-};
-
-
-/**
- * Handle for a GNUnet peer controlled by testing.
- */
-struct GNUNET_TESTING_Peer
-{
-  /**
-   * The TESTING system associated with this peer
-   */
-  struct GNUNET_TESTING_System *system;
-
-  /**
-   * Path to the configuration file for this peer.
-   */
-  char *cfgfile;
-
-  /**
-   * Binary to be executed during 'GNUNET_TESTING_peer_start'.
-   * Typically 'gnunet-service-arm' (but can be set to a
-   * specific service by 'GNUNET_TESTING_service_run' if
-   * necessary).
-   */
-  char *main_binary;
-  char *args;
-
-  /**
-   * Handle to the running binary of the service, NULL if the
-   * peer/service is currently not running.
-   */
-  struct GNUNET_OS_Process *main_process;
-
-  /**
-   * The handle to the peer's ARM service
-   */
-  struct GNUNET_ARM_Handle *ah;
-
-  /**
-   * The config of the peer
-   */
-  struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  /**
-   * The callback to call asynchronously when a peer is stopped
-   */
-  GNUNET_TESTING_PeerStopCallback cb;
-
-  /**
-   * The closure for the above callback
-   */
-  void *cb_cls;
-
-  /**
-   * The cached identity of this peer.  Will be populated on call to
-   * GNUNET_TESTING_peer_get_identity()
-   */
-  struct GNUNET_PeerIdentity *id;
-
-  struct SharedServiceInstance **ss_instances;
-
-  /**
-   * Array of ports currently allocated to this peer.  These ports will be
-   * released upon peer destroy and can be used by other peers which are
-   * configured after.
-   */
-  uint16_t *ports;
-
-  /**
-   * The number of ports in the above array
-   */
-  unsigned int nports;
-
-  /**
-   * The keynumber of this peer's hostkey
-   */
-  uint32_t key_number;
-};
-
-
-/**
- * Testing includes a number of pre-created hostkeys for faster peer
- * startup. This function loads such keys into memory from a file.
- *
- * @param system the testing system handle
- * @return #GNUNET_OK on success; #GNUNET_SYSERR on error
- */
-static enum GNUNET_GenericReturnValue
-hostkeys_load (struct GNUNET_TESTING_System *system)
-{
-  uint64_t fs;
-  char *data_dir;
-  char *filename;
-  struct GNUNET_DISK_FileHandle *fd;
-
-  GNUNET_assert (NULL == system->hostkeys_data);
-  data_dir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR);
-  GNUNET_asprintf (&filename, "%s/testing_hostkeys.ecc", data_dir);
-  GNUNET_free (data_dir);
-
-  if (GNUNET_YES != GNUNET_DISK_file_test (filename))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         _ ("Hostkeys file not found: %s\n"),
-         filename);
-    GNUNET_free (filename);
-    return GNUNET_SYSERR;
-  }
-  /* Check hostkey file size, read entire thing into memory */
-  if (GNUNET_OK !=
-      GNUNET_DISK_file_size (filename, &fs, GNUNET_YES, GNUNET_YES))
-    fs = 0;
-  if (0 == fs)
-  {
-    GNUNET_free (filename);
-    return GNUNET_SYSERR;   /* File is empty */
-  }
-  if (0 != (fs % GNUNET_TESTING_HOSTKEYFILESIZE))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         _ ("Incorrect hostkey file format: %s\n"),
-         filename);
-    GNUNET_free (filename);
-    return GNUNET_SYSERR;
-  }
-  fd = GNUNET_DISK_file_open (filename,
-                              GNUNET_DISK_OPEN_READ,
-                              GNUNET_DISK_PERM_NONE);
-  if (NULL == fd)
-  {
-    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "open", filename);
-    GNUNET_free (filename);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_free (filename);
-  system->hostkeys_data =
-    GNUNET_DISK_file_map (fd, &system->map, GNUNET_DISK_MAP_TYPE_READ, fs);
-  GNUNET_DISK_file_close (fd);
-  if (NULL == system->hostkeys_data)
-    return GNUNET_SYSERR;
-  system->total_hostkeys = fs / GNUNET_TESTING_HOSTKEYFILESIZE;
-  return GNUNET_OK;
-}
-
-
-/**
- * Function to remove the loaded hostkeys
- *
- * @param system the testing system handle
- */
-static void
-hostkeys_unload (struct GNUNET_TESTING_System *system)
-{
-  GNUNET_break (NULL != system->hostkeys_data);
-  system->hostkeys_data = NULL;
-  GNUNET_DISK_file_unmap (system->map);
-  system->map = NULL;
-  system->hostkeys_data = NULL;
-  system->total_hostkeys = 0;
-}
-
-
-/**
- * Function to iterate over options.
- *
- * @param cls closure
- * @param section name of the section
- * @param option name of the option
- * @param value value of the option
- */
-static void
-cfg_copy_iterator (void *cls,
-                   const char *section,
-                   const char *option,
-                   const char *value)
-{
-  struct GNUNET_CONFIGURATION_Handle *cfg2 = cls;
-
-  GNUNET_CONFIGURATION_set_value_string (cfg2, section, option, value);
-}
-
-
-/**
- * Create a system handle.  There must only be one system
- * handle per operating system.
- *
- * @param testdir only the directory name without any path. This is used for
- *          all service homes; the directory will be created in a temporary
- *          location depending on the underlying OS.  This variable will be
- *          overridden with the value of the environmental variable
- *          GNUNET_TESTING_PREFIX, if it exists.
- * @param trusted_ip the ip address which will be set as TRUSTED HOST in all
- *          service configurations generated to allow control connections from
- *          this ip. This can either be a single ip address or a network address
- *          in CIDR notation.
- * @param hostname the hostname of the system we are using for testing; NULL for
- *          localhost
- * @param shared_services NULL terminated array describing services that are to
- *          be shared among peers
- * @param lowport lowest port number this system is allowed to allocate (inclusive)
- * @param highport highest port number this system is allowed to allocate (exclusive)
- * @return handle to this system, NULL on error
- */
-struct GNUNET_TESTING_System *
-GNUNET_TESTING_system_create_with_portrange (
-  const char *testdir,
-  const char *trusted_ip,
-  const char *hostname,
-  const struct GNUNET_TESTING_SharedService *shared_services,
-  uint16_t lowport,
-  uint16_t highport)
-{
-  struct GNUNET_TESTING_System *system;
-  struct GNUNET_TESTING_SharedService tss;
-  struct SharedService ss;
-  unsigned int cnt;
-
-  GNUNET_assert (NULL != testdir);
-  system = GNUNET_new (struct GNUNET_TESTING_System);
-  if (NULL == (system->tmppath = getenv (GNUNET_TESTING_PREFIX)))
-    system->tmppath = GNUNET_DISK_mkdtemp (testdir);
-  else
-    system->tmppath = GNUNET_strdup (system->tmppath);
-  system->lowport = lowport;
-  system->highport = highport;
-  if (NULL == system->tmppath)
-  {
-    GNUNET_free (system);
-    return NULL;
-  }
-  if (NULL != trusted_ip)
-    system->trusted_ip = GNUNET_strdup (trusted_ip);
-  if (NULL != hostname)
-    system->hostname = GNUNET_strdup (hostname);
-  if (GNUNET_OK != hostkeys_load (system))
-  {
-    GNUNET_TESTING_system_destroy (system, GNUNET_YES);
-    return NULL;
-  }
-  if (NULL == shared_services)
-    return system;
-  for (cnt = 0; NULL != shared_services[cnt].service; cnt++)
-  {
-    tss = shared_services[cnt];
-    memset (&ss, 0, sizeof (ss));
-    ss.sname = GNUNET_strdup (tss.service);
-    ss.cfg = GNUNET_CONFIGURATION_create ();
-    GNUNET_CONFIGURATION_iterate_section_values (tss.cfg,
-                                                 ss.sname,
-                                                 &cfg_copy_iterator,
-                                                 ss.cfg);
-    GNUNET_CONFIGURATION_iterate_section_values (tss.cfg,
-                                                 "TESTING",
-                                                 &cfg_copy_iterator,
-                                                 ss.cfg);
-    GNUNET_CONFIGURATION_iterate_section_values (tss.cfg,
-                                                 "PATHS",
-                                                 &cfg_copy_iterator,
-                                                 ss.cfg);
-    ss.share = tss.share;
-    GNUNET_array_append (system->shared_services,
-                         system->n_shared_services,
-                         ss);
-  }
-  return system;
-}
-
-
-/**
- * Create a system handle.  There must only be one system handle per operating
- * system.  Uses a default range for allowed ports.  Ports are still tested for
- * availability.
- *
- * @param testdir only the directory name without any path. This is used for all
- *          service homes; the directory will be created in a temporary location
- *          depending on the underlying OS.  This variable will be
- *          overridden with the value of the environmental variable
- *          GNUNET_TESTING_PREFIX, if it exists.
- * @param trusted_ip the ip address which will be set as TRUSTED HOST in all
- *          service configurations generated to allow control connections from
- *          this ip. This can either be a single ip address or a network address
- *          in CIDR notation.
- * @param hostname the hostname of the system we are using for testing; NULL for
- *          localhost
- * @param shared_services NULL terminated array describing services that are to
- *          be shared among peers
- * @return handle to this system, NULL on error
- */
-struct GNUNET_TESTING_System *
-GNUNET_TESTING_system_create (
-  const char *testdir,
-  const char *trusted_ip,
-  const char *hostname,
-  const struct GNUNET_TESTING_SharedService *shared_services)
-{
-  return GNUNET_TESTING_system_create_with_portrange (testdir,
-                                                      trusted_ip,
-                                                      hostname,
-                                                      shared_services,
-                                                      LOW_PORT,
-                                                      HIGH_PORT);
-}
-
-
-static void
-cleanup_shared_service_instance (struct SharedServiceInstance *i)
-{
-  if (NULL != i->cfg_fn)
-  {
-    (void) unlink (i->cfg_fn);
-    GNUNET_free (i->cfg_fn);
-  }
-  GNUNET_free (i->unix_sock);
-  GNUNET_free (i->port_str);
-  GNUNET_break (NULL == i->proc);
-  GNUNET_break (0 == i->n_refs);
-  GNUNET_free (i);
-}
-
-
-static enum GNUNET_GenericReturnValue
-start_shared_service_instance (struct SharedServiceInstance *i)
-{
-  char *binary;
-  char *libexec_binary;
-
-  GNUNET_assert (NULL == i->proc);
-  GNUNET_assert (NULL != i->cfg_fn);
-  (void) GNUNET_asprintf (&binary, "gnunet-service-%s", i->ss->sname);
-  libexec_binary = GNUNET_OS_get_libexec_binary_path (binary);
-  GNUNET_free (binary);
-  i->proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
-                                     NULL,
-                                     NULL,
-                                     NULL,
-                                     libexec_binary,
-                                     libexec_binary,
-                                     "-c",
-                                     i->cfg_fn,
-                                     NULL);
-  GNUNET_free (libexec_binary);
-  if (NULL == i->proc)
-    return GNUNET_SYSERR;
-  return GNUNET_OK;
-}
-
-
-static void
-stop_shared_service_instance (struct SharedServiceInstance *i)
-{
-  GNUNET_break (0 == i->n_refs);
-  if (0 != GNUNET_OS_process_kill (i->proc, GNUNET_TERM_SIG))
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-         "Killing shared service instance (%s) failed\n",
-         i->ss->sname);
-  (void) GNUNET_OS_process_wait (i->proc);
-  GNUNET_OS_process_destroy (i->proc);
-  i->proc = NULL;
-}
-
-
-/**
- * Free system resources.
- *
- * @param system system to be freed
- * @param remove_paths should the 'testdir' and all subdirectories
- *        be removed (clean up on shutdown)?
- */
-void
-GNUNET_TESTING_system_destroy (struct GNUNET_TESTING_System *system,
-                               int remove_paths)
-{
-  struct SharedService *ss;
-  struct SharedServiceInstance *i;
-  unsigned int ss_cnt;
-  unsigned int i_cnt;
-
-  if (NULL != system->hostkeys_data)
-    hostkeys_unload (system);
-  for (ss_cnt = 0; ss_cnt < system->n_shared_services; ss_cnt++)
-  {
-    ss = &system->shared_services[ss_cnt];
-    for (i_cnt = 0; i_cnt < ss->n_instances; i_cnt++)
-    {
-      i = ss->instances[i_cnt];
-      if (NULL != i->proc)
-        stop_shared_service_instance (i);
-      cleanup_shared_service_instance (i);
-    }
-    GNUNET_free (ss->instances);
-    GNUNET_CONFIGURATION_destroy (ss->cfg);
-    GNUNET_free (ss->sname);
-  }
-  GNUNET_free (system->shared_services);
-  if (GNUNET_YES == remove_paths)
-    GNUNET_DISK_directory_remove (system->tmppath);
-  GNUNET_free (system->tmppath);
-  GNUNET_free (system->trusted_ip);
-  GNUNET_free (system->hostname);
-  GNUNET_free (system);
-}
-
-
-/**
- * Reserve a TCP or UDP port for a peer.
- *
- * @param system system to use for reservation tracking
- * @return 0 if no free port was available
- */
-uint16_t
-GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system)
-{
-  struct GNUNET_NETWORK_Handle *socket;
-  struct addrinfo hint;
-  struct addrinfo *ret;
-  struct addrinfo *ai;
-  uint32_t *port_buckets;
-  char *open_port_str;
-  int bind_status;
-  uint32_t xor_image;
-  uint16_t index;
-  uint16_t open_port;
-  uint16_t pos;
-
-  /*
-     FIXME: Instead of using getaddrinfo we should try to determine the port
-         status by the following heurestics.
-
-         On systems which support both IPv4 and IPv6, only ports open on both
-         address families are considered open.
-         On system with either IPv4 or IPv6. A port is considered open if it's
-         open in the respective address family
-   */hint.ai_family = AF_UNSPEC; /* IPv4 and IPv6 */
-  hint.ai_socktype = 0;
-  hint.ai_protocol = 0;
-  hint.ai_addrlen = 0;
-  hint.ai_addr = NULL;
-  hint.ai_canonname = NULL;
-  hint.ai_next = NULL;
-  hint.ai_flags = AI_PASSIVE | AI_NUMERICSERV; /* Wild card address */
-  port_buckets = system->reserved_ports;
-  for (index = (system->lowport / 32) + 1; index < (system->highport / 32);
-       index++)
-  {
-    xor_image = (UINT32_MAX ^ port_buckets[index]);
-    if (0 == xor_image)   /* Ports in the bucket are full */
-      continue;
-    pos = system->lowport % 32;
-    while (pos < 32)
-    {
-      if (0 == ((xor_image >> pos) & 1U))
-      {
-        pos++;
-        continue;
-      }
-      open_port = (index * 32) + pos;
-      if (open_port >= system->highport)
-        return 0;
-      GNUNET_asprintf (&open_port_str, "%u", (unsigned int) open_port);
-      ret = NULL;
-      GNUNET_assert (0 == getaddrinfo (NULL, open_port_str, &hint, &ret));
-      GNUNET_free (open_port_str);
-      bind_status = GNUNET_NO;
-      for (ai = ret; NULL != ai; ai = ai->ai_next)
-      {
-        socket = GNUNET_NETWORK_socket_create (ai->ai_family, SOCK_STREAM, 0);
-        if (NULL == socket)
-          continue;
-        bind_status =
-          GNUNET_NETWORK_socket_bind (socket, ai->ai_addr, ai->ai_addrlen);
-        GNUNET_NETWORK_socket_close (socket);
-        if (GNUNET_OK != bind_status)
-          break;
-        socket = GNUNET_NETWORK_socket_create (ai->ai_family, SOCK_DGRAM, 0);
-        if (NULL == socket)
-          continue;
-        bind_status =
-          GNUNET_NETWORK_socket_bind (socket, ai->ai_addr, ai->ai_addrlen);
-        GNUNET_NETWORK_socket_close (socket);
-        if (GNUNET_OK != bind_status)
-          break;
-      }
-      port_buckets[index] |= (1U << pos);     /* Set the port bit */
-      freeaddrinfo (ret);
-      if (GNUNET_OK == bind_status)
-      {
-        LOG (GNUNET_ERROR_TYPE_DEBUG,
-             "Found a free port %u\n",
-             (unsigned int) open_port);
-        return open_port;
-      }
-      pos++;
-    }
-  }
-  return 0;
-}
-
-
-/**
- * Release reservation of a TCP or UDP port for a peer
- * (used during #GNUNET_TESTING_peer_destroy()).
- *
- * @param system system to use for reservation tracking
- * @param port reserved port to release
- */
-void
-GNUNET_TESTING_release_port (struct GNUNET_TESTING_System *system,
-                             uint16_t port)
-{
-  uint32_t *port_buckets;
-  uint16_t bucket;
-  uint16_t pos;
-
-  port_buckets = system->reserved_ports;
-  bucket = port / 32;
-  pos = port % 32;
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Releasing port %u\n", port);
-  if (0 == (port_buckets[bucket] & (1U << pos)))
-  {
-    GNUNET_break (0);  /* Port was not reserved by us using reserve_port() */
-    return;
-  }
-  port_buckets[bucket] &= ~(1U << pos);
-}
-
-
-/**
- * Testing includes a number of pre-created hostkeys for
- * faster peer startup.  This function can be used to
- * access the n-th key of those pre-created hostkeys; note
- * that these keys are ONLY useful for testing and not
- * secure as the private keys are part of the public
- * GNUnet source code.
- *
- * This is primarily a helper function used internally
- * by #GNUNET_TESTING_peer_configure.
- *
- * @param system the testing system handle
- * @param key_number desired pre-created hostkey to obtain
- * @param id set to the peer's identity (hash of the public
- *        key; if NULL, NULL is returned immediately
- * @return NULL on error (not enough keys)
- */
-struct GNUNET_CRYPTO_EddsaPrivateKey *
-GNUNET_TESTING_hostkey_get (const struct GNUNET_TESTING_System *system,
-                            uint32_t key_number,
-                            struct GNUNET_PeerIdentity *id)
-{
-  struct GNUNET_CRYPTO_EddsaPrivateKey *private_key;
-
-  if ((NULL == id) || (NULL == system->hostkeys_data))
-    return NULL;
-  if (key_number >= system->total_hostkeys)
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         _ ("Key number %u does not exist\n"),
-         key_number);
-    return NULL;
-  }
-  private_key = GNUNET_new (struct GNUNET_CRYPTO_EddsaPrivateKey);
-  GNUNET_memcpy (private_key,
-                 system->hostkeys_data
-                 + (key_number * GNUNET_TESTING_HOSTKEYFILESIZE),
-                 GNUNET_TESTING_HOSTKEYFILESIZE);
-  GNUNET_CRYPTO_eddsa_key_get_public (private_key, &id->public_key);
-  return private_key;
-}
-
-
-/**
- * Structure for holding data to build new configurations from a configuration
- * template
- */
-struct UpdateContext
-{
-  /**
-   * The system for which we are building configurations
-   */
-  struct GNUNET_TESTING_System *system;
-
-  /**
-   * The configuration we are building
-   */
-  struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  /**
-   * The customized service home path for this peer
-   */
-  char *gnunet_home;
-
-  /**
-   * Array of ports currently allocated to this peer.  These ports will be
-   * released upon peer destroy and can be used by other peers which are
-   * configured after.
-   */
-  uint16_t *ports;
-
-  /**
-   * The number of ports in the above array
-   */
-  unsigned int nports;
-
-  /**
-   * build status - to signal error while building a configuration
-   */
-  int status;
-};
-
-
-/**
- * Function to iterate over options.  Copies
- * the options to the target configuration,
- * updating PORT values as needed.
- *
- * @param cls the UpdateContext
- * @param section name of the section
- * @param option name of the option
- * @param value value of the option
- */
-static void
-update_config (void *cls,
-               const char *section,
-               const char *option,
-               const char *value)
-{
-  struct UpdateContext *uc = cls;
-  unsigned int ival;
-  char cval[12];
-  char uval[PATH_MAX];
-  char *single_variable;
-  char *per_host_variable;
-  unsigned long long num_per_host;
-  uint16_t new_port;
-
-  if (GNUNET_OK != uc->status)
-    return;
-  if (! ((0 == strcmp (option, "PORT")) || (0 == strcmp (option, "UNIXPATH")) ||
-         (0 == strcmp (option, "HOSTNAME"))))
-    return;
-  GNUNET_asprintf (&single_variable, "single_%s_per_host", section);
-  GNUNET_asprintf (&per_host_variable, "num_%s_per_host", section);
-  if ((0 == strcmp (option, "PORT")) && (1 == sscanf (value, "%u", &ival)))
-  {
-    if ((ival != 0) &&
-        (GNUNET_YES != GNUNET_CONFIGURATION_get_value_yesno (uc->cfg,
-                                                             "testing",
-                                                             single_variable)))
-    {
-      new_port = GNUNET_TESTING_reserve_port (uc->system);
-      if (0 == new_port)
-      {
-        uc->status = GNUNET_SYSERR;
-        GNUNET_free (single_variable);
-        GNUNET_free (per_host_variable);
-        return;
-      }
-      GNUNET_snprintf (cval, sizeof(cval), "%u", new_port);
-      value = cval;
-      GNUNET_array_append (uc->ports, uc->nports, new_port);
-    }
-    else if ((ival != 0) &&
-             (GNUNET_YES ==
-              GNUNET_CONFIGURATION_get_value_yesno (uc->cfg,
-                                                    "testing",
-                                                    single_variable)) &&
-             GNUNET_CONFIGURATION_get_value_number (uc->cfg,
-                                                    "testing",
-                                                    per_host_variable,
-                                                    &num_per_host))
-    {
-      /* GNUNET_snprintf (cval, sizeof (cval), "%u", */
-      /*                  ival + ctx->fdnum % num_per_host); */
-      /* value = cval; */
-      GNUNET_break (0);    /* FIXME */
-    }
-  }
-  if (0 == strcmp (option, "UNIXPATH"))
-  {
-    if (GNUNET_YES != GNUNET_CONFIGURATION_get_value_yesno (uc->cfg,
-                                                            "testing",
-                                                            single_variable))
-    {
-      GNUNET_snprintf (uval,
-                       sizeof(uval),
-                       "%s/%s.sock",
-                       uc->gnunet_home,
-                       section);
-      value = uval;
-    }
-    else if ((GNUNET_YES ==
-              GNUNET_CONFIGURATION_get_value_number (uc->cfg,
-                                                     "testing",
-                                                     per_host_variable,
-                                                     &num_per_host)) &&
-             (num_per_host > 0))
-    {
-      GNUNET_break (0);    /* FIXME */
-    }
-  }
-  if (0 == strcmp (option, "HOSTNAME"))
-  {
-    value = (NULL == uc->system->hostname) ? "localhost" : uc->system->hostname;
-  }
-  GNUNET_free (single_variable);
-  GNUNET_free (per_host_variable);
-  GNUNET_CONFIGURATION_set_value_string (uc->cfg, section, option, value);
-}
-
-
-/**
- * Section iterator to set ACCEPT_FROM/ACCEPT_FROM6 to include the address of
- * 'trusted_hosts' in all sections
- *
- * @param cls the UpdateContext
- * @param section name of the section
- */
-static void
-update_config_sections (void *cls, const char *section)
-{
-  struct UpdateContext *uc = cls;
-  char **ikeys;
-  char *val;
-  char *ptr;
-  char *orig_allowed_hosts;
-  char *allowed_hosts;
-  char *ACCEPT_FROM_key;
-  uint16_t ikeys_cnt;
-  uint16_t key;
-
-  ikeys_cnt = 0;
-  val = NULL;
-  /* Ignore certain options from sections.  See
-     https://gnunet.org/bugs/view.php?id=2476 */
-  if (GNUNET_YES ==
-      GNUNET_CONFIGURATION_have_value (uc->cfg, section, "TESTING_IGNORE_KEYS"))
-  {
-    GNUNET_assert (GNUNET_YES ==
-                   GNUNET_CONFIGURATION_get_value_string (uc->cfg,
-                                                          section,
-                                                          "TESTING_IGNORE_KEYS",
-                                                          &val));
-    ptr = val;
-    for (ikeys_cnt = 0; NULL != (ptr = strstr (ptr, ";")); ikeys_cnt++)
-      ptr++;
-    if (0 == ikeys_cnt)
-      GNUNET_break (0);
-    else
-    {
-      ikeys = GNUNET_malloc ((sizeof(char *)) * ikeys_cnt);
-      ptr = val;
-      for (key = 0; key < ikeys_cnt; key++)
-      {
-        ikeys[key] = ptr;
-        ptr = strstr (ptr, ";");
-        GNUNET_assert (NULL != ptr);      /* worked just before... */
-        *ptr = '\0';
-        ptr++;
-      }
-    }
-  }
-  if (0 != ikeys_cnt)
-  {
-    for (key = 0; key < ikeys_cnt; key++)
-    {
-      if (NULL != strstr (ikeys[key], "ADVERTISED_PORT"))
-        break;
-    }
-    if ((key == ikeys_cnt) &&
-        (GNUNET_YES ==
-         GNUNET_CONFIGURATION_have_value (uc->cfg, section, "ADVERTISED_PORT")))
-    {
-      if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (uc->cfg,
-                                                              section,
-                                                              "PORT",
-                                                              &ptr))
-      {
-        GNUNET_CONFIGURATION_set_value_string (uc->cfg,
-                                               section,
-                                               "ADVERTISED_PORT",
-                                               ptr);
-        GNUNET_free (ptr);
-      }
-    }
-    for (key = 0; key < ikeys_cnt; key++)
-    {
-      if (NULL != strstr (ikeys[key], "ACCEPT_FROM"))
-      {
-        GNUNET_free (ikeys);
-        GNUNET_free (val);
-        return;
-      }
-    }
-    GNUNET_free (ikeys);
-  }
-  GNUNET_free (val);
-  ACCEPT_FROM_key = "ACCEPT_FROM";
-  if ((NULL != uc->system->trusted_ip) &&
-      (NULL != strstr (uc->system->trusted_ip, ":"))) /* IPv6 in use */
-    ACCEPT_FROM_key = "ACCEPT_FROM6";
-  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (uc->cfg,
-                                                          section,
-                                                          ACCEPT_FROM_key,
-                                                          &orig_allowed_hosts))
-  {
-    orig_allowed_hosts = GNUNET_strdup ("127.0.0.1;");
-  }
-  if (NULL == uc->system->trusted_ip)
-    allowed_hosts = GNUNET_strdup (orig_allowed_hosts);
-  else
-    GNUNET_asprintf (&allowed_hosts,
-                     "%s%s;",
-                     orig_allowed_hosts,
-                     uc->system->trusted_ip);
-  GNUNET_free (orig_allowed_hosts);
-  GNUNET_CONFIGURATION_set_value_string (uc->cfg,
-                                         section,
-                                         ACCEPT_FROM_key,
-                                         allowed_hosts);
-  GNUNET_free (allowed_hosts);
-}
-
-
-static struct SharedServiceInstance *
-associate_shared_service (struct GNUNET_TESTING_System *system,
-                          struct SharedService *ss,
-                          struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  struct SharedServiceInstance *i;
-  struct GNUNET_CONFIGURATION_Handle *temp;
-  char *gnunet_home;
-  uint32_t port;
-
-  ss->n_peers++;
-  if (((0 == ss->share) && (NULL == ss->instances)) ||
-      ((0 != ss->share) &&
-       (ss->n_instances < ((ss->n_peers + ss->share - 1) / ss->share))))
-  {
-    i = GNUNET_new (struct SharedServiceInstance);
-    i->ss = ss;
-    (void) GNUNET_asprintf (&gnunet_home,
-                            "%s/shared/%s/%u",
-                            system->tmppath,
-                            ss->sname,
-                            ss->n_instances);
-    (void) GNUNET_asprintf (&i->unix_sock, "%s/sock", gnunet_home);
-    port = GNUNET_TESTING_reserve_port (system);
-    if (0 == port)
-    {
-      GNUNET_free (gnunet_home);
-      cleanup_shared_service_instance (i);
-      return NULL;
-    }
-    GNUNET_array_append (ss->instances, ss->n_instances, i);
-    temp = GNUNET_CONFIGURATION_dup (ss->cfg);
-    (void) GNUNET_asprintf (&i->port_str, "%u", port);
-    (void) GNUNET_asprintf (&i->cfg_fn, "%s/config", gnunet_home);
-    GNUNET_CONFIGURATION_set_value_string (temp,
-                                           "PATHS",
-                                           "GNUNET_HOME",
-                                           gnunet_home);
-    GNUNET_free (gnunet_home);
-    GNUNET_CONFIGURATION_set_value_string (temp,
-                                           ss->sname,
-                                           "UNIXPATH",
-                                           i->unix_sock);
-    GNUNET_CONFIGURATION_set_value_string (temp,
-                                           ss->sname,
-                                           "PORT",
-                                           i->port_str);
-    if (GNUNET_SYSERR == GNUNET_CONFIGURATION_write (temp, i->cfg_fn))
-    {
-      GNUNET_CONFIGURATION_destroy (temp);
-      cleanup_shared_service_instance (i);
-      return NULL;
-    }
-    GNUNET_CONFIGURATION_destroy (temp);
-  }
-  else
-  {
-    GNUNET_assert (NULL != ss->instances);
-    GNUNET_assert (0 < ss->n_instances);
-    i = ss->instances[ss->n_instances - 1];
-  }
-  GNUNET_CONFIGURATION_iterate_section_values (ss->cfg,
-                                               ss->sname,
-                                               &cfg_copy_iterator,
-                                               cfg);
-  GNUNET_CONFIGURATION_set_value_string (cfg,
-                                         ss->sname,
-                                         "UNIXPATH",
-                                         i->unix_sock);
-  GNUNET_CONFIGURATION_set_value_string (cfg, ss->sname, "PORT", i->port_str);
-  return i;
-}
-
-
-/**
- * Create a new configuration using the given configuration as a template;
- * ports and paths will be modified to select available ports on the local
- * system. The default configuration will be available in PATHS section under
- * the option DEFAULTCONFIG after the call. GNUNET_HOME is also set in PATHS
- * section to the temporary directory specific to this configuration. If we run
- * out of "*port" numbers, return #GNUNET_SYSERR.
- *
- * This is primarily a helper function used internally
- * by 'GNUNET_TESTING_peer_configure'.
- *
- * @param system system to use to coordinate resource usage
- * @param cfg template configuration to update
- * @param ports array with port numbers used in the created configuration.
- *          Will be updated upon successful return.  Can be NULL
- * @param nports the size of the `ports' array.  Will be updated.
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on error - the configuration will
- *           be incomplete and should not be used there upon
- */
-static int
-GNUNET_TESTING_configuration_create_ (struct GNUNET_TESTING_System *system,
-                                      struct GNUNET_CONFIGURATION_Handle *cfg,
-                                      uint16_t **ports,
-                                      unsigned int *nports)
-{
-  struct UpdateContext uc;
-  char *default_config;
-
-  uc.system = system;
-  uc.cfg = cfg;
-  uc.status = GNUNET_OK;
-  uc.ports = NULL;
-  uc.nports = 0;
-  GNUNET_asprintf (&uc.gnunet_home,
-                   "%s/%u",
-                   system->tmppath,
-                   system->path_counter++);
-  GNUNET_asprintf (&default_config, "%s/config", uc.gnunet_home);
-  GNUNET_CONFIGURATION_set_value_string (cfg,
-                                         "PATHS",
-                                         "DEFAULTCONFIG",
-                                         default_config);
-  GNUNET_CONFIGURATION_set_value_string (cfg, "arm", "CONFIG", default_config);
-  GNUNET_free (default_config);
-  GNUNET_CONFIGURATION_set_value_string (cfg,
-                                         "PATHS",
-                                         "GNUNET_HOME",
-                                         uc.gnunet_home);
-  /* make PORTs and UNIXPATHs unique */
-  GNUNET_CONFIGURATION_iterate (cfg, &update_config, &uc);
-  /* allow connections to services from system trusted_ip host */
-  GNUNET_CONFIGURATION_iterate_sections (cfg, &update_config_sections, &uc);
-  /* enable loopback-based connections between peers */
-  GNUNET_CONFIGURATION_set_value_string (cfg, "nat", "USE_LOCALADDR", "YES");
-  GNUNET_free (uc.gnunet_home);
-  if ((NULL != ports) && (NULL != nports))
-  {
-    *ports = uc.ports;
-    *nports = uc.nports;
-  }
-  else
-    GNUNET_free (uc.ports);
-  return uc.status;
-}
-
-
-/**
- * Create a new configuration using the given configuration as a template;
- * ports and paths will be modified to select available ports on the local
- * system. The default configuration will be available in PATHS section under
- * the option DEFAULTCONFIG after the call. GNUNET_HOME is also set in PATHS
- * section to the temporary directory specific to this configuration. If we run
- * out of "*port" numbers, return #GNUNET_SYSERR.
- *
- * This is primarily a helper function used internally
- * by #GNUNET_TESTING_peer_configure().
- *
- * @param system system to use to coordinate resource usage
- * @param cfg template configuration to update
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on error - the configuration will
- *           be incomplete and should not be used there upon
- */
-int
-GNUNET_TESTING_configuration_create (struct GNUNET_TESTING_System *system,
-                                     struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  return GNUNET_TESTING_configuration_create_ (system, cfg, NULL, NULL);
-}
-
-
-/**
- * Configure a GNUnet peer.  GNUnet must be installed on the local
- * system and available in the PATH.
- *
- * @param system system to use to coordinate resource usage
- * @param cfg configuration to use; will be UPDATED (to reflect needed
- *            changes in port numbers and paths)
- * @param key_number number of the hostkey to use for the peer
- * @param id identifier for the daemon, will be set, can be NULL
- * @param emsg set to freshly allocated error message (set to NULL on success),
- *          can be NULL
- * @return handle to the peer, NULL on error
- */
-struct GNUNET_TESTING_Peer *
-GNUNET_TESTING_peer_configure (struct GNUNET_TESTING_System *system,
-                               struct GNUNET_CONFIGURATION_Handle *cfg,
-                               uint32_t key_number,
-                               struct GNUNET_PeerIdentity *id,
-                               char **emsg)
-{
-  struct GNUNET_TESTING_Peer *peer;
-  struct GNUNET_DISK_FileHandle *fd;
-  char *hostkey_filename;
-  char *config_filename;
-  char *libexec_binary;
-  char *emsg_;
-  struct GNUNET_CRYPTO_EddsaPrivateKey *pk;
-  uint16_t *ports;
-  struct SharedService *ss;
-  struct SharedServiceInstance **ss_instances;
-  unsigned int cnt;
-  unsigned int nports;
-
-  ports = NULL;
-  nports = 0;
-  ss_instances = NULL;
-  if (NULL != emsg)
-    *emsg = NULL;
-  if (key_number >= system->total_hostkeys)
-  {
-    GNUNET_asprintf (
-      &emsg_,
-      _ (
-        "You attempted to create a testbed with more than %u hosts.  Please precompute more hostkeys first.\n"),
-      (unsigned int) system->total_hostkeys);
-    goto err_ret;
-  }
-  pk = NULL;
-  if ((NULL != id) &&
-      (NULL == (pk = GNUNET_TESTING_hostkey_get (system, key_number, id))))
-  {
-    GNUNET_asprintf (&emsg_,
-                     _ ("Failed to initialize hostkey for peer %u\n"),
-                     (unsigned int) key_number);
-    goto err_ret;
-  }
-  if (NULL != pk)
-    GNUNET_free (pk);
-  if (GNUNET_NO == GNUNET_CONFIGURATION_have_value (cfg, "PEER", "PRIVATE_KEY"))
-  {
-    GNUNET_asprintf (
-      &emsg_,
-      _ ("PRIVATE_KEY option in PEER section missing in configuration\n"));
-    goto err_ret;
-  }
-  /* Remove sections for shared services */
-  for (cnt = 0; cnt < system->n_shared_services; cnt++)
-  {
-    ss = &system->shared_services[cnt];
-    GNUNET_CONFIGURATION_remove_section (cfg, ss->sname);
-  }
-  if (GNUNET_OK !=
-      GNUNET_TESTING_configuration_create_ (system, cfg, &ports, &nports))
-  {
-    GNUNET_asprintf (&emsg_,
-                     _ ("Failed to create configuration for peer "
-                        "(not enough free ports?)\n"));
-    goto err_ret;
-  }
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CONFIGURATION_get_value_filename (cfg,
-                                                          "PEER",
-                                                          "PRIVATE_KEY",
-                                                          &hostkey_filename));
-  fd = GNUNET_DISK_file_open (hostkey_filename,
-                              GNUNET_DISK_OPEN_CREATE | GNUNET_DISK_OPEN_WRITE,
-                              GNUNET_DISK_PERM_USER_READ
-                              | GNUNET_DISK_PERM_USER_WRITE);
-  if (NULL == fd)
-  {
-    GNUNET_asprintf (&emsg_,
-                     _ ("Cannot open hostkey file `%s': %s\n"),
-                     hostkey_filename,
-                     strerror (errno));
-    GNUNET_free (hostkey_filename);
-    goto err_ret;
-  }
-  GNUNET_free (hostkey_filename);
-  if (GNUNET_TESTING_HOSTKEYFILESIZE !=
-      GNUNET_DISK_file_write (fd,
-                              system->hostkeys_data
-                              + (key_number * GNUNET_TESTING_HOSTKEYFILESIZE),
-                              GNUNET_TESTING_HOSTKEYFILESIZE))
-  {
-    GNUNET_asprintf (&emsg_,
-                     _ ("Failed to write hostkey file for peer %u: %s\n"),
-                     (unsigned int) key_number,
-                     strerror (errno));
-    GNUNET_DISK_file_close (fd);
-    goto err_ret;
-  }
-  GNUNET_DISK_file_close (fd);
-  ss_instances = GNUNET_new_array (system->n_shared_services,
-                                   struct SharedServiceInstance*);
-  for (cnt = 0; cnt < system->n_shared_services; cnt++)
-  {
-    ss = &system->shared_services[cnt];
-    ss_instances[cnt] = associate_shared_service (system, ss, cfg);
-    if (NULL == ss_instances[cnt])
-    {
-      emsg_ = GNUNET_strdup ("FIXME");
-      goto err_ret;
-    }
-  }
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CONFIGURATION_get_value_filename (cfg,
-                                                          "PATHS",
-                                                          "DEFAULTCONFIG",
-                                                          &config_filename));
-  if (GNUNET_OK != GNUNET_CONFIGURATION_write (cfg, config_filename))
-  {
-    GNUNET_asprintf (&emsg_,
-                     _ (
-                       "Failed to write configuration file `%s' for peer %u: %s\n"),
-                     config_filename,
-                     (unsigned int) key_number,
-                     strerror (errno));
-    GNUNET_free (config_filename);
-    goto err_ret;
-  }
-  peer = GNUNET_new (struct GNUNET_TESTING_Peer);
-  peer->ss_instances = ss_instances;
-  peer->cfgfile = config_filename; /* Free in peer_destroy */
-  peer->cfg = GNUNET_CONFIGURATION_dup (cfg);
-  libexec_binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm");
-  if (GNUNET_SYSERR ==
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             "arm",
-                                             "PREFIX",
-                                             &peer->main_binary))
-  {
-    /* No prefix */
-    GNUNET_asprintf (&peer->main_binary, "%s", libexec_binary);
-    peer->args = GNUNET_strdup ("");
-  }
-  else
-  {
-    peer->args = GNUNET_strdup (libexec_binary);
-  }
-  peer->system = system;
-  peer->key_number = key_number;
-  GNUNET_free (libexec_binary);
-  peer->ports = ports; /* Free in peer_destroy */
-  peer->nports = nports;
-  return peer;
-
-err_ret:
-  GNUNET_free (ss_instances);
-  GNUNET_free (ports);
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s", emsg_);
-  if (NULL != emsg)
-    *emsg = emsg_;
-  else
-    GNUNET_free (emsg_);
-  return NULL;
-}
-
-
-/**
- * Obtain the peer identity from a peer handle.
- *
- * @param peer peer handle for which we want the peer's identity
- * @param id identifier for the daemon, will be set
- */
-void
-GNUNET_TESTING_peer_get_identity (struct GNUNET_TESTING_Peer *peer,
-                                  struct GNUNET_PeerIdentity *id)
-{
-  if (NULL != peer->id)
-  {
-    GNUNET_memcpy (id, peer->id, sizeof(struct GNUNET_PeerIdentity));
-    return;
-  }
-  peer->id = GNUNET_new (struct GNUNET_PeerIdentity);
-  GNUNET_free_nz (
-    GNUNET_TESTING_hostkey_get (peer->system, peer->key_number, peer->id));
-  GNUNET_memcpy (id, peer->id, sizeof(struct GNUNET_PeerIdentity));
-}
-
-
-/**
- * Start the peer.
- *
- * @param peer peer to start
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on error (i.e. peer already running)
- */
-int
-GNUNET_TESTING_peer_start (struct GNUNET_TESTING_Peer *peer)
-{
-  struct SharedServiceInstance *i;
-  unsigned int cnt;
-
-  if (NULL != peer->main_process)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  GNUNET_assert (NULL != peer->cfgfile);
-  for (cnt = 0; cnt < peer->system->n_shared_services; cnt++)
-  {
-    i = peer->ss_instances[cnt];
-    if ((0 == i->n_refs) &&
-        (GNUNET_SYSERR == start_shared_service_instance (i)))
-      return GNUNET_SYSERR;
-    i->n_refs++;
-  }
-  peer->main_binary =
-    GNUNET_CONFIGURATION_expand_dollar (peer->cfg, peer->main_binary);
-  peer->main_process =
-    GNUNET_OS_start_process_s (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
-                               NULL,
-                               peer->main_binary,
-                               peer->args,
-                               "-c",
-                               peer->cfgfile,
-                               NULL);
-  if (NULL == peer->main_process)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _ ("Failed to start `%s': %s\n"),
-                peer->main_binary,
-                strerror (errno));
-    return GNUNET_SYSERR;
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Sends SIGTERM to the peer's main process
- *
- * @param peer the handle to the peer
- * @return #GNUNET_OK if successful; #GNUNET_SYSERR if the main process is NULL
- *           or upon any error while sending SIGTERM
- */
-int
-GNUNET_TESTING_peer_kill (struct GNUNET_TESTING_Peer *peer)
-{
-  struct SharedServiceInstance *i;
-  unsigned int cnt;
-
-  if (NULL == peer->main_process)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  if (0 != GNUNET_OS_process_kill (peer->main_process, GNUNET_TERM_SIG))
-    return GNUNET_SYSERR;
-  for (cnt = 0; cnt < peer->system->n_shared_services; cnt++)
-  {
-    i = peer->ss_instances[cnt];
-    GNUNET_assert (0 != i->n_refs);
-    i->n_refs--;
-    if (0 == i->n_refs)
-      stop_shared_service_instance (i);
-  }
-  return GNUNET_OK;
-}
-
-
-/**
- * Waits for a peer to terminate. The peer's main process will also be destroyed.
- *
- * @param peer the handle to the peer
- * @return #GNUNET_OK if successful; #GNUNET_SYSERR if the main process is NULL
- *           or upon any error while waiting
- */
-int
-GNUNET_TESTING_peer_wait (struct GNUNET_TESTING_Peer *peer)
-{
-  int ret;
-
-  if (NULL == peer->main_process)
-  {
-    GNUNET_break (0);
-    return GNUNET_SYSERR;
-  }
-  ret = GNUNET_OS_process_wait (peer->main_process);
-  GNUNET_OS_process_destroy (peer->main_process);
-  peer->main_process = NULL;
-  return ret;
-}
-
-
-/**
- * Stop the peer.
- *
- * @param peer peer to stop
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
- */
-int
-GNUNET_TESTING_peer_stop (struct GNUNET_TESTING_Peer *peer)
-{
-  if (GNUNET_SYSERR == GNUNET_TESTING_peer_kill (peer))
-    return GNUNET_SYSERR;
-  if (GNUNET_SYSERR == GNUNET_TESTING_peer_wait (peer))
-    return GNUNET_SYSERR;
-  return GNUNET_OK;
-}
-
-
-/**
- * Function called whenever we connect to or disconnect from ARM.
- *
- * @param cls closure
- * @param connected #GNUNET_YES if connected, #GNUNET_NO if disconnected,
- *                  #GNUNET_SYSERR on error.
- */
-static void
-disconn_status (void *cls, int connected)
-{
-  struct GNUNET_TESTING_Peer *peer = cls;
-
-  if (GNUNET_SYSERR == connected)
-  {
-    peer->cb (peer->cb_cls, peer, connected);
-    return;
-  }
-  if (GNUNET_YES == connected)
-  {
-    GNUNET_break (GNUNET_OK == GNUNET_TESTING_peer_kill (peer));
-    return;
-  }
-  GNUNET_break (GNUNET_OK == GNUNET_TESTING_peer_wait (peer));
-  GNUNET_ARM_disconnect (peer->ah);
-  peer->ah = NULL;
-  peer->cb (peer->cb_cls, peer, GNUNET_YES);
-}
-
-
-int
-GNUNET_TESTING_peer_stop_async (struct GNUNET_TESTING_Peer *peer,
-                                GNUNET_TESTING_PeerStopCallback cb,
-                                void *cb_cls)
-{
-  if (NULL == peer->main_process)
-    return GNUNET_SYSERR;
-  peer->ah = GNUNET_ARM_connect (peer->cfg, &disconn_status, peer);
-  if (NULL == peer->ah)
-    return GNUNET_SYSERR;
-  peer->cb = cb;
-  peer->cb_cls = cb_cls;
-  return GNUNET_OK;
-}
-
-
-/**
- * Cancel a previous asynchronous peer stop request.
- * GNUNET_TESTING_peer_stop_async() should have been called before on the given
- * peer.  It is an error to call this function if the peer stop callback was
- * already called
- *
- * @param peer the peer on which GNUNET_TESTING_peer_stop_async() was called
- *          before.
- */
-void
-GNUNET_TESTING_peer_stop_async_cancel (struct GNUNET_TESTING_Peer *peer)
-{
-  GNUNET_assert (NULL != peer->ah);
-  GNUNET_ARM_disconnect (peer->ah);
-  peer->ah = NULL;
-}
-
-
-/**
- * Destroy the peer.  Releases resources locked during peer configuration.
- * If the peer is still running, it will be stopped AND a warning will be
- * printed (users of the API should stop the peer explicitly first).
- *
- * @param peer peer to destroy
- */
-void
-GNUNET_TESTING_peer_destroy (struct GNUNET_TESTING_Peer *peer)
-{
-  unsigned int cnt;
-
-  if (NULL != peer->main_process)
-    GNUNET_TESTING_peer_stop (peer);
-  if (NULL != peer->ah)
-    GNUNET_ARM_disconnect (peer->ah);
-  GNUNET_free (peer->cfgfile);
-  if (NULL != peer->cfg)
-    GNUNET_CONFIGURATION_destroy (peer->cfg);
-  GNUNET_free (peer->main_binary);
-  GNUNET_free (peer->args);
-  GNUNET_free (peer->id);
-  GNUNET_free (peer->ss_instances);
-  if (NULL != peer->ports)
-  {
-    for (cnt = 0; cnt < peer->nports; cnt++)
-      GNUNET_TESTING_release_port (peer->system, peer->ports[cnt]);
-    GNUNET_free (peer->ports);
-  }
-  GNUNET_free (peer);
-}
-
-
-int
-GNUNET_TESTING_peer_run (const char *testdir,
-                         const char *cfgfilename,
-                         GNUNET_TESTING_TestMain tm,
-                         void *tm_cls)
-{
-  return GNUNET_TESTING_service_run (testdir, "arm", cfgfilename, tm, tm_cls);
-}
-
-
-/**
- * Structure for holding service data
- */
-struct ServiceContext
-{
-  /**
-   * The configuration of the peer in which the service is run
-   */
-  const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-  /**
-   * Callback to signal service startup
-   */
-  GNUNET_TESTING_TestMain tm;
-
-  /**
-   * The peer in which the service is run.
-   */
-  struct GNUNET_TESTING_Peer *peer;
-
-  /**
-   * Closure for the above callback
-   */
-  void *tm_cls;
-};
-
-
-/**
- * Callback to be called when SCHEDULER has been started
- *
- * @param cls the ServiceContext
- */
-static void
-service_run_main (void *cls)
-{
-  struct ServiceContext *sc = cls;
-
-  sc->tm (sc->tm_cls, sc->cfg, sc->peer);
-}
-
-
-int
-GNUNET_TESTING_service_run (const char *testdir,
-                            const char *service_name,
-                            const char *cfgfilename,
-                            GNUNET_TESTING_TestMain tm,
-                            void *tm_cls)
-{
-  struct ServiceContext sc;
-  struct GNUNET_TESTING_System *system;
-  struct GNUNET_TESTING_Peer *peer;
-  struct GNUNET_CONFIGURATION_Handle *cfg;
-  char *binary;
-  char *libexec_binary;
-
-  GNUNET_log_setup (testdir, "WARNING", NULL);
-  system = GNUNET_TESTING_system_create (testdir, "127.0.0.1", NULL, NULL);
-  if (NULL == system)
-    return 1;
-  cfg = GNUNET_CONFIGURATION_create ();
-  if (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg, cfgfilename))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         _ ("Failed to load configuration from %s\n"),
-         cfgfilename);
-    GNUNET_CONFIGURATION_destroy (cfg);
-    GNUNET_TESTING_system_destroy (system, GNUNET_YES);
-    return 1;
-  }
-  peer = GNUNET_TESTING_peer_configure (system, cfg, 0, NULL, NULL);
-  if (NULL == peer)
-  {
-    GNUNET_CONFIGURATION_destroy (cfg);
-    hostkeys_unload (system);
-    GNUNET_TESTING_system_destroy (system, GNUNET_YES);
-    return 1;
-  }
-  GNUNET_free (peer->main_binary);
-  GNUNET_free (peer->args);
-  GNUNET_asprintf (&binary, "gnunet-service-%s", service_name);
-  libexec_binary = GNUNET_OS_get_libexec_binary_path (binary);
-  if (GNUNET_SYSERR ==
-      GNUNET_CONFIGURATION_get_value_string (cfg,
-                                             service_name,
-                                             "PREFIX",
-                                             &peer->main_binary))
-  {
-    /* No prefix */
-    GNUNET_asprintf (&peer->main_binary, "%s", libexec_binary);
-    peer->args = GNUNET_strdup ("");
-  }
-  else
-    peer->args = GNUNET_strdup (libexec_binary);
-
-  GNUNET_free (libexec_binary);
-  GNUNET_free (binary);
-  if (GNUNET_OK != GNUNET_TESTING_peer_start (peer))
-  {
-    GNUNET_TESTING_peer_destroy (peer);
-    GNUNET_CONFIGURATION_destroy (cfg);
-    GNUNET_TESTING_system_destroy (system, GNUNET_YES);
-    return 1;
-  }
-  sc.cfg = cfg;
-  sc.tm = tm;
-  sc.tm_cls = tm_cls;
-  sc.peer = peer;
-  GNUNET_SCHEDULER_run (&service_run_main, &sc);  /* Scheduler loop */
-  if ((NULL != peer->main_process) &&
-      (GNUNET_OK != GNUNET_TESTING_peer_stop (peer)))
-  {
-    GNUNET_TESTING_peer_destroy (peer);
-    GNUNET_CONFIGURATION_destroy (cfg);
-    GNUNET_TESTING_system_destroy (system, GNUNET_YES);
-    return 1;
-  }
-  GNUNET_TESTING_peer_destroy (peer);
-  GNUNET_CONFIGURATION_destroy (cfg);
-  GNUNET_TESTING_system_destroy (system, GNUNET_YES);
-  return 0;
-}
-
-
-/**
- * Every line in the topology configuration starts with a string indicating which
- * kind of information will be configured with this line. Configuration values following
- * this string are seperated by special sequences of characters. An integer value seperated
- * by ':' is returned by this function.
- *
- * @param line The line of configuration.
- * @return An integer value.
- */
-static unsigned int
-get_first_value (const char *line)
-{
-  char *copy;
-  size_t slen;
-  char *token;
-  unsigned int ret;
-  char *rest = NULL;
-
-  slen = strlen (line) + 1;
-  copy = GNUNET_malloc (slen);
-  memcpy (copy, line, slen);
-  token = strtok_r (copy, ":", &rest);
-  token = strtok_r (NULL, ":", &rest);
-  GNUNET_assert (1 == sscanf (token, "%u", &ret));
-  GNUNET_free (copy);
-  return ret;
-}
-
-
-/**
- * Every line in the topology configuration starts with a string indicating which
- * kind of information will be configured with this line. This string is returned by this function.
- *
- * @param line The line of configuration.
- * @return The leading string of this configuration line.
- */
-static char *
-get_key (const char *line)
-{
-  char *copy;
-  size_t slen;
-  size_t tlen;
-  char *token;
-  char *ret;
-  char *rest = NULL;
-
-  slen = strlen (line) + 1;
-  copy = GNUNET_malloc (slen);
-  memcpy (copy, line, slen);
-  token = strtok_r (copy, ":", &rest);
-  tlen = strlen (token) + 1;
-  ret = GNUNET_malloc (tlen);
-  memcpy (ret, token, tlen);
-  GNUNET_free (copy);
-  return ret;
-}
-
-
-/**
- * Every line in the topology configuration starts with a string indicating which
- * kind of information will be configured with this line. Configuration values following
- * this string are seperated by special sequences of characters. A string value seperated
- * by ':' is returned by this function.
- *
- * @param line The line of configuration.
- * @return A string value.
- */
-static char *
-get_first_string_value (const char *line)
-{
-  char *copy;
-  size_t slen, slen_token;
-  char *token;
-  char *ret;
-  char *rest = NULL;
-
-  slen = strlen (line) + 1;
-  copy = GNUNET_malloc (slen);
-  memcpy (copy, line, slen);
-  token = strtok_r (copy, ":", &rest);
-  token = strtok_r (NULL, ":", &rest);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "first token %s\n",
-       token);
-  slen_token = strlen (token);
-  ret = GNUNET_malloc (slen_token + 1);
-  memcpy (ret, token, slen_token + 1);
-  GNUNET_free (copy);
-  return ret;
-}
-
-
-/**
- * Every line in the topology configuration starts with a string indicating which
- * kind of information will be configured with this line. Configuration values following
- * this string are seperated by special sequences of characters. A second integer value
- * seperated by ':' from a first value is returned by this function.
- *
- * @param line The line of configuration.
- * @return An integer value.
- */
-static unsigned int
-get_second_value (const char *line)
-{
-  char *copy;
-  char *token;
-  unsigned int ret;
-  char *rest = NULL;
-
-  copy = GNUNET_strdup (line);
-  token = strtok_r (copy, ":", &rest);
-  token = strtok_r (NULL, ":", &rest);
-  token = strtok_r (NULL, ":", &rest);
-  LOG (GNUNET_ERROR_TYPE_ERROR,
-       "Format error in configuration line: %s\n",
-       line);
-  GNUNET_assert (1 == sscanf (token, "%u", &ret));
-  GNUNET_free (copy);
-  return ret;
-}
-
-
-/**
- * Every line in the topology configuration starts with a string indicating which
- * kind of information will be configured with this line. Configuration values following
- * this string are seperated by special sequences of characters. A value might be
- * a key value pair.
- * This function returns the value for a specific key in a configuration line.
- *
- * @param key The key of the key value pair.
- * @return The value of the key value pair.
- */
-static char *
-get_value (const char *key, const char *line)
-{
-  char copy[strlen (line) + 1];
-  size_t slen;
-  char *token;
-  char *token2;
-  char *temp;
-  char *rest = NULL;
-
-  slen = strlen (line) + 1;
-  memcpy (copy, line, slen);
-  temp = strstr (copy, key);
-  if (NULL == temp)
-    return NULL;
-  token = strtok_r (temp, ":", &rest);
-  if (NULL == token)
-    return NULL;
-  token = strtok_r (NULL, ":", &rest);
-  if (NULL == token)
-    return NULL;
-  token2 = strtok_r (token, "}", &rest);
-  if (NULL == token2)
-    return NULL;
-  return GNUNET_strdup (token2);
-}
-
-
-/**
- * Every line in the topology configuration starts with a string indicating which
- * kind of information will be configured with this line. Configuration values following
- * this string are seperated by special sequences of characters. A value might be
- * a key value pair. A special key is the 'connect' key which can appear more than once.
- * The value is the information about a connection via some protocol to some other node.
- * This function returns the struct GNUNET_TESTING_NodeConnection which holds the information
- * of the connect value.
- *
- * @param value The value of the connect key value pair.
- * @return The struct GNUNET_TESTING_NodeConnection.
- */
-static struct GNUNET_TESTING_NodeConnection *
-get_connect_value (const char *line,
-                   struct GNUNET_TESTING_NetjailNode *node)
-{
-  struct GNUNET_TESTING_NodeConnection *node_connection;
-  char *copy;
-  char *token;
-  char *token2;
-  unsigned int node_n;
-  unsigned int namespace_n;
-  char *rest = NULL;
-  char *rest2 = NULL;
-  struct GNUNET_TESTING_AddressPrefix *prefix;
-  unsigned int sscanf_ret;
-
-  node_connection = GNUNET_new (struct GNUNET_TESTING_NodeConnection);
-  node_connection->node = node;
-
-  copy = GNUNET_strdup (line);
-  token = strtok_r (copy, ":", &rest);
-  if (0 == strcmp ("{K", token))
-  {
-    node_connection->node_type = GNUNET_TESTING_GLOBAL_NODE;
-    token = strtok_r (NULL, ":", &rest);
-    GNUNET_assert (1 == sscanf (token, "%u", &node_n));
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "node_n %u\n",
-         node_n);
-    node_connection->node_n = node_n;
-    node_connection->namespace_n = 0;
-  }
-  else if (0 == strcmp ("{P", token))
-  {
-    node_connection->node_type = GNUNET_TESTING_SUBNET_NODE;
-    token = strtok_r (NULL, ":", &rest);
-    errno = 0;
-    sscanf_ret = sscanf (token, "%u", &namespace_n);
-    if (errno != 0)
-    {
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "sscanf");
-    }
-    GNUNET_assert (0 < sscanf_ret);
-    node_connection->namespace_n = namespace_n;
-    token = strtok_r (NULL, ":", &rest);
-    errno = 0;
-    sscanf_ret = sscanf (token, "%u", &node_n);
-    if (errno != 0)
-    {
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "sscanf");
-    }
-    GNUNET_assert (0 < sscanf_ret);
-    node_connection->node_n = node_n;
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "node_n %u namespace_n %u node->node_n %u node->namespace_n %u\n",
-         node_n,
-         namespace_n,
-         node->node_n,
-         node->namespace_n);
-  }
-  else
-  {
-    GNUNET_break (0);
-    GNUNET_free (node_connection);
-    GNUNET_free (copy);
-    return NULL;
-  }
-
-  while (NULL != (token = strtok_r (NULL, ":", &rest)))
-  {
-    prefix = GNUNET_new (struct GNUNET_TESTING_AddressPrefix);
-    token2 = strtok_r (token, "}", &rest2);
-    if (NULL != token2)
-      prefix->address_prefix = GNUNET_strdup (token2);
-    else
-      prefix->address_prefix = GNUNET_strdup (token);
-
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "address_prefix %s\n",
-         prefix->address_prefix);
-
-    GNUNET_CONTAINER_DLL_insert (node_connection->address_prefixes_head,
-                                 node_connection->address_prefixes_tail,
-                                 prefix);
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "address_prefix %s\n",
-         prefix->address_prefix);
-  }
-
-  GNUNET_free (copy);
-  return node_connection;
-}
-
-
-/**
- * Every line in the topology configuration starts with a string indicating which
- * kind of information will be configured with this line. Configuration values following
- * this string are seperated by special sequences of characters. A value might be
- * a key value pair. A special key is the 'connect' key.
- * The value is the information about a connections via some protocol to other nodes.
- * Each connection itself is a key value pair separated by the character '|' and
- * surrounded by the characters '{' and '}'.
- * The struct GNUNET_TESTING_NodeConnection holds the information of each connection value.
- * This function extracts the values of each connection into a DLL of
- * struct GNUNET_TESTING_NodeConnection which will be added to a node.
- *
- * @param line The line of configuration.
- * @param node The struct GNUNET_TESTING_NetjailNode to which the DLL of
- *             struct GNUNET_TESTING_NodeConnection will be added.
- */
-static void
-node_connections (const char *line, struct GNUNET_TESTING_NetjailNode *node)
-{
-  char *value, *value2;
-  char *temp;
-  char *copy;
-  char *rest = NULL;
-  char *rest2 = NULL;
-  struct GNUNET_TESTING_NodeConnection *node_connection;
-
-
-  temp = strstr (line, "connect");
-  if (NULL != temp)
-  {
-    copy = GNUNET_strdup (temp);
-    strtok_r (copy, ":", &rest);
-    value = strtok_r (rest, "|", &rest2);
-
-    while (NULL != value)
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "node_connections value %s\n",
-           value);
-      node_connection = get_connect_value (value, node);
-      if (NULL == node_connection)
-      {
-        LOG (GNUNET_ERROR_TYPE_WARNING,
-             "connect key was not expected in this configuration line: %s\n",
-             line);
-        break;
-      }
-      GNUNET_CONTAINER_DLL_insert (node->node_connections_head,
-                                   node->node_connections_tail,
-                                   node_connection);
-      value2 = strstr (value, "}}");
-      if (NULL != value2)
-        break;
-      value = strtok_r (NULL, "|", &rest2);
-
-    }
-    GNUNET_free (copy);
-  }
-}
-
-
-/**
- * A helper function to log information about individual nodes.
- *
- * @param cls This is not used actually.
- * @param id The key of this value in the map.
- * @param value A struct GNUNET_TESTING_NetjailNode which holds information about a node.
- * return GNUNET_YES to continue with iterating, GNUNET_NO otherwise.
- */
-static int
-log_nodes (void *cls, const struct GNUNET_ShortHashCode *id, void *value)
-{
-  struct GNUNET_TESTING_NetjailNode *node = value;
-  struct GNUNET_TESTING_NodeConnection *pos_connection;
-  struct GNUNET_TESTING_AddressPrefix *pos_prefix;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "plugin: %s space: %u node: %u global: %u\n",
-       node->plugin,
-       node->namespace_n,
-       node->node_n,
-       node->is_global);
-
-  for (pos_connection = node->node_connections_head; NULL != pos_connection;
-       pos_connection = pos_connection->next)
-  {
-
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "namespace_n: %u node_n: %u node_type: %u\n",
-         pos_connection->namespace_n,
-         pos_connection->node_n,
-         pos_connection->node_type);
-
-    for (pos_prefix = pos_connection->address_prefixes_head; NULL != pos_prefix;
-         pos_prefix =
-           pos_prefix->next)
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "prefix: %s\n",
-           pos_prefix->address_prefix);
-    }
-  }
-  return GNUNET_YES;
-}
-
-
-/**
- * Helper function to log information about namespaces.
- *
- * @param cls This is not used actually.
- * @param id The key of this value in the map.
- * @param value A struct GNUNET_TESTING_NetjailNamespace which holds information about a subnet.
- * return GNUNET_YES to continue with iterating, GNUNET_NO otherwise.
- */
-static int
-log_namespaces (void *cls, const struct GNUNET_ShortHashCode *id, void *value)
-{
-  struct GNUNET_TESTING_NetjailNamespace *namespace = value;
-
-  GNUNET_CONTAINER_multishortmap_iterate (namespace->nodes, &log_nodes, NULL);
-  return GNUNET_YES;
-}
-
-
-/**
- * Helper function to log the configuration in case of a problem with configuration.
- *
- * @param topology The struct GNUNET_TESTING_NetjailTopology holding the configuration information.
- */
-static int
-log_topo (const struct GNUNET_TESTING_NetjailTopology *topology)
-{
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "plugin: %s spaces: %u nodes: %u known: %u\n",
-       topology->plugin,
-       topology->namespaces_n,
-       topology->nodes_m,
-       topology->nodes_x);
-
-  GNUNET_CONTAINER_multishortmap_iterate (topology->map_namespaces,
-                                          log_namespaces, NULL);
-  GNUNET_CONTAINER_multishortmap_iterate (topology->map_globals, &log_nodes,
-                                          NULL);
-  return GNUNET_YES;
-}
-
-
-/**
- * This function extracts information about a specific node from the topology.
- *
- * @param num The global index number of the node.
- * @param[out] node_ex A struct GNUNET_TESTING_NetjailNode with information about the node.
- * @param[out] namespace_ex A struct GNUNET_TESTING_NetjailNamespace with information about the namespace
-               the node is in or NULL, if the node is a global node.
- * @param[out] node_connections_ex A struct GNUNET_TESTING_NodeConnection with information about the connection
-               of this node to other nodes.
-*/
-static void
-get_node_info (unsigned int num,
-               const struct GNUNET_TESTING_NetjailTopology *topology,
-               struct GNUNET_TESTING_NetjailNode **node_ex,
-               struct GNUNET_TESTING_NetjailNamespace **namespace_ex,
-               struct GNUNET_TESTING_NodeConnection **node_connections_ex)
-{
-  struct GNUNET_ShortHashCode hkey;
-  struct GNUNET_HashCode hc;
-  unsigned int namespace_n;
-  unsigned int node_m;
-  struct GNUNET_TESTING_NetjailNode *node;
-  struct GNUNET_TESTING_NetjailNamespace *namespace;
-  struct GNUNET_TESTING_NodeConnection *node_connections = NULL;
-
-  log_topo (topology);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "num: %u \n",
-       num);
-  if (topology->nodes_x >= num)
-  {
-
-    GNUNET_CRYPTO_hash (&num, sizeof(num), &hc);
-    memcpy (&hkey,
-            &hc,
-            sizeof (hkey));
-    node = GNUNET_CONTAINER_multishortmap_get (topology->map_globals,
-                                               &hkey);
-    if (NULL != node)
-    {
-      *node_ex = node;
-      *node_connections_ex = node->node_connections_head;
-    }
-  }
-  else
-  {
-    namespace_n = (unsigned int) ceil ((double) (num - topology->nodes_x)
-                                       / topology->nodes_m);
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "ceil num: %u nodes_x: %u nodes_m: %u namespace_n: %u\n",
-         num,
-         topology->nodes_x,
-         topology->nodes_m,
-         namespace_n);
-    GNUNET_CRYPTO_hash (&namespace_n, sizeof(namespace_n), &hc);
-    memcpy (&hkey,
-            &hc,
-            sizeof (hkey));
-    namespace = GNUNET_CONTAINER_multishortmap_get (topology->map_namespaces,
-                                                    &hkey);
-    if (NULL != namespace)
-    {
-      node_m = num - topology->nodes_x - topology->nodes_m * (namespace_n - 1);
-      GNUNET_CRYPTO_hash (&node_m, sizeof(node_m), &hc);
-      memcpy (&hkey,
-              &hc,
-              sizeof (hkey));
-      node = GNUNET_CONTAINER_multishortmap_get (namespace->nodes,
-                                                 &hkey);
-      if (NULL != node)
-      {
-        LOG (GNUNET_ERROR_TYPE_DEBUG,
-             "node additional_connects: %u %p\n",
-             node->additional_connects,
-             node);
-        node_connections = node->node_connections_head;
-      }
-      *node_ex = node;
-      *namespace_ex = namespace;
-      *node_connections_ex = node_connections;
-    }
-  }
-}
-
-
-/**
- * Get a node from the topology.
- *
- * @param num The specific node we want the connections for.
- * @param topology The topology we get the connections from.
- * @return The connections of the node.
- */
-struct GNUNET_TESTING_NetjailNode *
-GNUNET_TESTING_get_node (unsigned int num,
-                         struct GNUNET_TESTING_NetjailTopology *topology)
-{
-  struct GNUNET_TESTING_NetjailNode *node;
-  struct GNUNET_TESTING_NetjailNamespace *namespace;
-  struct GNUNET_TESTING_NodeConnection *node_connections;
-
-  get_node_info (num, topology, &node, &namespace, &node_connections);
-
-  return node;
-
-}
-
-
-/**
- * Get the connections to other nodes for a specific node.
- *
- * @param num The specific node we want the connections for.
- * @param topology The topology we get the connections from.
- * @return The connections of the node.
- */
-struct GNUNET_TESTING_NodeConnection *
-GNUNET_TESTING_get_connections (unsigned int num,
-                                const struct
-                                GNUNET_TESTING_NetjailTopology *topology)
-{
-  struct GNUNET_TESTING_NetjailNode *node;
-  struct GNUNET_TESTING_NetjailNamespace *namespace;
-  struct GNUNET_TESTING_NodeConnection *node_connections;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "get_connections\n");
-
-  get_node_info (num, topology, &node, &namespace, &node_connections);
-
-  return node_connections;
-}
-
-
-/**
- * Retrieve the peer identity from the test system with the unique node id.
- *
- * @param num The unique node id.
- * @param tl_system The test system.
- * @return The peer identity wrapping the public key.
- */
-struct GNUNET_PeerIdentity *
-GNUNET_TESTING_get_peer (unsigned int num,
-                         const struct GNUNET_TESTING_System *tl_system)
-{
-  struct GNUNET_PeerIdentity *peer = GNUNET_new (struct GNUNET_PeerIdentity);
-  struct GNUNET_CRYPTO_EddsaPrivateKey *priv_key;
-
-  priv_key = GNUNET_TESTING_hostkey_get (tl_system,
-                                         num,
-                                         peer);
-
-  GNUNET_CRYPTO_eddsa_key_get_public (priv_key,
-                                      &peer->public_key);
-  GNUNET_free (priv_key);
-  return peer;
-}
-
-
-int
-free_nodes_cb (void *cls,
-               const struct GNUNET_ShortHashCode *key,
-               void *value)
-{
-  (void) cls;
-  struct GNUNET_TESTING_NetjailNode *node = value;
-  struct GNUNET_TESTING_NodeConnection *pos_connection;
-  struct GNUNET_TESTING_AddressPrefix *pos_prefix;
-
-  while (NULL != (pos_connection = node->node_connections_head))
-  {
-    while (NULL != (pos_prefix = pos_connection->address_prefixes_head))
-    {
-      GNUNET_CONTAINER_DLL_remove (pos_connection->address_prefixes_head,
-                                   pos_connection->address_prefixes_tail,
-                                   pos_prefix);
-      GNUNET_free (pos_prefix->address_prefix);
-      GNUNET_free (pos_prefix);
-    }
-    GNUNET_CONTAINER_DLL_remove (node->node_connections_head,
-                                 node->node_connections_tail,
-                                 pos_connection);
-    GNUNET_free (pos_connection);
-  }
-
-  GNUNET_free (node->plugin);
-  GNUNET_free (node);
-  return GNUNET_OK;
-}
-
-
-int
-free_namespaces_cb (void *cls,
-                    const struct GNUNET_ShortHashCode *key,
-                    void *value)
-{
-  (void) cls;
-  struct GNUNET_TESTING_NetjailNamespace *namespace = value;
-
-  GNUNET_free (namespace->router);
-  GNUNET_CONTAINER_multishortmap_iterate (namespace->nodes, free_nodes_cb,
-                                          namespace->nodes);
-  return GNUNET_OK;
-
-}
-
-
-/**
- * Deallocate memory of the struct GNUNET_TESTING_NetjailTopology.
- *
- * @param topology The GNUNET_TESTING_NetjailTopology to be deallocated.
- */
-void
-GNUNET_TESTING_free_topology (struct GNUNET_TESTING_NetjailTopology *topology)
-{
-  GNUNET_CONTAINER_multishortmap_iterate (topology->map_namespaces,
-                                          free_namespaces_cb, NULL);
-  GNUNET_CONTAINER_multishortmap_destroy (topology->map_namespaces);
-  GNUNET_CONTAINER_multishortmap_iterate (topology->map_globals, free_nodes_cb,
-                                          NULL);
-  GNUNET_CONTAINER_multishortmap_destroy (topology->map_globals);
-  GNUNET_free (topology->plugin);
-  GNUNET_free (topology);
-}
-
-
-unsigned int
-GNUNET_TESTING_calculate_num (
-  struct GNUNET_TESTING_NodeConnection *node_connection,
-  struct GNUNET_TESTING_NetjailTopology *topology)
-{
-  unsigned int n, m, num;
-
-  n = node_connection->namespace_n;
-  m = node_connection->node_n;
-
-  if (0 == n)
-    num = m;
-  else
-    num = (n - 1) * topology->nodes_m + m + topology->nodes_x;
-
-  return num;
-}
-
-
-/**
- * Get the address for a specific communicator from a connection.
- *
- * @param connection The connection we like to have the address from.
- * @param prefix The communicator protocol prefix.
- * @return The address of the communicator.
- */
-char *
-GNUNET_TESTING_get_address (struct GNUNET_TESTING_NodeConnection *connection,
-                            const char *prefix)
-{
-  struct GNUNET_TESTING_NetjailNode *node;
-  char *addr;
-  char *template;
-  unsigned int node_n;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "get address prefix: %s node_n: %u\n",
-       prefix,
-       connection->node_n);
-
-  node = connection->node;
-  if (connection->namespace_n == node->namespace_n)
-  {
-    template = CONNECT_ADDRESS_TEMPLATE;
-    node_n = connection->node_n;
-  }
-  else if (0 == connection->namespace_n)
-  {
-    template = KNOWN_CONNECT_ADDRESS_TEMPLATE;
-    node_n = connection->node_n;
-  }
-  else if (1 == connection->node_n)
-  {
-    template = ROUTER_CONNECT_ADDRESS_TEMPLATE;
-    node_n = connection->namespace_n;
-  }
-  else
-  {
-    return NULL;
-  }
-
-  if (0 == strcmp (PREFIX_TCP, prefix) ||
-      0 == strcmp (PREFIX_UDP, prefix) ||
-      0 == strcmp (PREFIX_UDP_NATTED, prefix) ||
-      0 == strcmp (PREFIX_TCP_NATTED, prefix))
-  {
-    GNUNET_asprintf (&addr,
-                     template,
-                     prefix,
-                     node_n);
-  }
-  else
-  {
-    GNUNET_assert (0);
-  }
-
-  return addr;
-}
-
-
-/**
- * Get the number of unintentional additional connections the node waits for.
- *
- * @param num The specific node we want the additional connects for.
- * @return The number of additional connects
- */
-unsigned int
-GNUNET_TESTING_get_additional_connects (unsigned int num,
-                                        struct GNUNET_TESTING_NetjailTopology *
-                                        topology)
-{
-  struct GNUNET_TESTING_NetjailNode *node;
-  struct GNUNET_TESTING_NetjailNamespace *namespace;
-  struct GNUNET_TESTING_NodeConnection *node_connections;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "get_additional_connects\n");
-
-  get_node_info (num, topology, &node, &namespace, &node_connections);
-
-  if (NULL == node)
-  {
-    LOG (GNUNET_ERROR_TYPE_WARNING,
-         "No info found for node %d\n", num);
-    return 0;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "node additional_connects for node %p\n",
-       node);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "node additional_connects: %u\n",
-       node->additional_connects);
-
-  return node->additional_connects;
-}
-
-
-static void
-parse_ac (struct GNUNET_TESTING_NetjailNode *p_node, const char *token)
-{
-  char *ac_value;
-  int ret;
-
-  ac_value = get_value ("AC", token);
-  if (NULL != ac_value)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "ac value: %s\n",
-         ac_value);
-    errno = 0;
-    ret = sscanf (ac_value, "%u", &p_node->additional_connects);
-    if (errno != 0)
-    {
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "sscanf");
-    }
-    GNUNET_assert (0 < ret);
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "AC %u\n",
-         p_node->additional_connects);
-  }
-  else
-  {
-    p_node->additional_connects = 0;
-  }
-  GNUNET_free (ac_value);
-}
-
-
-/**
- * Parse the topology data.
- *
- * @param data The topology data.
- * @return The GNUNET_TESTING_NetjailTopology
- */
-struct GNUNET_TESTING_NetjailTopology *
-GNUNET_TESTING_get_topo_from_string (const char *input)
-{
-  char *token;
-  char *key = NULL;
-  unsigned int out;
-  char *rest = NULL;
-  char *value = NULL;
-  char *value2;
-  char *data;
-  int ret;
-  struct GNUNET_TESTING_NetjailTopology *topo;
-  struct GNUNET_TESTING_NetjailRouter *router;
-  struct GNUNET_TESTING_NetjailNamespace *namespace;
-  struct GNUNET_HashCode hc;
-
-  data = GNUNET_strdup (input);
-  token = strtok_r (data, "\n", &rest);
-  topo = GNUNET_new (struct GNUNET_TESTING_NetjailTopology);
-  topo->map_namespaces =
-    GNUNET_CONTAINER_multishortmap_create (1,GNUNET_NO);
-  topo->map_globals =
-    GNUNET_CONTAINER_multishortmap_create (1,GNUNET_NO);
-
-  while (NULL != token)
-  {
-    if (NULL != key)
-      GNUNET_free (key);
-    key = get_key (token);
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "In the loop with token: %s beginning with %s\n",
-         token,
-         key);
-    if (0 == strcmp (key, "M"))
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Get first Value for M.\n");
-      out = get_first_value (token);
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "M: %u\n",
-           out);
-      topo->nodes_m = out;
-    }
-    else if (0 == strcmp (key, "N"))
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Get first Value for N.\n");
-      out = get_first_value (token);
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "N: %u\n",
-           out);
-      topo->namespaces_n = out;
-    }
-    else if (0 == strcmp (key, "X"))
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Get first Value for X.\n");
-      out = get_first_value (token);
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "X: %u\n",
-           out);
-      topo->nodes_x = out;
-    }
-    else if (0 == strcmp (key, "AC"))
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Get first Value for AC.\n");
-      out = get_first_value (token);
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "AC: %u\n",
-           out);
-      topo->additional_connects = out;
-    }
-    else if (0 == strcmp (key, "T"))
-    {
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Get first string value for T.\n");
-      value = get_first_string_value (token);
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "value: %s\n",
-           value);
-      topo->plugin = value;
-    }
-    else if (0 == strcmp (key, "K"))
-    {
-      struct GNUNET_ShortHashCode hkey_k;
-      struct GNUNET_TESTING_NetjailNode *k_node = GNUNET_new (struct
-                                                              GNUNET_TESTING_NetjailNode);
-
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Get first Value for K.\n");
-      out = get_first_value (token);
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "K: %u\n",
-           out);
-      k_node->node_n = out;
-      GNUNET_CRYPTO_hash (&out, sizeof(out), &hc);
-      memcpy (&hkey_k,
-              &hc,
-              sizeof (hkey_k));
-      k_node->is_global = GNUNET_YES;
-
-      if (GNUNET_YES == GNUNET_CONTAINER_multishortmap_contains (
-            topo->map_globals,
-            &hkey_k))
-        GNUNET_break (0);
-      else
-        GNUNET_CONTAINER_multishortmap_put (topo->map_globals,
-                                            &hkey_k,
-                                            k_node,
-                                            GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Get value for key value on K.\n");
-      value = get_value ("plugin", token);
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "value: %s\n",
-           value);
-      k_node->plugin = value;
-      parse_ac (k_node, token);
-      node_connections (token, k_node);
-      GNUNET_free (value);
-    }
-    else if (0 == strcmp (key, "R"))
-    {
-      struct GNUNET_ShortHashCode hkey_r;
-      router = GNUNET_new (struct GNUNET_TESTING_NetjailRouter);
-
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Get first Value for R.\n");
-      out = get_first_value (token);
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "R: %u\n",
-           out);
-      GNUNET_CRYPTO_hash (&out, sizeof(out), &hc);
-      memcpy (&hkey_r,
-              &hc,
-              sizeof (hkey_r));
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Get value for key tcp_port on R.\n");
-      value = get_value ("tcp_port", token);
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "tcp_port: %s\n",
-           value);
-      ret = sscanf (value, "%u", &(router->tcp_port));
-      GNUNET_free (value);
-      GNUNET_break (0 != ret && 1 >= router->tcp_port);
-
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Get value for key udp_port on R.\n");
-      value2 = get_value ("udp_port", token);
-      ret = sscanf (value2, "%u", &(router->udp_port));
-      GNUNET_free (value2);
-      GNUNET_break (0 != ret && 1 >= router->udp_port);
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "udp_port: %s\n",
-           value2);
-      GNUNET_free (value2);
-      if (GNUNET_YES == GNUNET_CONTAINER_multishortmap_contains (
-            topo->map_namespaces,
-            &hkey_r))
-      {
-        namespace = GNUNET_CONTAINER_multishortmap_get (topo->map_namespaces,
-                                                        &hkey_r);
-      }
-      else
-      {
-        namespace = GNUNET_new (struct GNUNET_TESTING_NetjailNamespace);
-        namespace->namespace_n = out;
-        namespace->nodes = GNUNET_CONTAINER_multishortmap_create (1,GNUNET_NO);
-        GNUNET_CONTAINER_multishortmap_put (topo->map_namespaces,
-                                            &hkey_r,
-                                            namespace,
-                                            GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-      }
-      namespace->router = router;
-
-    }
-    else if (0 == strcmp (key, "P"))
-    {
-      struct GNUNET_TESTING_NetjailNode *p_node = GNUNET_new (struct
-                                                              GNUNET_TESTING_NetjailNode);
-      struct GNUNET_ShortHashCode hkey_p;
-
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Get first Value for P.\n");
-      out = get_first_value (token);
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "P: %u\n",
-           out);
-      GNUNET_CRYPTO_hash (&out, sizeof(out), &hc);
-      memcpy (&hkey_p,
-              &hc,
-              sizeof (hkey_p));
-
-      if (GNUNET_YES == GNUNET_CONTAINER_multishortmap_contains (
-            topo->map_namespaces,
-            &hkey_p))
-      {
-        namespace = GNUNET_CONTAINER_multishortmap_get (topo->map_namespaces,
-                                                        &hkey_p);
-      }
-      else
-      {
-        namespace = GNUNET_new (struct GNUNET_TESTING_NetjailNamespace);
-        namespace->nodes = GNUNET_CONTAINER_multishortmap_create (1,GNUNET_NO);
-        namespace->namespace_n = out;
-        GNUNET_CONTAINER_multishortmap_put (topo->map_namespaces,
-                                            &hkey_p,
-                                            namespace,
-                                            GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-      }
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Get second Value for P.\n");
-      out = get_second_value (token);
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "P: %u\n",
-           out);
-      GNUNET_CRYPTO_hash (&out, sizeof(out), &hc);
-      memcpy (&hkey_p,
-              &hc,
-              sizeof (hkey_p));
-      if (GNUNET_YES == GNUNET_CONTAINER_multishortmap_contains (
-            namespace->nodes,
-            &hkey_p))
-      {
-        GNUNET_break (0);
-      }
-      else
-      {
-
-        GNUNET_CONTAINER_multishortmap_put (namespace->nodes,
-                                            &hkey_p,
-                                            p_node,
-                                            GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-        LOG (GNUNET_ERROR_TYPE_DEBUG,
-             "Get value for key plugin on P.\n");
-        value = get_value ("plugin", token);
-        if (NULL != value)
-        {
-          LOG (GNUNET_ERROR_TYPE_DEBUG,
-               "plugin: %s\n",
-               value);
-          p_node->plugin = value;
-        }
-        p_node->node_n = out;
-        p_node->namespace_n = namespace->namespace_n;
-      }
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Get AC Value for P.\n");
-      parse_ac (p_node, token);
-      node_connections (token, p_node);
-    }
-    token = strtok_r (NULL, "\n", &rest);
-    if (NULL != token)
-      LOG (GNUNET_ERROR_TYPE_DEBUG,
-           "Next token %s\n",
-           token);
-  }
-  if (NULL != key)
-    GNUNET_free (key);
-  GNUNET_free (data);
-  return topo;
-}
-
-
-/**
- * Getting the topology from file.
- *
- * @param filename The name of the topology file.
- * @return The GNUNET_TESTING_NetjailTopology
- */
-struct GNUNET_TESTING_NetjailTopology *
-GNUNET_TESTING_get_topo_from_file (const char *filename)
-{
-  uint64_t fs;
-  char *data;
-  struct GNUNET_TESTING_NetjailTopology *topo;
-
-  if (GNUNET_YES != GNUNET_DISK_file_test (filename))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         _ ("Topology file %s not found\n"),
-         filename);
-    return NULL;
-  }
-  if (GNUNET_OK !=
-      GNUNET_DISK_file_size (filename, &fs, GNUNET_YES, GNUNET_YES))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         _ ("Topology file %s has no data\n"),
-         filename);
-    return NULL;
-  }
-  data = GNUNET_malloc (fs + 1);
-  if (fs != GNUNET_DISK_fn_read (filename, data, fs))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         _ ("Topology file %s cannot be read\n"),
-         filename);
-    GNUNET_free (data);
-    return NULL;
-  }
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "file length %" PRIu64 "\n",
-       fs);
-  data[fs] = '\0';
-
-  topo = GNUNET_TESTING_get_topo_from_string (data);
-
-  GNUNET_free (data);
-
-  return topo;
-}
-
-
-/* end of testing.c */
diff --git a/src/service/testing/testing.h b/src/service/testing/testing.h
deleted file mode 100644
index 43c8ad45a..000000000
--- a/src/service/testing/testing.h
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2021 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @author t3sserakt
- */
-#ifndef TESTING_H
-#define TESTING_H
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_plugin.h"
-
-GNUNET_NETWORK_STRUCT_BEGIN
-
-/**
- * Message send to a child loop to inform the child loop about a barrier being advanced.
- */
-struct CommandBarrierCrossable
-{
-  /**
-   * Type is GNUNET_MESSAGE_TYPE_CMDS_HELPER_BARRIER_CROSSABLE
-   */
-  struct GNUNET_MessageHeader header;
-
-  /* followed by 0-terminated barrier name */
-};
-
-/**
- * Message send by a child loop to inform the master loop how much
- * GNUNET_CMDS_BARRIER_REACHED messages the child will send.
- */
-struct CommandBarrierAttached
-{
-  /**
-   * Type is GNUNET_MESSAGE_TYPE_CMDS_HELPER_BARRIER_ATTACHED
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * How often the child loop will reach the barrier.
-   */
-  uint32_t expected_reaches GNUNET_PACKED;
-
-  /**
-   * The number of the node the barrier is running on.
-   */
-  uint32_t node_number GNUNET_PACKED;
-
-  /* followed by 0-terminated barrier name */
-};
-
-struct GNUNET_TESTING_CommandBarrierReached
-{
-  /**
-   * Type is GNUNET_MESSAGE_TYPE_CMDS_HELPER_BARRIER_REACHED
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * The number of the node the barrier is reached.
-   */
-  uint32_t node_number GNUNET_PACKED;
-
-  /**
-   * The number of reach messages which most likely will send.
-   */
-  uint32_t expected_number_of_reached_messages GNUNET_PACKED;
-
-  /* followed by 0-terminated barrier name */
-};
-
-GNUNET_NETWORK_STRUCT_END
-
-/**
- * Handle for a plugin.
- */
-struct TestcasePlugin
-{
-  /**
-   * Name of the shared library.
-   */
-  char *library_name;
-
-  /**
-   * Plugin API.
-   */
-  struct GNUNET_TESTING_PluginFunctions *api;
-
-  /**
-   * IP address of the specific node the helper is running for.
-   *
-   */
-  char *node_ip;
-
-  /**
-   * Name of the test case plugin.
-   *
-   */
-  char *plugin_name;
-
-  /**
-   * The number of namespaces
-   *
-   */
-  char *global_n;
-
-  /**
-   * The number of local nodes per namespace.
-   *
-   */
-  char *local_m;
-
-  /**
-   * The number of the namespace this node is in.
-   *
-   */
-  char *n;
-
-  /**
-   * The number of the node in the namespace.
-   *
-   */
-  char *m;
-};
-
-struct CommandListEntry
-{
-  struct CommandListEntry *next;
-
-  struct CommandListEntry *prev;
-
-  struct GNUNET_TESTING_Command *command;
-};
-
-
-struct GNUNET_TESTING_Barrier
-{
-  /**
-   * Pointer to the previous prefix in the DLL.
-   */
-  struct GNUNET_TESTING_Barrier *prev;
-
-  /**
-   * Pointer to the next prefix in the DLL.
-   */
-  struct GNUNET_TESTING_Barrier *next;
-
-  /**
-   * Head of the DLL with local commands the barrier is attached too.
-   */
-   struct CommandListEntry *cmds_head;
-
-  /**
-   * Tail of the DLL with local commands the barrier is attached too.
-   */
-   struct CommandListEntry *cmds_tail;
-
-  /**
-   * Hash map containing the global known nodes which are not natted.
-   */
-  struct GNUNET_CONTAINER_MultiShortmap *nodes;
-
-  /**
-   * Name of the barrier.
-   */
-  const char *name;
-
-  /**
-   * Is this barrier running on the master.
-   */
-  unsigned int running_on_master;
-
-  /**
-   * Number of commands attached to this barrier.
-   */
-  unsigned int expected_reaches;
-
-  /**
-   * Number of commands which reached this barrier.
-   */
-  unsigned int reached;
-
-  /**
-   * Percentage of of commands which need to reach the barrier to change state.
-   * Can not be used together with to_be_reached;
-   */
-  double percentage_to_be_reached;
-
-  /**
-   * Number of commands which need to reach the barrier to change state.
-   * Can not be used together with percentage_to_be_reached;
-   */
-  unsigned int number_to_be_reached;
-
-  /*
-   * No barrier locally. Shadow created. Real barrier created elsewhere.
-   */
-  unsigned int shadow;
-};
-
-
-/**
- * Advance internal pointer to next command.
- *
- * @param cls batch internal state
- * @return true if we could advance, false if the batch
- *         has completed and cannot advance anymore
- */
-bool
-GNUNET_TESTING_cmd_batch_next_ (void *cls);
-
-
-/**
- * Test if this command is a batch command.
- *
- * @return false if not, true if it is a batch command
- */
-bool
-GNUNET_TESTING_cmd_is_batch_ (const struct GNUNET_TESTING_Command *cmd);
-
-
-/**
- * Obtain what command the batch is at.
- *
- * @return cmd current batch command
- */
-struct GNUNET_TESTING_Command *
-GNUNET_TESTING_cmd_batch_get_current_ (const struct GNUNET_TESTING_Command *cmd);
-
-
-/**
- * Set what command the batch should be at.  Needed for
- * loops. We may want to change this to take a label
- * and/or expose it in the public API in the future.
- * Not used for now.
- *
- * @param cmd current batch command
- * @param new_ip where to move the IP
- */
-void
-GNUNET_TESTING_cmd_batch_set_current_ (const struct GNUNET_TESTING_Command *cmd,
-                                       unsigned int new_ip);
-
-
-/**
- * This function checks, if a barrier can be crossed, which actually means that
- * the cmd representing the barrier is finished.
- *
- * @param barrier The barrier in question.
- * @return true if we can cross the barrier, false if not.
- */
-bool
-GNUNET_TESTING_barrier_crossable_ (struct GNUNET_TESTING_Barrier *barrier);
-
-
-/**
- * Finish all "barrier reached" commands attached to this barrier.
- *
- * @param barrier The barrier in question.
- */
-void
-GNUNET_TESTING_finish_barrier_ (struct GNUNET_TESTING_Interpreter *is,
-                                const char *barrier_name);
-
-
-/**
- * Send message to master loop that cmds being attached to a barrier.
- * FIXME: Unused function
- *
- * @param is The interpreter loop.
- * @param barrier_name The name of the barrier to attach to.
- * @param subnet_number The number of the subnet.
- * @param node_number The node to inform.
- * @param write_message Callback to write messages to the master loop.
- */
-void
-GNUNET_TESTING_send_barrier_attach_ (struct GNUNET_TESTING_Interpreter *is,
-                                     const char *barrier_name,
-                                     unsigned int global_node_number,
-                                     unsigned int expected_reaches,
-                                     GNUNET_TESTING_cmd_helper_write_cb write_message);
-
-
-/**
- * Getting a node from a map by global node number.
- * FIXME: This is a barrier helper function not related to a command but it is
- * implemented in the *_cmd_barrier.c file.
- * Maybe move into a separate file like testing_barrier.c; see also can
- * barrier advance above
- *
- * @param nodes The map.
- * @param node_number The global node number.
- * @return The node.
- */
-struct GNUNET_TESTING_NetjailNode *
-GNUNET_TESTING_barrier_get_node (struct GNUNET_TESTING_Barrier *barrier,
-                                 unsigned int node_number);
-
-
-/**
- * Getting a barrier from the interpreter.
- *
- * @param is The interpreter.
- * @param barrier_name The name of the barrier.
- * @return The barrier.
- */
-struct GNUNET_TESTING_Barrier *
-GNUNET_TESTING_get_barrier_ (struct GNUNET_TESTING_Interpreter *is,
-                             const char *barrier_name);
-
-
-/**
- * Add a barrier to the loop.
- *
- * @param is The interpreter.
- * @param barrier The barrier to add.
- */
-void
-GNUNET_TESTING_add_barrier_ (struct GNUNET_TESTING_Interpreter *is,
-                             struct GNUNET_TESTING_Barrier *barrier);
-
-
-#endif
diff --git a/src/service/testing/testing_api_cmd_barrier.c b/src/service/testing/testing_api_cmd_barrier.c
deleted file mode 100644
index ee074f35b..000000000
--- a/src/service/testing/testing_api_cmd_barrier.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2022 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testing/testing_api_cmd_barrier.c
- * @brief Barrier functionality.
- * @author t3sserakt
- */
-#include "platform.h"
-#include "testing.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_plugin.h"
-#include "gnunet_testing_netjail_lib.h"
-#include "gnunet_testing_barrier.h"
-
-/**
- * Generic logging shortcut
- */
-#define LOG(kind, ...) GNUNET_log (kind, __VA_ARGS__)
-
-
-struct BarrierState
-{
-  /**
-   * Our barrier, set to NULL once the barrier is active.
-   */
-  struct GNUNET_TESTING_Barrier *barrier;
-
-  /**
-   * Our label.
-   */
-  const char *label;
-};
-
-
-// FIXME Unused function
-void
-GNUNET_TESTING_send_barrier_attach_ (
-  struct GNUNET_TESTING_Interpreter *is,
-  const char *barrier_name,
-  unsigned int global_node_number,
-  unsigned int expected_reaches,
-  GNUNET_TESTING_cmd_helper_write_cb write_message)
-{
-  // FIXME: avoid useless malloc!
-  struct CommandBarrierAttached *atm = GNUNET_new (struct
-                                                   CommandBarrierAttached);
-  size_t msg_length = sizeof(struct CommandBarrierAttached);
-  size_t name_len;
-
-  name_len = strlen (barrier_name) + 1;
-  atm->header.type = htons (GNUNET_MESSAGE_TYPE_CMDS_HELPER_BARRIER_ATTACHED);
-  atm->header.size = htons ((uint16_t) msg_length);
-  atm->expected_reaches = expected_reaches;
-  atm->node_number = global_node_number;
-  memcpy (&atm[1], barrier_name, name_len);
-  write_message ((struct GNUNET_MessageHeader *) atm, msg_length);
-
-  GNUNET_free (atm);
-}
-
-
-bool
-GNUNET_TESTING_barrier_crossable_ (struct GNUNET_TESTING_Barrier *barrier)
-{
-  unsigned int expected_reaches = barrier->expected_reaches;
-  unsigned int reached = barrier->reached;
-  double percentage_to_be_reached = barrier->percentage_to_be_reached;
-  unsigned int number_to_be_reached = barrier->number_to_be_reached;
-  double percentage_reached = (double) reached / expected_reaches * 100;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "%u %f %f %u %u\n",
-       expected_reaches,
-       percentage_to_be_reached,
-       percentage_reached,
-       number_to_be_reached,
-       reached);
-
-  return ( ( (0 < percentage_to_be_reached) &&
-             (percentage_reached >= percentage_to_be_reached) ) ||
-           ( (0 < number_to_be_reached) &&
-             (reached >= number_to_be_reached) ) );
-}
-
-
-/**
- * Offer internal data from a "barrier" CMD, to other commands.
- *
- * @param cls closure.
- * @param[out] ret result.
- * @param trait name of the trait.
- * @param index index number of the object to offer.
- * @return #GNUNET_OK on success.
- */
-static enum GNUNET_GenericReturnValue
-barrier_traits (void *cls,
-                const void **ret,
-                const char *trait,
-                unsigned int index)
-{
-  struct GNUNET_TESTING_Trait traits[] = {
-    GNUNET_TESTING_trait_end ()
-  };
-
-  return GNUNET_TESTING_get_trait (traits,
-                                   ret,
-                                   trait,
-                                   index);
-}
-
-
-/**
- * Cleanup the state from a "barrier" CMD, and possibly
- * cancel a pending operation thereof.
- *
- * @param cls closure.
- */
-static void
-barrier_cleanup (void *cls)
-{
-  struct BarrierState *brs = cls;
-
-  GNUNET_free (brs->barrier);
-  GNUNET_free (brs);
-}
-
-
-/**
- * Run the command.
- *
- * @param cls closure.
- * @param is the interpreter state.
- */
-static void
-barrier_run (void *cls,
-             struct GNUNET_TESTING_Interpreter *is)
-{
-  struct BarrierState *brs = cls;
-
-  GNUNET_TESTING_add_barrier_ (is,
-                               brs->barrier);
-  brs->barrier = NULL;
-}
-
-
-struct GNUNET_TESTING_NetjailNode *
-GNUNET_TESTING_barrier_get_node (struct GNUNET_TESTING_Barrier *barrier,
-                                 unsigned int node_number)
-{
-  struct GNUNET_HashCode hc;
-  struct GNUNET_ShortHashCode key;
-
-  GNUNET_CRYPTO_hash (&node_number,
-                      sizeof(node_number),
-                      &hc);
-  memcpy (&key,
-          &hc,
-          sizeof (key));
-  return GNUNET_CONTAINER_multishortmap_get (barrier->nodes,
-                                             &key);
-}
-
-
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_barrier_create (const char *label,
-                                   double percentage_to_be_reached,
-                                   unsigned int number_to_be_reached)
-{
-  struct GNUNET_TESTING_Barrier *barrier;
-  struct BarrierState *bs;
-
-  bs = GNUNET_new (struct BarrierState);
-  bs->label = label;
-  barrier = GNUNET_new (struct GNUNET_TESTING_Barrier);
-  barrier->name = label;
-  barrier->percentage_to_be_reached = percentage_to_be_reached;
-  barrier->number_to_be_reached = number_to_be_reached;
-  GNUNET_assert ((0 < percentage_to_be_reached &&
-                  0 == number_to_be_reached) ||
-                 (0 ==  percentage_to_be_reached &&
-                  0 < number_to_be_reached));
-  bs->barrier = barrier;
-  return GNUNET_TESTING_command_new (bs, label,
-                                     &barrier_run,
-                                     &barrier_cleanup,
-                                     &barrier_traits,
-                                     NULL);
-}
diff --git a/src/service/testing/testing_api_cmd_barrier_reached.c b/src/service/testing/testing_api_cmd_barrier_reached.c
deleted file mode 100644
index 54a36b91c..000000000
--- a/src/service/testing/testing_api_cmd_barrier_reached.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2022 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testing/testing_api_cmd_barrier_reached.c
- * @brief Command to signal barrier was reached.
- * @author t3sserakt
- */
-#include "platform.h"
-#include "gnunet_testing_lib.h"
-#include "testing_cmds.h"
-#include "gnunet_testing_plugin.h"
-#include "gnunet_testing_barrier.h"
-#include "gnunet_testing_netjail_lib.h"
-#include "testing.h"
-
-/**
- * Generic logging shortcut
- */
-#define LOG(kind, ...) GNUNET_log (kind, __VA_ARGS__)
-
-/**
- * Struct with information for callbacks.
- *
- */
-struct BarrierReachedState
-{
-  /**
-   * Callback to write messages to the master loop.
-   *
-   */
-  GNUNET_TESTING_cmd_helper_write_cb write_message;
-
-  /**
-   * Context for our asynchronous completion.
-   */
-  struct GNUNET_TESTING_AsyncContext ac;
-
-  /**
-   * The label of this command.
-   */
-  const char *label;
-
-  /**
-   * The name of the barrier this commands wait (if finishing asynchronous) for or/and reaches.
-   */
-  const char *barrier_name;
-
-  /*
-   * The global numer of the node the cmd runs on.
-   */
-  unsigned int node_number;
-
-  /**
-   * If this command will block.
-   */
-  unsigned int asynchronous_finish;
-
-  /**
-   * Is this cmd running on the master loop.
-   */
-  unsigned int running_on_master;
-};
-
-
-/**
- * Run the command.
- *
- * @param cls closure.
- * @param is the interpreter state.
- */
-static void
-barrier_reached_run (void *cls,
-                     struct GNUNET_TESTING_Interpreter *is)
-{
-  struct BarrierReachedState *brs = cls;
-  struct GNUNET_TESTING_Barrier *barrier;
-  struct GNUNET_TESTING_Command *cmd =
-    GNUNET_TESTING_interpreter_get_current_command (is);
-  struct CommandListEntry *cle;
-  size_t msg_length;
-  struct GNUNET_TESTING_CommandBarrierReached *msg;
-  size_t name_len;
-
-  barrier = GNUNET_TESTING_get_barrier_ (is,
-                                         brs->barrier_name);
-  if (NULL == barrier)
-  {
-    barrier = GNUNET_new (struct GNUNET_TESTING_Barrier);
-    barrier->name = brs->barrier_name;
-    GNUNET_TESTING_add_barrier_ (is,
-                                 barrier);
-  }
-  barrier->reached++;
-  if (GNUNET_TESTING_barrier_crossable_ (barrier))
-  {
-    GNUNET_assert (NULL != cmd);
-    cmd->asynchronous_finish = GNUNET_YES;
-    GNUNET_TESTING_finish_barrier_ (is,
-                                    barrier->name);
-  }
-  else if (GNUNET_NO == brs->asynchronous_finish)
-  {
-    cle = GNUNET_new (struct CommandListEntry);
-    cle->command = cmd;
-    GNUNET_CONTAINER_DLL_insert (barrier->cmds_head,
-                                 barrier->cmds_tail,
-                                 cle);
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "added cle for %p %s\n",
-         barrier,
-         barrier->name);
-  }
-
-  if (GNUNET_NO == brs->running_on_master)
-  {
-    char *terminator = "\0";
-
-    name_len = strlen (barrier->name);
-    msg_length = sizeof(struct GNUNET_TESTING_CommandBarrierReached)
-                 + name_len + 1;
-    msg = GNUNET_malloc (msg_length);
-    msg->header.size = htons ((uint16_t) msg_length);
-    msg->header.type = htons (GNUNET_MESSAGE_TYPE_CMDS_HELPER_BARRIER_REACHED);
-    msg->node_number = brs->node_number;
-    memcpy (&msg[1], barrier->name, name_len + 1);
-    memcpy (&msg[name_len + 1],terminator,1);
-    brs->write_message ((struct GNUNET_MessageHeader *) msg, msg_length);
-  }
-}
-
-
-/**
- * Cleanup the state from a "barrier reached" CMD, and possibly
- * cancel a pending operation thereof.
- *
- * @param cls closure.
- */
-static void
-barrier_reached_cleanup (void *cls)
-{
-  struct BarrierReachedState *brs = cls;
-
-  GNUNET_free (brs);
-}
-
-
-/**
- * Offer internal data from a "batch" CMD, to other commands.
- *
- * @param cls closure.
- * @param[out] ret result.
- * @param trait name of the trait.
- * @param index index number of the object to offer.
- * @return #GNUNET_OK on success.
- */
-static enum GNUNET_GenericReturnValue
-barrier_reached_traits (void *cls,
-                        const void **ret,
-                        const char *trait,
-                        unsigned int index)
-{
-  struct BarrierReachedState *brs = cls;
-  struct GNUNET_TESTING_AsyncContext *ac = &brs->ac;
-
-  struct GNUNET_TESTING_Trait traits[] = {
-    GNUNET_TESTING_make_trait_async_context (ac),
-    GNUNET_TESTING_trait_end ()
-  };
-
-  return GNUNET_TESTING_get_trait (traits,
-                                   ret,
-                                   trait,
-                                   index);
-}
-
-
-/**
- * Create command.
- *
- * @param label name for command.
- * @param barrier_label The name of the barrier we wait for (if finishing asynchronous) and which will be reached.
- * @param asynchronous_finish If GNUNET_YES this command will not block.
- * @param node_number The global numer of the node the cmd runs on.
- * @param running_on_master Is this cmd running on the master loop.
- * @param write_message Callback to write messages to the master loop.
- * @return command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_barrier_reached (
-  const char *label,
-  const char *barrier_label,
-  unsigned int asynchronous_finish,
-  unsigned int node_number,
-  unsigned int running_on_master,
-  GNUNET_TESTING_cmd_helper_write_cb write_message)
-{
-  struct BarrierReachedState *brs;
-
-  brs = GNUNET_new (struct BarrierReachedState);
-  brs->label = label;
-  brs->barrier_name = barrier_label;
-  brs->asynchronous_finish = asynchronous_finish;
-  brs->node_number = node_number;
-  brs->running_on_master = running_on_master;
-  brs->write_message = write_message;
-  return GNUNET_TESTING_command_new (brs, label,
-                                     &barrier_reached_run,
-                                     &barrier_reached_cleanup,
-                                     &barrier_reached_traits,
-                                     &brs->ac);
-}
diff --git a/src/service/testing/testing_api_cmd_block_until_external_trigger.c b/src/service/testing/testing_api_cmd_block_until_external_trigger.c
deleted file mode 100644
index fc312cdc9..000000000
--- a/src/service/testing/testing_api_cmd_block_until_external_trigger.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2021 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testing_api_cmd_block_until_all_peers_started.c
- * @brief cmd to block the interpreter loop until all peers started.
- * @author t3sserakt
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "testing_cmds.h"
-#include "gnunet_testing_plugin.h"
-#include "gnunet_testing_barrier.h"
-#include "gnunet_testing_netjail_lib.h"
-
-/**
- * Generic logging shortcut
- */
-#define LOG(kind, ...) GNUNET_log (kind, __VA_ARGS__)
-
-
-/**
- * The cleanup function of this cmd frees resources the cmd allocated.
- *
- */
-static void
-block_until_all_peers_started_cleanup (void *cls)
-{
-  struct BlockState *bs = cls;
-
-  GNUNET_free (bs);
-}
-
-
-static int
-block_until_external_trigger_traits (void *cls,
-                                     const void **ret,
-                                     const char *trait,
-                                     unsigned int index)
-{
-  struct GNUNET_TESTING_BlockState *bs = cls;
-  struct GNUNET_TESTING_AsyncContext *ac = &bs->ac;
-  struct GNUNET_TESTING_Trait traits[] = {
-    GNUNET_TESTING_make_trait_async_context (ac),
-    GNUNET_TESTING_make_trait_block_state (bs),
-    GNUNET_TESTING_trait_end ()
-  };
-
-  return GNUNET_TESTING_get_trait (traits,
-                                   ret,
-                                   trait,
-                                   index);
-}
-
-
-/**
- * This function does nothing but to start the cmd.
- *
- */
-static void
-block_until_all_peers_started_run (void *cls,
-                                   struct GNUNET_TESTING_Interpreter *is)
-{
-  struct GNUNET_TESTING_BlockState *bs = cls;
-  struct GNUNET_TESTING_Command *cmd =
-    GNUNET_TESTING_interpreter_get_current_command (is);
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "block %s running %u!\n",
-       bs->label,
-       bs->asynchronous_finish);
-  if (GNUNET_YES == bs->asynchronous_finish)
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "block %s running asynchronous!\n",
-         bs->label);
-    cmd->asynchronous_finish = bs->asynchronous_finish;
-  }
-}
-
-
-/**
- * Create command.
- *
- * @param label name for command.
- * @return command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_block_until_external_trigger (
-  const char *label)
-{
-  struct GNUNET_TESTING_BlockState *bs;
-
-  bs = GNUNET_new (struct GNUNET_TESTING_BlockState);
-  bs->label = label;
-  return GNUNET_TESTING_command_new (bs,
-                                     label,
-                                     &block_until_all_peers_started_run,
-                                     &block_until_all_peers_started_cleanup,
-                                     &block_until_external_trigger_traits,
-                                     &bs->ac);
-}
diff --git a/src/service/testing/testing_api_cmd_exec_bash_script.c b/src/service/testing/testing_api_cmd_exec_bash_script.c
deleted file mode 100644
index 171a2baac..000000000
--- a/src/service/testing/testing_api_cmd_exec_bash_script.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2023 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testing_api_cmd_local_test_prepared.c
- * @brief cmd to block the interpreter loop until all peers started.
- * @author t3sserakt
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_ng_lib.h"
-
-#define LOG(kind, ...) GNUNET_log (kind, __VA_ARGS__)
-
-struct BashScriptState
-{
-  /**
-   * Context for our asynchronous completion.
-   */
-  struct GNUNET_TESTING_AsyncContext ac;
-
-  /**
-   * Callback handed over to the command, which should
-   * be called upon death or completion of the script.
-   */
-  GNUNET_ChildCompletedCallback cb;
-
-  // Child Wait handle
-  struct GNUNET_ChildWaitHandle *cwh;
-
-   /**
-   * The process id of the script.
-   */
-  struct GNUNET_OS_Process *start_proc;
-
-  /**
-   * Script this cmd will execute.
-   */
-  const char *script;
-
-
-  /**
-   * Arguments for the script
-   */
-  char *const*script_argv;
-
-  /**
-   * Size of script_argv.
-   */
-  int argc;
-};
-
-/**
- * The cleanup function of this cmd frees resources the cmd allocated.
- *
- */
-static void
-exec_bash_script_cleanup (void *cls)
-{
-  struct BashScriptState *bss = cls;
-
-  if (NULL != bss->cwh)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Cancel child\n");
-    GNUNET_wait_child_cancel (bss->cwh);
-    bss->cwh = NULL;
-  }
-  if (NULL != bss->start_proc)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Kill process\n");
-    GNUNET_assert (0 ==
-                   GNUNET_OS_process_kill (bss->start_proc,
-                                           SIGKILL));
-    GNUNET_assert (GNUNET_OK ==
-                   GNUNET_OS_process_wait (bss->start_proc));
-    GNUNET_OS_process_destroy (bss->start_proc);
-    bss->start_proc = NULL;
-  }
-  GNUNET_free (bss);
-}
-
-/**
- * Callback which will be called if the setup script finished.
- *
- */
-static void
-child_completed_callback (void *cls,
-                          enum GNUNET_OS_ProcessStatusType type,
-                          long unsigned int exit_code)
-{
-  struct BashScriptState *bss = cls;
-
-  GNUNET_OS_process_destroy (bss->start_proc);
-  bss->start_proc = NULL;
-  bss->cwh = NULL;
-  if (0 == exit_code)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Child succeeded!\n");
-    GNUNET_TESTING_async_finish (&bss->ac);
-  }
-  else
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Child failed with error %lu!\n",
-                exit_code);
-    GNUNET_TESTING_async_fail (&bss->ac);
-  }
-  bss->cb (cls, type, exit_code);
-}
-
-/**
- * Run method of the command created by the interpreter to wait for another
- * command to finish.
- *
- */
-static void
-exec_bash_script_run (void *cls,
-            struct GNUNET_TESTING_Interpreter *is)
-{
-  struct BashScriptState *bss = cls;
-  enum GNUNET_GenericReturnValue helper_check;
-  char *argv[bss->argc + 2];
-
-  char *data_dir;
-  char *script_name;
-
-  data_dir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR);
-  GNUNET_asprintf (&script_name, "%s%s", data_dir, bss->script);
-
-  helper_check = GNUNET_OS_check_helper_binary (
-    script_name,
-    GNUNET_YES,
-    NULL);
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "script_name %s\n",
-       script_name);
-
-  if (GNUNET_NO == helper_check)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "No SUID for %s!\n",
-                script_name);
-    GNUNET_TESTING_interpreter_fail (is);
-    return;
-  }
-  if (GNUNET_SYSERR == helper_check)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "%s not found!\n",
-                script_name);
-    GNUNET_TESTING_interpreter_fail (is);
-    return;
-  }
-  argv[0] = script_name;
-  if (NULL != bss->script_argv)
-  {
-    for (int i = 0; i < bss->argc;i++)
-      argv[i + 1] = bss->script_argv[i];
-  }
-  argv[bss->argc] = NULL;
-
-  bss->start_proc = GNUNET_OS_start_process_vap (GNUNET_OS_INHERIT_STD_ERR,
-                                     NULL,
-                                     NULL,
-                                     NULL,
-                                     script_name,
-                                     argv);
-  bss->cwh = GNUNET_wait_child (bss->start_proc,
-                               &child_completed_callback,
-                               bss);
-  GNUNET_break (NULL != bss->cwh);
-}
-
-const struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_exec_bash_script (const char *label,
-                                     const char *script,
-                                     char *const script_argv[],
-                                     int argc,
-                                     GNUNET_ChildCompletedCallback cb)
-{
-  struct BashScriptState *bss;
-
-  bss = GNUNET_new (struct BashScriptState);
-  bss->script = script;
-  bss->script_argv = script_argv; // FIXME this is not just a cast to fix
-  bss->argc = argc;
-  bss->cb = cb;
-
-  return GNUNET_TESTING_command_new (bss,
-                                     label,
-                                     &exec_bash_script_run,
-                                     &exec_bash_script_cleanup,
-                                     NULL,
-                                     &bss->ac);
-}
diff --git a/src/service/testing/testing_api_cmd_local_test_prepared.c b/src/service/testing/testing_api_cmd_local_test_prepared.c
deleted file mode 100644
index 2b1525077..000000000
--- a/src/service/testing/testing_api_cmd_local_test_prepared.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2021 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testing_api_cmd_local_test_prepared.c
- * @brief cmd to block the interpreter loop until all peers started.
- * @author t3sserakt
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_plugin.h"
-#include "gnunet_testing_barrier.h"
-#include "gnunet_testing_netjail_lib.h"
-#include "testing_cmds.h"
-
-/**
- * Generic logging shortcut
- */
-#define LOG(kind, ...) GNUNET_log (kind, __VA_ARGS__)
-
-
-/**
- * This function prepares an array with traits.
- *
- */
-enum GNUNET_GenericReturnValue
-local_test_prepared_traits (void *cls,
-                            const void **ret,
-                            const char *trait,
-                            unsigned int index)
-{
-  struct LocalPreparedState *lfs = cls;
-  struct GNUNET_TESTING_Trait traits[] = {
-    GNUNET_TESTING_make_trait_local_prepared_state ((const void *) lfs),
-    GNUNET_TESTING_trait_end ()
-  };
-  return GNUNET_TESTING_get_trait (traits,
-                                   ret,
-                                   trait,
-                                   index);
-}
-
-
-/**
- * The cleanup function of this cmd frees resources the cmd allocated.
- *
- */
-static void
-local_test_prepared_cleanup (void *cls)
-{
-  struct LocalPreparedState *lfs = cls;
-
-  GNUNET_free (lfs);
-}
-
-
-/**
- * This function sends a GNUNET_MESSAGE_TYPE_CMDS_HELPER_LOCAL_TESTS_PREPARED message to the master loop.
- *
- */
-static void
-local_test_prepared_run (void *cls,
-                         struct GNUNET_TESTING_Interpreter *is)
-{
-  struct GNUNET_TESTING_LocalPreparedState *lfs = cls;
-
-  struct GNUNET_TESTING_CommandLocalTestPrepared *reply;
-  size_t msg_length;
-
-  msg_length = sizeof(struct GNUNET_TESTING_CommandLocalTestPrepared);
-  reply = GNUNET_new (struct GNUNET_TESTING_CommandLocalTestPrepared);
-  reply->header.type = htons (
-    GNUNET_MESSAGE_TYPE_CMDS_HELPER_LOCAL_TEST_PREPARED);
-  reply->header.size = htons ((uint16_t) msg_length);
-  lfs->write_message ((struct GNUNET_MessageHeader *) reply, msg_length);
-}
-
-
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_local_test_prepared (const char *label,
-                                        GNUNET_TESTING_cmd_helper_write_cb
-                                        write_message)
-{
-  struct GNUNET_TESTING_LocalPreparedState *lfs;
-
-  lfs = GNUNET_new (struct GNUNET_TESTING_LocalPreparedState);
-  lfs->write_message = write_message;
-
-  return GNUNET_TESTING_command_new (lfs, label,
-                                     &local_test_prepared_run,
-                                     &local_test_prepared_cleanup,
-                                     &local_test_prepared_traits,
-                                     &lfs->ac);
-}
diff --git a/src/service/testing/testing_api_cmd_netjail_start_cmds_helper.c b/src/service/testing/testing_api_cmd_netjail_start_cmds_helper.c
deleted file mode 100644
index 792d7a8cf..000000000
--- a/src/service/testing/testing_api_cmd_netjail_start_cmds_helper.c
+++ /dev/null
@@ -1,917 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2021 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testing/testing_api_cmd_hello_world.c
- * @brief Command to start the netjail peers.
- * @author t3sserakt
- */
-#include "platform.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_plugin.h"
-#include "gnunet_testing_barrier.h"
-#include "gnunet_testing_netjail_lib.h"
-#include "testing.h"
-#include "testing_cmds.h"
-
-#define NETJAIL_EXEC_SCRIPT "netjail_exec.sh"
-
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
-
-/**
- * Generic logging shortcut
- */
-#define LOG(kind, ...) GNUNET_log (kind, __VA_ARGS__)
-
-/**
- * Struct to store messages send/received by the helper into a DLL
- *
- */
-struct HelperMessage
-{
-
-  /**
-   * Kept in a DLL.
-   */
-  struct HelperMessage *next;
-
-  /**
-   * Kept in a DLL.
-   */
-  struct HelperMessage *prev;
-
-  /**
-   * Size of the original message.
-   */
-  uint16_t bytes_msg;
-
-  /* Followed by @e bytes_msg of msg.*/
-};
-
-
-/**
- * Struct to store information handed over to callbacks.
- *
- */
-struct NetJailState
-{
-  /**
-   * Global state of the interpreter, used by a command
-   * to access information about other commands.
-   */
-  struct GNUNET_TESTING_Interpreter *is;
-
-  /**
-   * Context for our asynchronous completion.
-   */
-  struct GNUNET_TESTING_AsyncContext ac;
-
-  /**
-   * The complete topology information.
-   */
-  struct GNUNET_TESTING_NetjailTopology *topology;
-
-  /**
-   * Array with handles of helper processes.
-   */
-  const struct GNUNET_HELPER_Handle **helper;
-
-  /**
-   * Size of the array NetJailState#helper.
-   *
-   */
-  unsigned int n_helper;
-
-  /**
-   * Number of nodes in a natted subnet.
-   *
-   */
-  unsigned int local_m;
-
-  /**
-   * Number of natted subnets.
-   *
-   */
-  unsigned int global_n;
-
-  /**
-   * Number of global known nodes.
-   *
-   */
-  unsigned int known;
-
-
-  /**
-   * Number of test environments started.
-   *
-   */
-  unsigned int number_of_testsystems_started;
-
-  /**
-   * Number of peers started.
-   *
-   */
-  unsigned int number_of_peers_started;
-
-  /**
-   * Number of local tests finished.
-   *
-   */
-  unsigned int number_of_local_tests_finished;
-
-  /**
-   * Number of local tests prepared to finish.
-   *
-   */
-  unsigned int number_of_local_tests_prepared;
-
-  /**
-   * Name of the test case plugin the helper will load.
-   *
-   */
-  char *plugin_name;
-
-  /**
-   * Shall we read the topology from file, or from a string.
-   */
-  unsigned int *read_file;
-
-  /**
-   * String with topology data or name of topology file.
-   */
-  char *topology_data;
-
-  /**
-   * Time after this cmd has to finish.
-   */
-  struct GNUNET_TIME_Relative timeout;
-
-  /**
-   * Timeout task.
-   */
-  struct GNUNET_SCHEDULER_Task *timeout_task;
-};
-
-/**
- * Struct containing the number of the netjail node and the NetJailState which
- * will be handed to callbacks specific to a test environment.
- */
-struct TestingSystemCount
-{
-  /**
-   * The plugin correlated to this netjail node.
-   */
-  struct TestcasePlugin *plugin;
-
-  /**
-   * Kept in a DLL.
-   */
-  struct TestingSystemCount *next;
-
-  /**
-   * Kept in a DLL.
-   */
-  struct TestingSystemCount *prev;
-
-  /**
-   * The send handle for the helper
-   */
-  struct GNUNET_HELPER_SendHandle *shandle;
-
-  /**
-   * Struct to store information handed over to callbacks.
-   *
-   */
-  struct NetJailState *ns;
-
-  /**
-   * The messages send to the helper.
-   */
-  struct GNUNET_MessageHeader *msg;
-};
-
-
-/**
-* Code to clean up resource this cmd used.
-*
-* @param cls closure
-*/
-static void
-netjail_exec_cleanup (void *cls)
-{
-  struct NetJailState *ns = cls;
-  GNUNET_free (ns);
-}
-
-
-/**
- * This function prepares an array with traits.
- *
- */
-static enum GNUNET_GenericReturnValue
-netjail_exec_traits (void *cls,
-                     const void **ret,
-                     const char *trait,
-                     unsigned int index)
-{
-  struct NetJailState *ns = cls;
-  const struct GNUNET_HELPER_Handle **helper = ns->helper;
-
-
-  struct GNUNET_TESTING_Trait traits[] = {
-    GNUNET_TESTING_make_trait_helper_handles (helper),
-    GNUNET_TESTING_trait_end ()
-  };
-
-  return GNUNET_TESTING_get_trait (traits,
-                                   ret,
-                                   trait,
-                                   index);
-}
-
-
-/**
- * Continuation function from GNUNET_HELPER_send()
- *
- * @param cls closure
- * @param result GNUNET_OK on success,
- *               GNUNET_NO if helper process died
- *               GNUNET_SYSERR during GNUNET_HELPER_stop
- */
-static void
-clear_msg (void *cls, int result)
-{
-  struct TestingSystemCount *tbc = cls;
-
-  GNUNET_assert (NULL != tbc->shandle);
-  // GNUNET_free (tbc->shandle);
-  GNUNET_free (tbc->plugin);
-  tbc->shandle = NULL;
-  GNUNET_free (tbc);
-}
-
-
-static void
-send_message_to_locals (
-  unsigned int i,
-  unsigned int j,
-  struct NetJailState *ns,
-  struct GNUNET_MessageHeader *header
-  )
-{
-  const struct GNUNET_HELPER_Handle *helper;
-  struct TestingSystemCount *tbc;
-  unsigned int count;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "send message of type %u to locals\n",
-       header->type);
-  tbc = GNUNET_new (struct TestingSystemCount);
-  tbc->ns = ns;
-  if (0 == i)
-    count = j;
-  else
-    count = (i - 1) * ns->local_m + j + ns->known;
-
-  helper = ns->helper[count - 1];
-
-
-  struct GNUNET_HELPER_SendHandle *sh = GNUNET_HELPER_send (
-    (struct GNUNET_HELPER_Handle *) helper,
-    header,
-    GNUNET_NO,
-    &clear_msg,
-    tbc);
-
-  tbc->shandle = sh;
-}
-
-
-static void
-send_all_local_tests_prepared (unsigned int i, unsigned int j, struct
-                               NetJailState *ns)
-{
-  struct GNUNET_TESTING_CommandAllLocalTestsPrepared *reply;
-  size_t msg_length;
-
-
-  msg_length = sizeof(struct GNUNET_TESTING_CommandAllLocalTestsPrepared);
-  reply = GNUNET_new (struct GNUNET_TESTING_CommandAllLocalTestsPrepared);
-  reply->header.type = htons (
-    GNUNET_MESSAGE_TYPE_CMDS_HELPER_ALL_LOCAL_TESTS_PREPARED);
-  reply->header.size = htons ((uint16_t) msg_length);
-
-  send_message_to_locals (i, j, ns, &reply->header);
-  GNUNET_free (reply);
-}
-
-
-static void
-send_all_peers_started (unsigned int i, unsigned int j, struct NetJailState *ns)
-{
-  struct GNUNET_TESTING_CommandAllPeersStarted *reply;
-  size_t msg_length;
-
-  msg_length = sizeof(struct GNUNET_TESTING_CommandAllPeersStarted);
-  reply = GNUNET_new (struct GNUNET_TESTING_CommandAllPeersStarted);
-  reply->header.type = htons (
-    GNUNET_MESSAGE_TYPE_CMDS_HELPER_ALL_PEERS_STARTED);
-  reply->header.size = htons ((uint16_t) msg_length);
-
-  send_message_to_locals (i, j, ns, &reply->header);
-  GNUNET_free (reply);
-}
-
-
-void
-barrier_attached (struct NetJailState *ns, const struct
-                  GNUNET_MessageHeader *message)
-{
-  struct CommandBarrierAttached *am;
-  struct GNUNET_TESTING_NetjailNode *node;
-  struct GNUNET_TESTING_Barrier *barrier;
-  struct GNUNET_ShortHashCode key;
-  struct GNUNET_HashCode hc;
-  const char *barrier_name;
-
-  am = (struct CommandBarrierAttached *) message;
-  barrier_name = (const char *) &am[1];
-  barrier = GNUNET_TESTING_get_barrier_ (ns->is,
-                                         barrier_name);
-  GNUNET_assert (NULL != barrier);
-  node = GNUNET_TESTING_barrier_get_node (barrier,
-                                          am->node_number);
-  if (NULL == node)
-  {
-    node = GNUNET_new (struct GNUNET_TESTING_NetjailNode);
-    node->node_number = am->node_number;
-
-    GNUNET_CRYPTO_hash (&(node->node_number), sizeof(node->node_number), &hc);
-    memcpy (&key, &hc, sizeof (key));
-    GNUNET_CONTAINER_multishortmap_put (barrier->nodes,
-                                        &key,
-                                        node,
-                                        GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
-  }
-  node->expected_reaches = node->expected_reaches + am->expected_reaches;
-  barrier->expected_reaches = barrier->expected_reaches + am->expected_reaches;
-}
-
-
-void
-barrier_reached (struct NetJailState *ns,
-                 const struct GNUNET_MessageHeader *message)
-{
-  struct GNUNET_TESTING_Barrier *barrier;
-  const char *barrier_name;
-  const struct GNUNET_TESTING_CommandBarrierReached *rm;
-
-  rm = (const struct GNUNET_TESTING_CommandBarrierReached *) message;
-  barrier_name = (const char *) &rm[1];
-  barrier = GNUNET_TESTING_get_barrier_ (ns->is,
-                                         barrier_name);
-  GNUNET_assert (NULL != barrier);
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "barrier %s reached %p %u\n",
-       barrier_name,
-       barrier,
-       barrier->reached);
-  barrier->reached++;
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "%u %p\n",
-       barrier->reached,
-       barrier);
-  if (GNUNET_TESTING_barrier_crossable_ (barrier))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "%s can be crossed\n",
-         barrier_name);
-    GNUNET_TESTING_finish_barrier_ (ns->is,
-                                    barrier->name);
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "barrier %s reached finished\n",
-       barrier_name);
-}
-
-
-/**
- * Functions with this signature are called whenever a
- * complete message is received by the tokenizer.
- *
- * Do not call GNUNET_SERVER_mst_destroy in callback
- *
- * @param cls closure
- * @param client identification of the client
- * @param message the actual message
- *
- * @return #GNUNET_OK on success, #GNUNET_SYSERR to stop further processing
- */
-static int
-helper_mst (void *cls, const struct GNUNET_MessageHeader *message)
-{
-  struct NetJailState *ns = cls;
-  unsigned int total_number = ns->local_m * ns->global_n + ns->known;
-  uint16_t message_type = ntohs (message->type);
-  struct GNUNET_TESTING_CommandLocalFinished *lf;
-
-  switch (message_type)
-  {
-  case GNUNET_MESSAGE_TYPE_CMDS_HELPER_BARRIER_ATTACHED:
-    barrier_attached (ns, message);
-    break;
-  case GNUNET_MESSAGE_TYPE_CMDS_HELPER_BARRIER_REACHED:
-    barrier_reached (ns, message);
-    break;
-  case GNUNET_MESSAGE_TYPE_CMDS_HELPER_REPLY:
-    ns->number_of_testsystems_started++;
-    break;
-  case GNUNET_MESSAGE_TYPE_CMDS_HELPER_PEER_STARTED:
-    ns->number_of_peers_started++;
-    if (ns->number_of_peers_started == total_number)
-    {
-      for (int i = 1; i <= ns->known; i++)
-      {
-        send_all_peers_started (0,i, ns);
-      }
-      for (int i = 1; i <= ns->global_n; i++)
-      {
-        for (int j = 1; j <= ns->local_m; j++)
-        {
-          send_all_peers_started (i,j, ns);
-        }
-      }
-      ns->number_of_peers_started = 0;
-    }
-    break;
-  case GNUNET_MESSAGE_TYPE_CMDS_HELPER_LOCAL_TEST_PREPARED:
-    ns->number_of_local_tests_prepared++;
-    if (ns->number_of_local_tests_prepared == total_number)
-    {
-      for (int i = 1; i <= ns->known; i++)
-      {
-        send_all_local_tests_prepared (0,i, ns);
-      }
-
-      for (int i = 1; i <= ns->global_n; i++)
-      {
-        for (int j = 1; j <= ns->local_m; j++)
-        {
-          send_all_local_tests_prepared (i,j, ns);
-        }
-      }
-    }
-    break;
-  case GNUNET_MESSAGE_TYPE_CMDS_HELPER_LOCAL_FINISHED:
-    lf = (struct GNUNET_TESTING_CommandLocalFinished *) message;
-
-    ns->number_of_local_tests_finished++;
-    if (GNUNET_OK != lf->rv)
-    {
-      GNUNET_TESTING_async_fail (&(ns->ac));
-    }
-    else if (ns->number_of_local_tests_finished == total_number)
-    {
-      GNUNET_SCHEDULER_cancel (ns->timeout_task);
-      ns->timeout_task = NULL;
-      GNUNET_TESTING_async_finish (&ns->ac);
-    }
-    break;
-  default:
-    // We received a message we can not handle.
-    GNUNET_assert (0);
-  }
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "total %u sysstarted %u peersstarted %u prep %u finished %u %u %u %u\n",
-       total_number,
-       ns->number_of_testsystems_started,
-       ns->number_of_peers_started,
-       ns->number_of_local_tests_prepared,
-       ns->number_of_local_tests_finished,
-       ns->local_m,
-       ns->global_n,
-       ns->known);
-
-
-  return GNUNET_OK;
-}
-
-
-/**
- * Callback called if there was an exception during execution of the helper.
- *
- */
-static void
-exp_cb (void *cls)
-{
-  struct NetJailState *ns = cls;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Called exp_cb.\n");
-  if (NULL != ns->timeout_task)
-    GNUNET_SCHEDULER_cancel (ns->timeout_task);
-  GNUNET_TESTING_async_fail (&(ns->ac));
-}
-
-
-/**
- * Function to initialize a init message for the helper.
- *
- * @param plugin_name Name of the test case plugin the helper will load.
- *
- */
-static struct GNUNET_TESTING_CommandHelperInit *
-create_helper_init_msg_ (const char *plugin_name)
-{
-  struct GNUNET_TESTING_CommandHelperInit *msg;
-  uint16_t plugin_name_len;
-  uint16_t msg_size;
-
-  GNUNET_assert (NULL != plugin_name);
-  plugin_name_len = strlen (plugin_name);
-  msg_size = sizeof(struct GNUNET_TESTING_CommandHelperInit) + plugin_name_len;
-  msg = GNUNET_malloc (msg_size);
-  msg->header.size = htons (msg_size);
-  msg->header.type = htons (GNUNET_MESSAGE_TYPE_CMDS_HELPER_INIT);
-  msg->plugin_name_size = htons (plugin_name_len);
-  GNUNET_memcpy ((char *) &msg[1],
-                 plugin_name,
-                 plugin_name_len);
-  return msg;
-}
-
-
-/**
- * Function which start a single helper process.
- *
- */
-static void
-start_helper (struct NetJailState *ns,
-              unsigned int m,
-              unsigned int n)
-{
-  struct TestcasePlugin *plugin;
-  struct GNUNET_HELPER_Handle *helper;
-  struct GNUNET_TESTING_CommandHelperInit *msg;
-  struct TestingSystemCount *tbc;
-  char *m_char;
-  char *n_char;
-  char *global_n_char;
-  char *local_m_char;
-  char *known_char;
-  char *node_id;
-  char *plugin_name;
-  char *read_file;
-  pid_t pid;
-  unsigned int script_num;
-  struct GNUNET_ShortHashCode *hkey;
-  struct GNUNET_ShortHashCode key;
-  struct GNUNET_HashCode hc;
-  struct GNUNET_TESTING_NetjailTopology *topology = ns->topology;
-  struct GNUNET_TESTING_NetjailNode *node;
-  struct GNUNET_TESTING_NetjailNode *barrier_node;
-  struct GNUNET_TESTING_NetjailNamespace *namespace;
-  char *data_dir;
-  char *script_name;
-  struct GNUNET_TESTING_BarrierListEntry *pos;
-  struct GNUNET_TESTING_Barrier *barrier;
-  struct GNUNET_TESTING_BarrierList *barriers;
-  unsigned int node_num;
-  char *binary_path;
-
-  if (0 == n)
-  {
-    node_num = m;
-    script_num = m - 1;
-  }
-  else
-  {
-    node_num = (n - 1) * ns->local_m + m + ns->known;
-    script_num = n - 1 + (n - 1) * ns->local_m + m + ns->known;
-  }
-  pid = getpid ();
-
-  GNUNET_asprintf (&m_char, "%u", m);
-  GNUNET_asprintf (&n_char, "%u", n);
-  GNUNET_asprintf (&local_m_char, "%u", ns->local_m);
-  GNUNET_asprintf (&global_n_char, "%u",ns->global_n);
-  GNUNET_asprintf (&known_char, "%u",ns->known);
-  GNUNET_asprintf (&node_id, "%s%06x-%06x\n",
-                   "if",
-                   pid,
-                   script_num);
-  // GNUNET_asprintf (&topology_data, "'%s'", ns->topology_data);
-  GNUNET_asprintf (&read_file,
-                   "%u",
-                   *(ns->read_file));
-
-  data_dir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR);
-  GNUNET_asprintf (&script_name,
-                   "%s%s",
-                   data_dir,
-                   NETJAIL_EXEC_SCRIPT);
-  unsigned int helper_check = GNUNET_OS_check_helper_binary (
-    script_name,
-    GNUNET_YES,
-    NULL);
-
-  tbc = GNUNET_new (struct TestingSystemCount);
-  tbc->ns = ns;
-
-  if (GNUNET_NO == helper_check)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "No SUID for %s!\n",
-                script_name);
-    GNUNET_TESTING_interpreter_fail (ns->is);
-    // FIXME: why continue here, instead of returning?
-  }
-  else if (GNUNET_NO == helper_check)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "%s not found!\n",
-                script_name);
-    GNUNET_TESTING_interpreter_fail (ns->is);
-  }
-
-  binary_path = GNUNET_OS_get_libexec_binary_path (HELPER_CMDS_BINARY);
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "sysstarted %u peersstarted %u prep %u finished %u %u %u %u\n",
-       ns->number_of_testsystems_started,
-       ns->number_of_peers_started,
-       ns->number_of_local_tests_prepared,
-       ns->number_of_local_tests_finished,
-       ns->local_m,
-       ns->global_n,
-       ns->known);
-  {
-    char *const script_argv[] = {script_name,
-                                 m_char,
-                                 n_char,
-                                 binary_path,
-                                 global_n_char,
-                                 local_m_char,
-                                 node_id,
-                                 read_file,
-                                 ns->topology_data,
-                                 NULL};
-    helper = GNUNET_HELPER_start (
-      GNUNET_YES,
-      script_name,
-      script_argv,
-      &helper_mst,
-      &exp_cb,
-      ns);
-    GNUNET_array_append (ns->helper,
-                         ns->n_helper,
-                         helper);
-  }
-  GNUNET_TESTING_add_netjail_helper_ (ns->is,
-                                      helper);
-  plugin_name = topology->plugin;
-
-  hkey = GNUNET_new (struct GNUNET_ShortHashCode);
-  node = NULL;
-  if (0 == n)
-  {
-    GNUNET_CRYPTO_hash (&m,
-                        sizeof(m),
-                        &hc);
-    memcpy (hkey,
-            &hc,
-            sizeof (*hkey));
-    if (1 == GNUNET_CONTAINER_multishortmap_contains (topology->map_globals,
-                                                      hkey))
-    {
-      node = GNUNET_CONTAINER_multishortmap_get (topology->map_globals,
-                                                 hkey);
-      if (NULL != node->plugin)
-        plugin_name = node->plugin;
-    }
-  }
-  else
-  {
-    GNUNET_CRYPTO_hash (&n, sizeof(n), &hc);
-    memcpy (hkey,
-            &hc,
-            sizeof (*hkey));
-    if (1 == GNUNET_CONTAINER_multishortmap_contains (topology->map_namespaces,
-                                                      hkey))
-    {
-      namespace = GNUNET_CONTAINER_multishortmap_get (topology->map_namespaces,
-                                                      hkey);
-      GNUNET_CRYPTO_hash (&m, sizeof(m), &hc);
-      memcpy (hkey,
-              &hc,
-              sizeof (*hkey));
-      if (1 == GNUNET_CONTAINER_multishortmap_contains (namespace->nodes,
-                                                        hkey))
-      {
-        node = GNUNET_CONTAINER_multishortmap_get (namespace->nodes,
-                                                   hkey);
-        if (NULL != node->plugin)
-          plugin_name = node->plugin;
-      }
-    }
-
-
-  }
-  GNUNET_assert (NULL != node);
-  node->node_number = node_num;
-  plugin = GNUNET_new (struct TestcasePlugin);
-  plugin->api = GNUNET_PLUGIN_load (plugin_name,
-                                    NULL);
-  barriers = plugin->api->get_waiting_for_barriers ();
-
-
-  for (pos = barriers->head; NULL != pos; pos = pos->next)
-  {
-    barrier = GNUNET_TESTING_get_barrier_ (ns->is,
-                                           pos->barrier_name);
-    if (NULL == barrier)
-    {
-      barrier = GNUNET_new (struct GNUNET_TESTING_Barrier);
-      barrier->name = pos->barrier_name;
-      barrier->shadow = GNUNET_YES;
-      GNUNET_TESTING_add_barrier_ (ns->is,
-                                   barrier);
-    }
-    barrier_node = GNUNET_new (struct GNUNET_TESTING_NetjailNode);
-    barrier_node->node_number = node->node_number;
-    barrier_node->expected_reaches = pos->expected_reaches;
-    barrier->expected_reaches = barrier->expected_reaches
-                                + pos->expected_reaches;
-    if (GNUNET_YES == barrier->shadow)
-      barrier->number_to_be_reached++;
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Adding barrier %p %s node %u with reach target %u\n",
-         barrier,
-         pos->barrier_name,
-         node->node_number,
-         barrier->number_to_be_reached);
-    GNUNET_CRYPTO_hash (&node->node_number,
-                        sizeof(node->node_number),
-                        &hc);
-    memcpy (&key, &hc, sizeof (key));
-    if (NULL == barrier->nodes)
-      barrier->nodes
-        = GNUNET_CONTAINER_multishortmap_create (16,
-                                                 GNUNET_NO);
-    GNUNET_CONTAINER_multishortmap_put (barrier->nodes,
-                                        &key,
-                                        barrier_node,
-                                        GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
-  }
-
-  tbc->plugin = plugin;
-  msg = create_helper_init_msg_ (plugin_name);
-  tbc->shandle = GNUNET_HELPER_send (
-    helper,
-    &msg->header,
-    GNUNET_NO,
-    &clear_msg,
-    tbc);
-
-  if (NULL == tbc->shandle)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Send handle is NULL!\n");
-    GNUNET_TESTING_interpreter_fail (ns->is);
-  }
-  GNUNET_free (pos);
-  GNUNET_free (binary_path);
-  GNUNET_free (hkey);
-  GNUNET_free (msg);
-  GNUNET_free (m_char);
-  GNUNET_free (n_char);
-  GNUNET_free (local_m_char);
-  GNUNET_free (global_n_char);
-  GNUNET_free (known_char);
-  GNUNET_free (node_id);
-  GNUNET_free (read_file);
-  GNUNET_free (data_dir);
-  GNUNET_free (script_name);
-  GNUNET_free (barriers);
-}
-
-
-/**
- * Function run when the cmd terminates (good or bad) with timeout.
- *
- * @param cls the interpreter state
- */
-static void
-do_timeout (void *cls)
-{
-  struct NetJailState *ns = cls;
-  struct GNUNET_TESTING_Command *cmd;
-
-  ns->timeout_task = NULL;
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              "Terminating cmd due to global timeout\n");
-  cmd = GNUNET_TESTING_interpreter_get_current_command (ns->is);
-  GNUNET_TESTING_async_finish (cmd->ac);
-}
-
-
-/**
-* This function starts a helper process for each node.
-*
-* @param cls closure.
-* @param cmd CMD being run.
-* @param is interpreter state.
-*/
-static void
-netjail_exec_run (void *cls,
-                  struct GNUNET_TESTING_Interpreter *is)
-{
-  struct NetJailState *ns = cls;
-
-  ns->is = is;
-  for (int i = 1; i <= ns->known; i++)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "i %u\n",
-                i);
-    start_helper (ns,
-                  i,
-                  0);
-  }
-
-  for (int i = 1; i <= ns->global_n; i++)
-  {
-    for (int j = 1; j <= ns->local_m; j++)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "i %u j %u\n",
-                  i,
-                  j);
-      start_helper (ns,
-                    j,
-                    i);
-    }
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Adding timeout %s\n",
-              GNUNET_STRINGS_relative_time_to_string (ns->timeout, GNUNET_NO));
-  ns->timeout_task
-    = GNUNET_SCHEDULER_add_delayed (ns->timeout,
-                                    &do_timeout,
-                                    ns);
-}
-
-
-/**
- * Create command.
- *
- * @param label Name for the command.
- * @param topology The complete topology information.
- * @param read_file Flag indicating if the the name of the topology file is send to the helper, or a string with the topology data.
- * @param topology_data If read_file is GNUNET_NO, topology_data holds the string with the topology.
- * @param timeout Before this timeout is reached this cmd MUST finish.
- * @return command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_netjail_start_cmds_helper (
-  const char *label,
-  struct GNUNET_TESTING_NetjailTopology *topology,
-  unsigned int *read_file,
-  char *topology_data,
-  struct GNUNET_TIME_Relative timeout)
-{
-  struct NetJailState *ns;
-
-  ns = GNUNET_new (struct NetJailState);
-  ns->local_m = topology->nodes_m;
-  ns->global_n = topology->namespaces_n;
-  ns->known = topology->nodes_x;
-  ns->plugin_name = topology->plugin;
-  ns->topology = topology;
-  ns->read_file = read_file;
-  ns->topology_data = topology_data;
-  ns->timeout = GNUNET_TIME_relative_subtract (timeout, TIMEOUT);
-
-  return GNUNET_TESTING_command_new (ns, label,
-                                     &netjail_exec_run,
-                                     &netjail_exec_cleanup,
-                                     &netjail_exec_traits,
-                                     &ns->ac);
-}
diff --git a/src/service/testing/testing_api_cmd_netjail_stop.c b/src/service/testing/testing_api_cmd_netjail_stop.c
deleted file mode 100644
index cc05617f7..000000000
--- a/src/service/testing/testing_api_cmd_netjail_stop.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2021 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testing/testing_api_cmd_netjail_stop.c
- * @brief Command to stop the netjail script.
- * @author t3sserakt
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_plugin.h"
-#include "gnunet_testing_barrier.h"
-#include "gnunet_testing_netjail_lib.h"
-
-
-#define NETJAIL_STOP_SCRIPT "netjail_stop.sh"
-
-/**
- * Struct to hold information for callbacks.
- *
- */
-struct NetJailState
-{
-  /**
-   * Context for our asynchronous completion.
-   */
-  struct GNUNET_TESTING_AsyncContext ac;
-
-  // Child Wait handle
-  struct GNUNET_ChildWaitHandle *cwh;
-
-  /**
-   * Configuration file for the test topology.
-   */
-  char *topology_config;
-
-  /**
-   * The process id of the start script.
-   */
-  struct GNUNET_OS_Process *stop_proc;
-
-  /**
-   * Shall we read the topology from file, or from a string.
-   */
-  unsigned int *read_file;
-
-};
-
-
-/**
- * The cleanup function of this cmd frees resources the cmd allocated.
- *
- */
-static void
-netjail_stop_cleanup (void *cls)
-{
-  struct NetJailState *ns = cls;
-
-  if (NULL != ns->cwh)
-  {
-    GNUNET_wait_child_cancel (ns->cwh);
-    ns->cwh = NULL;
-  }
-  if (NULL != ns->stop_proc)
-  {
-    GNUNET_assert (0 ==
-                   GNUNET_OS_process_kill (ns->stop_proc,
-                                           SIGKILL));
-    GNUNET_assert (GNUNET_OK ==
-                   GNUNET_OS_process_wait (ns->stop_proc));
-    GNUNET_OS_process_destroy (ns->stop_proc);
-    ns->stop_proc = NULL;
-  }
-  GNUNET_free (ns);
-}
-
-
-/**
- * Callback which will be called if the setup script finished.
- *
- */
-static void
-child_completed_callback (void *cls,
-                          enum GNUNET_OS_ProcessStatusType type,
-                          long unsigned int exit_code)
-{
-  struct NetJailState *ns = cls;
-
-  ns->cwh = NULL;
-  GNUNET_OS_process_destroy (ns->stop_proc);
-  ns->stop_proc = NULL;
-  if (0 == exit_code)
-  {
-    GNUNET_TESTING_async_finish (&ns->ac);
-  }
-  else
-  {
-    GNUNET_TESTING_async_fail (&ns->ac);
-  }
-}
-
-
-/**
-* The run method starts the script which deletes the network namespaces.
-*
-* @param cls closure.
-* @param is interpreter state.
-*/
-static void
-netjail_stop_run (void *cls,
-                  struct GNUNET_TESTING_Interpreter *is)
-{
-  struct NetJailState *ns = cls;
-  char *pid;
-  char *data_dir;
-  char *script_name;
-  char *read_file;
-
-
-  data_dir = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR);
-  GNUNET_asprintf (&script_name, "%s%s", data_dir, NETJAIL_STOP_SCRIPT);
-  GNUNET_asprintf (&read_file, "%u", *(ns->read_file));
-  unsigned int helper_check = GNUNET_OS_check_helper_binary (
-    script_name,
-    GNUNET_YES,
-    NULL);
-
-  if (GNUNET_NO == helper_check)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "No SUID for %s!\n",
-                script_name);
-    GNUNET_TESTING_interpreter_fail (is);
-  }
-  else if (GNUNET_NO == helper_check)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "%s not found!\n",
-                script_name);
-    GNUNET_TESTING_interpreter_fail (is);
-  }
-
-  GNUNET_asprintf (&pid,
-                   "%u",
-                   getpid ());
-  {
-    char *const script_argv[] = {script_name,
-                                 ns->topology_config,
-                                 pid,
-                                 read_file,
-                                 NULL};
-    ns->stop_proc = GNUNET_OS_start_process_vap (GNUNET_OS_INHERIT_STD_ERR,
-                                                 NULL,
-                                                 NULL,
-                                                 NULL,
-                                                 script_name,
-                                                 script_argv);
-  }
-  ns->cwh = GNUNET_wait_child (ns->stop_proc,
-                               &child_completed_callback,
-                               ns);
-  GNUNET_break (NULL != ns->cwh);
-  GNUNET_free (read_file);
-  GNUNET_free (pid);
-}
-
-
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_netjail_stop (const char *label,
-                                 char *topology_config,
-                                 unsigned int *read_file)
-{
-  struct NetJailState *ns;
-
-  ns = GNUNET_new (struct NetJailState);
-  ns->topology_config = topology_config;
-  ns->read_file = read_file;
-  return GNUNET_TESTING_command_new (ns, label,
-                                     &netjail_stop_run,
-                                     &netjail_stop_cleanup,
-                                     NULL, &ns->ac);
-}
diff --git a/src/service/testing/testing_api_cmd_netjail_stop_cmds_helper.c b/src/service/testing/testing_api_cmd_netjail_stop_cmds_helper.c
deleted file mode 100644
index c6bb0ab52..000000000
--- a/src/service/testing/testing_api_cmd_netjail_stop_cmds_helper.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2021 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testing/testing_api_cmd_hello_world.c
- * @brief Command to start the netjail peers.
- * @author t3sserakt
- */
-#include "platform.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_plugin.h"
-#include "gnunet_testing_barrier.h"
-#include "gnunet_testing_netjail_lib.h"
-#include "testing_cmds.h"
-
-
-/**
- * Struct to store information handed over to callbacks.
- *
- */
-struct StopHelperState
-{
-
-  /**
-   * The complete topology information.
-   */
-  struct GNUNET_TESTING_NetjailTopology *topology;
-
-  const char *helper_start_label;
-
-  /**
-   * The process handle
-   */
-  struct GNUNET_HELPER_Handle **helper;
-
-  unsigned int local_m;
-
-  unsigned int global_n;
-
-  /**
-   * Number of global known nodes.
-   *
-   */
-  unsigned int known;
-};
-
-
-/**
-* Code to clean up resource this cmd used.
-*
-* @param cls closure
-* @param cmd current CMD being cleaned up.
-*/
-static void
-stop_testing_system_cleanup (void *cls)
-{
-  struct StopHelperState *shs = cls;
-
-  GNUNET_free (shs);
-}
-
-
-/**
-* This function stops the helper process for each node.
-*
-* @param cls closure.
-* @param is interpreter state.
-*/
-static void
-stop_testing_system_run (void *cls,
-                         struct GNUNET_TESTING_Interpreter *is)
-{
-  struct StopHelperState *shs = cls;
-  const struct GNUNET_HELPER_Handle **helper;
-  const struct GNUNET_TESTING_Command *start_helper_cmd;
-
-  start_helper_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
-                                                                shs->
-                                                                helper_start_label);
-  GNUNET_TESTING_get_trait_helper_handles (start_helper_cmd,
-                                           &helper);
-
-  for (int i = 1; i <= shs->known; i++)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "i: %u\n",
-                i);
-    GNUNET_HELPER_stop (
-      (struct GNUNET_HELPER_Handle *) helper[i - 1],
-      GNUNET_YES);
-  }
-
-  for (int i = 1; i <= shs->global_n; i++)
-  {
-    for (int j = 1; j <= shs->local_m; j++)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "i: %u j: %u\n",
-                  i,
-                  j);
-      GNUNET_HELPER_stop ((struct GNUNET_HELPER_Handle *) helper[(i - 1)
-                                                                 * shs->local_m
-                                                                 + j
-                                                                 + shs->known
-                                                                 - 1],
-                          GNUNET_YES);
-    }
-  }
-  GNUNET_free (helper);
-}
-
-
-/**
- * Create command.
- *
- * @param label name for command.
- * @param helper_start_label label of the cmd to start the test system.
- * @param topology The complete topology information.
- * @return command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_stop_cmds_helper (
-  const char *label,
-  const char *helper_start_label,
-  struct GNUNET_TESTING_NetjailTopology *topology)
-{
-  struct StopHelperState *shs;
-
-  shs = GNUNET_new (struct StopHelperState);
-  shs->helper_start_label = helper_start_label;
-  shs->local_m = topology->nodes_m;
-  shs->global_n = topology->namespaces_n;
-  shs->known = topology->nodes_x;
-  shs->topology = topology;
-
-  return GNUNET_TESTING_command_new (shs, label,
-                                     &stop_testing_system_run,
-                                     &stop_testing_system_cleanup,
-                                     NULL, NULL);
-}
diff --git a/src/service/testing/testing_api_cmd_send_peer_ready.c b/src/service/testing/testing_api_cmd_send_peer_ready.c
deleted file mode 100644
index f615a1cee..000000000
--- a/src/service/testing/testing_api_cmd_send_peer_ready.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2021 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testing_api_cmd_send_peer_ready.c
- * @brief cmd to send a helper message if peer is ready.
- * @author t3sserakt
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_plugin.h"
-#include "gnunet_testing_barrier.h"
-#include "gnunet_testing_netjail_lib.h"
-#include "testing_cmds.h"
-
-
-/**
- * Struct to hold information for callbacks.
- *
- */
-struct SendPeerReadyState
-{
-  /**
-   * Callback to write messages to the master loop.
-   *
-   */
-  GNUNET_TESTING_cmd_helper_write_cb write_message;
-
-  /**
-   * The message send back to the master loop.
-   *
-   */
-  struct GNUNET_TESTING_CommandPeerStarted *reply;
-};
-
-
-/**
- * Trait function of this cmd does nothing.
- *
- */
-static enum GNUNET_GenericReturnValue
-send_peer_ready_traits (void *cls,
-                        const void **ret,
-                        const char *trait,
-                        unsigned int index)
-{
-  return GNUNET_NO;
-}
-
-
-/**
- * The cleanup function of this cmd frees resources the cmd allocated.
- *
- */
-static void
-send_peer_ready_cleanup (void *cls)
-{
-  struct SendPeerReadyState *sprs = cls;
-
-  GNUNET_free (sprs);
-}
-
-
-/**
- * This function sends a GNUNET_MESSAGE_TYPE_CMDS_HELPER_PEER_STARTED message to the master loop.
- *
- */
-static void
-send_peer_ready_run (void *cls,
-                     struct GNUNET_TESTING_Interpreter *is)
-{
-  struct SendPeerReadyState *sprs = cls;
-  struct GNUNET_TESTING_CommandPeerStarted *reply;
-  size_t msg_length;
-
-  msg_length = sizeof(struct GNUNET_TESTING_CommandPeerStarted);
-  reply = GNUNET_new (struct GNUNET_TESTING_CommandPeerStarted);
-  reply->header.type = htons (GNUNET_MESSAGE_TYPE_CMDS_HELPER_PEER_STARTED);
-  reply->header.size = htons ((uint16_t) msg_length);
-  sprs->reply = reply;
-  sprs->write_message ((struct GNUNET_MessageHeader *) reply, msg_length);
-}
-
-
-/**
- * Create command.
- *
- * @param label name for command.
- * @param write_message Callback to write messages to the master loop.
- * @return command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_send_peer_ready (const char *label,
-                                    GNUNET_TESTING_cmd_helper_write_cb
-                                    write_message)
-{
-  struct SendPeerReadyState *sprs;
-
-  sprs = GNUNET_new (struct SendPeerReadyState);
-  sprs->write_message = write_message;
-  return GNUNET_TESTING_command_new (sprs, label,
-                                     &send_peer_ready_run,
-                                     &send_peer_ready_cleanup,
-                                     &send_peer_ready_traits, NULL);
-}
diff --git a/src/service/testing/testing_api_cmd_system_destroy.c b/src/service/testing/testing_api_cmd_system_destroy.c
deleted file mode 100644
index 45adfd0da..000000000
--- a/src/service/testing/testing_api_cmd_system_destroy.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2021 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testing_api_cmd_system_destroy.c
- * @brief cmd to destroy a testing system handle.
- * @author t3sserakt
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_plugin.h"
-#include "gnunet_testing_netjail_lib.h"
-#include "gnunet_testing_lib.h"
-
-
-/**
- * Struct to hold information for callbacks.
- *
- */
-struct TestSystemState
-{
-  // Label of the cmd which started the test system.
-  const char *create_label;
-};
-
-
-/**
- * The run method of this cmd will remove the test environment for a node.
- *
- */
-static void
-system_destroy_run (void *cls,
-                    struct GNUNET_TESTING_Interpreter *is)
-{
-  struct TestSystemState *tss = cls;
-  const struct GNUNET_TESTING_Command *system_cmd;
-  const struct GNUNET_TESTING_System *tl_system;
-
-  system_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
-                                                          tss->create_label);
-  GNUNET_TESTING_get_trait_test_system (system_cmd,
-                                        &tl_system);
-  GNUNET_TESTING_system_destroy ((struct GNUNET_TESTING_System *) tl_system,
-                                 GNUNET_YES);
-}
-
-
-/**
- * The cleanup function of this cmd frees resources the cmd allocated.
- *
- */
-static void
-system_destroy_cleanup (void *cls)
-{
-  struct TestSystemState *tss = cls;
-
-  GNUNET_free (tss);
-}
-
-
-/**
- * Trait function of this cmd does nothing.
- *
- */
-static enum GNUNET_GenericReturnValue
-system_destroy_traits (void *cls,
-                       const void **ret,
-                       const char *trait,
-                       unsigned int index)
-{
-  return GNUNET_OK;
-}
-
-
-/**
- * Create command.
- *
- * @param label name for command.
- * @param create_label Label of the cmd which started the test system.
- * @return command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_system_destroy (const char *label,
-                                   const char *create_label)
-{
-  struct TestSystemState *tss;
-
-  tss = GNUNET_new (struct TestSystemState);
-  tss->create_label = create_label;
-  return GNUNET_TESTING_command_new (tss, label, &system_destroy_run,
-                                     &system_destroy_cleanup,
-                                     &system_destroy_traits, NULL);
-}
diff --git a/src/service/testing/testing_api_loop.c b/src/service/testing/testing_api_loop.c
deleted file mode 100644
index beb9b9060..000000000
--- a/src/service/testing/testing_api_loop.c
+++ /dev/null
@@ -1,893 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2021-2023 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testing/testing_api_loop.c
- * @brief main interpreter loop for testcases
- * @author Christian Grothoff (GNU Taler testing)
- * @author Marcello Stanisci (GNU Taler testing)
- * @author t3sserakt
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_plugin.h"
-#include "gnunet_testing_barrier.h"
-#include "gnunet_testing_netjail_lib.h"
-#include "testing.h"
-
-/**
- * Global state of the interpreter, used by a command
- * to access information about other commands.
- */
-struct GNUNET_TESTING_Interpreter
-{
-  /**
-   * Array with handles of helper processes for communication with netjails.
-   */
-  const struct GNUNET_HELPER_Handle **helper;
-
-  /**
-   * Handle to a send op
-   */
-  struct GNUNET_HELPER_SendHandle *send_handle;
-
-  /**
-   * Function to call with the test result.
-   */
-  GNUNET_TESTING_ResultCallback rc;
-
-  /**
-   * Closure for @e rc.
-   */
-  void *rc_cls;
-
-  /**
-   * Commands the interpreter will run.
-   */
-  struct GNUNET_TESTING_Command *commands;
-
-  /**
-   * Map with barriers for this loop.
-   */
-  struct GNUNET_CONTAINER_MultiShortmap *barriers;
-
-  /**
-   * Interpreter task (if one is scheduled).
-   */
-  struct GNUNET_SCHEDULER_Task *task;
-
-  /**
-   * Final task that returns the result.
-   */
-  struct GNUNET_SCHEDULER_Task *final_task;
-
-  /**
-   * Task run on timeout.
-   */
-  struct GNUNET_SCHEDULER_Task *timeout_task;
-
-  /**
-   * Number of GNUNET_TESTING_Command in @e commands.
-   */
-  unsigned int cmds_n;
-
-  /**
-   * Size of the array @e helper.
-   */
-  unsigned int n_helper;
-
-  /**
-   * Instruction pointer.  Tells #interpreter_run() which instruction to run
-   * next.  Need (signed) int because it gets -1 when rewinding the
-   * interpreter to the first CMD.
-   */
-  int ip;
-
-  /**
-   * Result of the testcases, #GNUNET_OK on success
-   */
-  enum GNUNET_GenericReturnValue result;
-
-  /**
-   * Is the interpreter finishing?
-   */
-  bool finishing;
-
-};
-
-
-/**
- * Lookup command by label.
- *
- * @param is interpreter to lookup command in
- * @param label label of the command to lookup.
- * @param future true to look into the future, false to look into the past
- * @return the command, if it is found, or NULL.
- */
-static const struct GNUNET_TESTING_Command *
-get_command (struct GNUNET_TESTING_Interpreter *is,
-             const char *label,
-             bool future)
-{
-  int start_i = future ? is->cmds_n - 1 : is->ip;
-  int end_i = future ? is->ip + 1 : 0;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "start_i: %u end_i: %u\n",
-              start_i,
-              end_i);
-  if (NULL == label)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Attempt to lookup command for empty label\n");
-    return NULL;
-  }
-  for (int i = start_i; i >= end_i; i--)
-  {
-    const struct GNUNET_TESTING_Command *cmd = &is->commands[i];
-
-    if (NULL != cmd->run)
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "label to compare %s\n",
-                  cmd->label.value);
-    /* Give precedence to top-level commands.  */
-    if ( (NULL != cmd->run) &&
-         (0 == strcmp (cmd->label.value,
-                       label)) )
-      return cmd;
-
-    if (GNUNET_TESTING_cmd_is_batch_ (cmd))
-    {
-      struct GNUNET_TESTING_Command **batch;
-      struct GNUNET_TESTING_Command *current;
-      const struct GNUNET_TESTING_Command *icmd;
-      const struct GNUNET_TESTING_Command *match;
-
-      current = GNUNET_TESTING_cmd_batch_get_current_ (cmd);
-      GNUNET_assert (GNUNET_OK ==
-                     GNUNET_TESTING_get_trait_batch_cmds (cmd,
-                                                          &batch));
-      /* We must do the loop forward, but we can find the last match */
-      match = NULL;
-      for (unsigned int j = 0;
-           NULL != (icmd = &(*batch)[j])->run;
-           j++)
-      {
-        if (current == icmd)
-          break; /* do not go past current command */
-        if ( (NULL != icmd->run) &&
-             (0 == strcmp (icmd->label.value,
-                           label)) )
-          match = icmd;
-      }
-      if (NULL != match)
-        return match;
-    }
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              "Command `%s' not found\n",
-              label);
-  return NULL;
-}
-
-
-const struct GNUNET_TESTING_Command *
-GNUNET_TESTING_interpreter_lookup_future_command (
-  struct GNUNET_TESTING_Interpreter *is,
-  const char *label)
-{
-  return get_command (is,
-                      label,
-                      true);
-}
-
-
-const struct GNUNET_TESTING_Command *
-GNUNET_TESTING_interpreter_lookup_command (
-  struct GNUNET_TESTING_Interpreter *is,
-  const char *label)
-{
-  return get_command (is,
-                      label,
-                      false);
-}
-
-
-const struct GNUNET_TESTING_Command *
-GNUNET_TESTING_interpreter_lookup_command_all (
-  struct GNUNET_TESTING_Interpreter *is,
-  const char *label)
-{
-  const struct GNUNET_TESTING_Command *cmd;
-
-  cmd = get_command (is,
-                     label,
-                     false);
-  if (NULL == cmd)
-    cmd = get_command (is,
-                       label,
-                       true);
-  return cmd;
-}
-
-
-/**
- * Continuation function from GNUNET_HELPER_send()
- *
- * @param cls closure
- * @param result #GNUNET_OK on success,
- *               #GNUNET_NO if helper process died
- *               #GNUNET_SYSERR during GNUNET_HELPER_stop()
- */
-static void
-clear_msg (void *cls,
-           enum GNUNET_GenericReturnValue result)
-{
-  GNUNET_assert (GNUNET_YES == result);
-}
-
-
-/**
- * Send message to a netjail node that a barrier can be crossed.
- *
- * @param is The interpreter loop.
- * @param barrier_name The name of the barrier to cross.
- * @param global_node_number The global number of the node to inform.
- */
-static void
-send_barrier_crossable (struct GNUNET_TESTING_Interpreter *is,
-                        const char *barrier_name,
-                        unsigned int global_node_number)
-{
-  struct CommandBarrierCrossable *adm;
-  size_t msg_length;
-  size_t name_len;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "send barrier crossable for barrier `%s'\n",
-              barrier_name);
-  name_len = strlen (barrier_name);
-  msg_length = sizeof(struct CommandBarrierCrossable) + name_len + 1;
-  adm = GNUNET_malloc (msg_length);
-  adm->header.type = htons (GNUNET_MESSAGE_TYPE_CMDS_HELPER_BARRIER_CROSSABLE);
-  adm->header.size = htons ((uint16_t) msg_length);
-  memcpy (&adm[1], barrier_name, name_len);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "send message of type %u to locals\n",
-              ntohs (adm->header.type));
-  /**
-     FIXME: This should probably be put into a linked list
-     inside is and cleaned up at some point.
-  */
-  is->send_handle = GNUNET_HELPER_send (
-    (struct GNUNET_HELPER_Handle *) is->helper[global_node_number - 1],
-    &adm->header,
-    GNUNET_NO,
-    &clear_msg,
-    NULL);
-  GNUNET_free (adm);
-}
-
-
-/**
- * Closure for #free_barrier_node_cb().
- */
-struct FreeBarrierNodeCbCls
-{
-  /**
-   * The interpreter.
-   */
-  struct GNUNET_TESTING_Interpreter *is;
-
-  /**
-   * The barrier from which the nodes are freed..
-   */
-  struct GNUNET_TESTING_Barrier *barrier;
-};
-
-
-static enum GNUNET_GenericReturnValue
-free_barrier_node_cb (void *cls,
-                      const struct GNUNET_ShortHashCode *key,
-                      void *value)
-{
-  struct FreeBarrierNodeCbCls *free_barrier_node_cb_cls = cls;
-  struct GNUNET_TESTING_NetjailNode *node = value;
-  struct GNUNET_TESTING_Barrier *barrier = free_barrier_node_cb_cls->barrier;
-  struct GNUNET_TESTING_Interpreter *is = free_barrier_node_cb_cls->is;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "free_barrier_node_cb\n");
-  if (! is->finishing)
-  {
-    send_barrier_crossable (is,
-                            barrier->name,
-                            node->node_number);
-  }
-  GNUNET_assert (GNUNET_YES ==
-                 GNUNET_CONTAINER_multishortmap_remove (
-                   barrier->nodes,
-                   key,
-                   node));
-  return GNUNET_YES;
-}
-
-
-static void
-free_barrier_nodes (struct GNUNET_TESTING_Interpreter *is,
-                    struct GNUNET_TESTING_Barrier *barrier)
-{
-  struct FreeBarrierNodeCbCls free_barrier_node_cb_cls = {
-    .barrier = barrier,
-    .is = is
-  };
-
-  if (NULL == barrier->nodes)
-    return;
-  GNUNET_CONTAINER_multishortmap_iterate (barrier->nodes,
-                                          free_barrier_node_cb,
-                                          &free_barrier_node_cb_cls);
-  GNUNET_CONTAINER_multishortmap_destroy (barrier->nodes);
-  barrier->nodes = NULL;
-}
-
-
-static enum GNUNET_GenericReturnValue
-free_barriers_cb (void *cls,
-                  const struct GNUNET_ShortHashCode *key,
-                  void *value)
-{
-  struct GNUNET_TESTING_Interpreter *is = cls;
-  struct GNUNET_TESTING_Barrier *barrier = value;
-  struct CommandListEntry *pos;
-
-  free_barrier_nodes (is,
-                      barrier);
-  while (NULL != (pos = barrier->cmds_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (barrier->cmds_head,
-                                 barrier->cmds_tail,
-                                 pos);
-    GNUNET_free (pos);
-  }
-  GNUNET_free (barrier);
-  return GNUNET_YES;
-}
-
-
-/**
- * Finish the test run, return the final result.
- *
- * @param cls the `struct GNUNET_TESTING_Interpreter`
- */
-static void
-finish_test (void *cls)
-{
-  struct GNUNET_TESTING_Interpreter *is = cls;
-  struct GNUNET_TESTING_Command *cmd;
-  const char *label;
-
-  is->finishing = true;
-  is->final_task = NULL;
-  label = is->commands[is->ip].label.value;
-  if (NULL == is->commands[is->ip].run)
-    label = "END";
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Interpreter finishes at `%s' with status %d\n",
-              label,
-              is->result);
-  for (unsigned int j = 0;
-       NULL != (cmd = &is->commands[j])->run;
-       j++)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Cleaning up cmd %s\n",
-                cmd->label.value);
-    cmd->cleanup (cmd->cls);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Cleaned up cmd %s\n",
-                cmd->label.value);
-  }
-  if (NULL != is->task)
-  {
-    GNUNET_SCHEDULER_cancel (is->task);
-    is->task = NULL;
-  }
-  if (NULL != is->timeout_task)
-  {
-    GNUNET_SCHEDULER_cancel (is->timeout_task);
-    is->timeout_task = NULL;
-  }
-  if (NULL != is->send_handle)
-  {
-    GNUNET_HELPER_send_cancel (is->send_handle);
-    is->send_handle = NULL;
-  }
-  GNUNET_free (is->commands);
-  is->rc (is->rc_cls,
-          is->result);
-  GNUNET_CONTAINER_multishortmap_iterate (is->barriers,
-                                          free_barriers_cb,
-                                          is);
-  GNUNET_CONTAINER_multishortmap_destroy (is->barriers);
-  GNUNET_free (is->helper);
-  GNUNET_free (is);
-}
-
-
-/**
- * Run the main interpreter loop that performs exchange operations.
- *
- * @param cls contains the `struct InterpreterState`
- */
-static void
-interpreter_run (void *cls);
-
-
-/**
- * Current command is done, run the next one.
- */
-static void
-interpreter_next (void *cls)
-{
-  struct GNUNET_TESTING_Interpreter *is = cls;
-  static unsigned long long ipc;
-  static struct GNUNET_TIME_Absolute last_report;
-  struct GNUNET_TESTING_Command *cmd = &is->commands[is->ip];
-
-  if (GNUNET_SYSERR == is->result)
-    return; /* ignore, we already failed! */
-  cmd->finish_time = GNUNET_TIME_absolute_get ();
-  if ( (! GNUNET_TESTING_cmd_is_batch_ (cmd)) ||
-       (! GNUNET_TESTING_cmd_batch_next_ (cmd->cls)) )
-    is->ip++;
-  if (0 == (ipc % 1000))
-  {
-    if (0 != ipc)
-      GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
-                  "Interpreter executed 1000 instructions in %s\n",
-                  GNUNET_STRINGS_relative_time_to_string (
-                    GNUNET_TIME_absolute_get_duration (last_report),
-                    GNUNET_YES));
-    last_report = GNUNET_TIME_absolute_get ();
-  }
-  ipc++;
-  is->task = GNUNET_SCHEDULER_add_now (&interpreter_run,
-                                       is);
-}
-
-
-void
-GNUNET_TESTING_interpreter_fail (struct GNUNET_TESTING_Interpreter *is)
-{
-  struct GNUNET_TESTING_Command *cmd = &is->commands[is->ip];
-
-  if (GNUNET_SYSERR == is->result)
-  {
-    GNUNET_break (0);
-    return; /* ignore, we already failed! */
-  }
-  if (NULL != cmd)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed at command `%s'\n",
-                cmd->label.value);
-    while (GNUNET_TESTING_cmd_is_batch_ (cmd))
-    {
-      cmd = GNUNET_TESTING_cmd_batch_get_current_ (cmd);
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Failed in batch at command `%s'\n",
-                  cmd->label.value);
-    }
-  }
-  else
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Failed with CMD being NULL!\n");
-  }
-  is->result = GNUNET_SYSERR;
-  GNUNET_assert (NULL == is->final_task);
-  is->final_task = GNUNET_SCHEDULER_add_now (&finish_test,
-                                             is);
-}
-
-
-void
-GNUNET_TESTING_async_fail (struct GNUNET_TESTING_AsyncContext *ac)
-{
-  GNUNET_assert (GNUNET_NO == ac->finished);
-  ac->finished = GNUNET_SYSERR;
-  GNUNET_TESTING_interpreter_fail (ac->is);
-  if (NULL != ac->cont)
-  {
-    ac->cont (ac->cont_cls);
-    ac->cont = NULL;
-  }
-}
-
-
-void
-GNUNET_TESTING_async_finish (struct GNUNET_TESTING_AsyncContext *ac)
-{
-  GNUNET_assert (GNUNET_NO == ac->finished);
-  ac->finished = GNUNET_OK;
-  if (NULL != ac->cont)
-  {
-    ac->cont (ac->cont_cls);
-    ac->cont = NULL;
-  }
-}
-
-
-/**
- * Returns the actual running command.
- *
- * @param is Global state of the interpreter, used by a command
- *        to access information about other commands.
- * @return The actual running command.
- */
-struct GNUNET_TESTING_Command *
-GNUNET_TESTING_interpreter_get_current_command (
-  struct GNUNET_TESTING_Interpreter *is)
-{
-  return &is->commands[is->ip];
-}
-
-
-/**
- * Run the main interpreter loop.
- *
- * @param cls contains the `struct GNUNET_TESTING_Interpreter`
- */
-static void
-interpreter_run (void *cls)
-{
-  struct GNUNET_TESTING_Interpreter *is = cls;
-  struct GNUNET_TESTING_Command *cmd = &is->commands[is->ip];
-
-  is->task = NULL;
-  if (NULL == cmd->run)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Running command END\n");
-    is->result = GNUNET_OK;
-    finish_test (is);
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Running command `%s'\n",
-              cmd->label.value);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "start time of %p expected 0 is `%" PRIu64 "'\n",
-              cmd,
-              cmd->start_time.abs_value_us);
-  cmd->start_time
-    = cmd->last_req_time
-      = GNUNET_TIME_absolute_get ();
-  cmd->num_tries = 1;
-  if (NULL != cmd->ac)
-  {
-    cmd->ac->is = is;
-    cmd->ac->cont = &interpreter_next;
-    cmd->ac->cont_cls = is;
-    cmd->ac->finished = false;
-  }
-  cmd->run (cmd->cls,
-            is);
-  if (NULL == cmd->ac)
-  {
-    interpreter_next (is);
-  }
-  else if ( (cmd->asynchronous_finish) &&
-            (NULL != cmd->ac->cont) )
-  {
-    cmd->ac->cont = NULL;
-    interpreter_next (is);
-  }
-}
-
-
-/**
- * Function run when the test terminates (good or bad) with timeout.
- *
- * @param cls the interpreter state
- */
-static void
-do_timeout (void *cls)
-{
-  struct GNUNET_TESTING_Interpreter *is = cls;
-
-  is->timeout_task = NULL;
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              "Terminating test due to global timeout\n");
-  is->result = GNUNET_SYSERR;
-  finish_test (is);
-}
-
-
-struct GNUNET_TESTING_Interpreter *
-GNUNET_TESTING_run (const struct GNUNET_TESTING_Command *commands,
-                    struct GNUNET_TIME_Relative timeout,
-                    GNUNET_TESTING_ResultCallback rc,
-                    void *rc_cls)
-{
-  struct GNUNET_TESTING_Interpreter *is;
-  unsigned int i;
-
-  is = GNUNET_new (struct GNUNET_TESTING_Interpreter);
-  is->rc = rc;
-  is->rc_cls = rc_cls;
-  is->barriers = GNUNET_CONTAINER_multishortmap_create (1,
-                                                        false);
-  /* get the number of commands */
-  for (i = 0; NULL != commands[i].run; i++)
-    ;
-  is->cmds_n = i + 1;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Got %u commands\n",
-              i);
-  is->commands = GNUNET_malloc_large ( (i + 1)
-                                       * sizeof (struct
-                                                 GNUNET_TESTING_Command));
-  GNUNET_assert (NULL != is->commands);
-  memcpy (is->commands,
-          commands,
-          sizeof (struct GNUNET_TESTING_Command) * i);
-  is->timeout_task
-    = GNUNET_SCHEDULER_add_delayed (timeout,
-                                    &do_timeout,
-                                    is);
-  is->task = GNUNET_SCHEDULER_add_now (&interpreter_run,
-                                       is);
-
-  return is;
-}
-
-
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_command_new (void *cls,
-                            const char *label,
-                            GNUNET_TESTING_CommandRunRoutine run,
-                            GNUNET_TESTING_CommandCleanupRoutine cleanup,
-                            GNUNET_TESTING_CommandGetTraits traits,
-                            struct GNUNET_TESTING_AsyncContext *ac)
-{
-  struct GNUNET_TESTING_Command cmd = {
-    .cls = cls,
-    .run = run,
-    .ac = ac,
-    .cleanup = cleanup,
-    .traits = traits
-  };
-
-  GNUNET_assert (NULL != run);
-  if (NULL != label)
-    GNUNET_TESTING_set_label (&cmd.label,
-                              label);
-  return cmd;
-}
-
-
-void
-GNUNET_TESTING_set_label (struct GNUNET_TESTING_CommandLabel *label,
-                          const char *value)
-{
-  size_t len;
-
-  len = strlen (value);
-  GNUNET_assert (len <=
-                 GNUNET_TESTING_CMD_MAX_LABEL_LENGTH);
-  memcpy (label->value,
-          value,
-          len + 1);
-}
-
-
-
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_end (void)
-{
-  struct GNUNET_TESTING_Command cmd = {
-    .run = NULL
-  };
-
-  return cmd;
-}
-
-
-/**
- * Closure for #loop_run().
- */
-struct MainParams
-{
-
-  /**
-   * NULL-label terminated array of commands.
-   */
-  struct GNUNET_TESTING_Command *commands;
-
-  /**
-   * Global timeout for the test.
-   */
-  struct GNUNET_TIME_Relative timeout;
-
-  /**
-   * Set to #EXIT_FAILURE on error.
-   */
-  int rv;
-};
-
-
-/**
- * Function called with the final result of the test.
- *
- * @param cls the `struct MainParams`
- * @param rv #GNUNET_OK if the test passed
- */
-static void
-handle_result (void *cls,
-               enum GNUNET_GenericReturnValue rv)
-{
-  struct MainParams *mp = cls;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Test exits with status %d\n",
-              rv);
-  if (GNUNET_OK != rv)
-    mp->rv = EXIT_FAILURE;
-  GNUNET_SCHEDULER_shutdown ();
-}
-
-
-/**
- * Main function to run the test cases.
- *
- * @param cls a `struct MainParams *`
- */
-static void
-loop_run (void *cls)
-{
-  struct MainParams *mp = cls;
-
-  GNUNET_TESTING_run (mp->commands,
-                      mp->timeout,
-                      &handle_result,
-                      mp);
-}
-
-
-int
-GNUNET_TESTING_main (struct GNUNET_TESTING_Command *commands,
-                     struct GNUNET_TIME_Relative timeout)
-{
-  struct MainParams mp = {
-    .commands = commands,
-    .timeout = timeout,
-    .rv = EXIT_SUCCESS
-  };
-
-  GNUNET_SCHEDULER_run (&loop_run,
-                        &mp);
-  return mp.rv;
-}
-
-
-void
-GNUNET_TESTING_add_netjail_helper_ (struct GNUNET_TESTING_Interpreter *is,
-                                    const struct GNUNET_HELPER_Handle *helper)
-{
-  GNUNET_array_append (is->helper,
-                       is->n_helper,
-                       helper);
-}
-
-
-struct GNUNET_TESTING_Barrier *
-GNUNET_TESTING_get_barrier_ (struct GNUNET_TESTING_Interpreter *is,
-                             const char *barrier_name)
-{
-  struct GNUNET_HashCode hc;
-  struct GNUNET_ShortHashCode create_key;
-
-  GNUNET_CRYPTO_hash (barrier_name,
-                      strlen (barrier_name),
-                      &hc);
-  memcpy (&create_key,
-          &hc,
-          sizeof (create_key));
-  return GNUNET_CONTAINER_multishortmap_get (is->barriers,
-                                             &create_key);
-}
-
-
-/**
- * Add a barrier to the interpreter.
- *
- * @param is The interpreter.
- * @param barrier The barrier to add.
- */
-void
-GNUNET_TESTING_add_barrier_ (struct GNUNET_TESTING_Interpreter *is,
-                             struct GNUNET_TESTING_Barrier *barrier)
-{
-  struct GNUNET_HashCode hc;
-  struct GNUNET_ShortHashCode create_key;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Adding barrier %s locally\n",
-              barrier->name);
-  GNUNET_CRYPTO_hash (barrier->name,
-                      strlen (barrier->name),
-                      &hc);
-  memcpy (&create_key,
-          &hc,
-          sizeof (create_key));
-  GNUNET_CONTAINER_multishortmap_put (is->barriers,
-                                      &create_key,
-                                      barrier,
-                                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
-}
-
-
-void
-GNUNET_TESTING_finish_barrier_ (struct GNUNET_TESTING_Interpreter *is,
-                                const char *barrier_name)
-{
-  struct CommandListEntry *pos;
-  struct GNUNET_TESTING_Barrier *barrier;
-
-  barrier = GNUNET_TESTING_get_barrier_ (is,
-                                         barrier_name);
-  if (NULL == barrier)
-    return;
-  while (NULL != (pos = barrier->cmds_head))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "command label %s\n",
-                pos->command->label.value);
-    if ( (GNUNET_NO == pos->command->ac->finished) &&
-         (GNUNET_NO == pos->command->asynchronous_finish) )
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "command label %s finish\n",
-                  pos->command->label.value);
-      GNUNET_TESTING_async_finish (pos->command->ac);
-    }
-    else if (GNUNET_NO == pos->command->ac->finished)
-    {
-      pos->command->asynchronous_finish = GNUNET_YES;
-    }
-    GNUNET_CONTAINER_DLL_remove (barrier->cmds_head,
-                                 barrier->cmds_tail,
-                                 pos);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "command entry label %s removed\n",
-                pos->command->label.value);
-    GNUNET_free (pos);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "command entry freed\n");
-  }
-  free_barrier_nodes (is,
-                      barrier);
-}
-
-
-/* end of testing_api_loop.c */
diff --git a/src/service/testing/testing_cmds.h b/src/service/testing/testing_cmds.h
deleted file mode 100644
index f4549477e..000000000
--- a/src/service/testing/testing_cmds.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2021 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testing/testing_cmds.h
- * @brief Message formats for communication between testing cmds helper and testcase plugins.
- * @author t3sserakt
- */
-
-#ifndef TESTING_CMDS_H
-#define TESTING_CMDS_H
-
-#define HELPER_CMDS_BINARY "gnunet-cmds-helper"
-#include "gnunet_common.h"
-
-GNUNET_NETWORK_STRUCT_BEGIN
-
-/**
- * Initialization message for gnunet-cmds-testbed to start cmd binary.
- */
-struct GNUNET_TESTING_CommandHelperInit
-{
-  /**
-   * Type is GNUNET_MESSAGE_TYPE_CMDS_HELPER_INIT
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   *
-   */
-  uint16_t plugin_name_size GNUNET_PACKED;
-
-  /* Followed by plugin name of the plugin running the test case. This is not NULL
-   * terminated */
-};
-
-/**
- * Reply message from cmds helper process
- */
-struct GNUNET_TESTING_CommandHelperReply
-{
-  /**
-   * Type is GNUNET_MESSAGE_TYPE_CMDS_HELPER_REPLY
-   */
-  struct GNUNET_MessageHeader header;
-};
-
-struct GNUNET_TESTING_CommandPeerStarted
-{
-  /**
-   * Type is GNUNET_MESSAGE_TYPE_CMDS_HELPER_PEER_STARTED
-   */
-  struct GNUNET_MessageHeader header;
-};
-
-struct GNUNET_TESTING_CommandAllPeersStarted
-{
-  /**
-   * Type is GNUNET_MESSAGE_TYPE_CMDS_HELPER_ALL_PEERS_STARTED
-   */
-  struct GNUNET_MessageHeader header;
-};
-
-struct GNUNET_TESTING_CommandLocalFinished
-{
-  /**
-   * Type is GNUNET_MESSAGE_TYPE_CMDS_HELPER_LOCAL_FINISHED
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * The exit status local test return with.
-   */
-  enum GNUNET_GenericReturnValue rv;
-};
-
-
-struct GNUNET_TESTING_CommandLocalTestPrepared
-{
-  /**
-   * Type is GNUNET_MESSAGE_TYPE_CMDS_HELPER_LOCAL_TEST_PREPARED
-   */
-  struct GNUNET_MessageHeader header;
-};
-
-struct GNUNET_TESTING_CommandAllLocalTestsPrepared
-{
-  /**
-   * Type is GNUNET_MESSAGE_TYPE_CMDS_HELPER_ALL_LOCAL_TESTS_PREPARED
-   */
-  struct GNUNET_MessageHeader header;
-};
-
-GNUNET_NETWORK_STRUCT_END
-
-/**
- * Global state of the interpreter, used by a command
- * to access information about other commands.
- */
-struct GNUNET_TESTING_Interpreter;
-
-
-/**
- * Returns the actual running command.
- *
- * @param is Global state of the interpreter, used by a command
- *        to access information about other commands.
- * @return The actual running command.
- */
-struct GNUNET_TESTING_Command *
-GNUNET_TESTING_interpreter_get_current_command (
-  struct GNUNET_TESTING_Interpreter *is);
-
-
-/**
- * Adding a helper handle to the interpreter.
- *
- * @param is The interpreter.
- * @param helper The helper handle.
- */
-void
-GNUNET_TESTING_add_netjail_helper_ (struct GNUNET_TESTING_Interpreter *is,
-                                    const struct GNUNET_HELPER_Handle *helper);
-
-#endif
-/* end of testing_cmds.h */
diff --git a/src/service/testing/topo.sh b/src/service/testing/topo.sh
deleted file mode 100755
index 0046622b6..000000000
--- a/src/service/testing/topo.sh
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/bash
-
-declare -A K_PLUGIN
-declare -A R_TCP
-declare -A R_UDP
-declare -A P_PLUGIN
-
-extract_attributes()
-{
-    line_key=$1
-    line=$2
-    
-    if [ "$line_key" = "P" ]
-    then
-        n=$(echo $line|cut -d \| -f 1|awk -F: '{print $2}')
-        echo $n
-        m=$(echo $line|cut -d \| -f 1|awk -F: '{print $3}')
-        echo $m
-    else
-        number=$(echo $line|cut -d \| -f 1| cut -c 2-|cut -d : -f 2 )
-        echo $number
-    fi
-
-    nf=$(echo $line|awk -F: '{print NF}')
-    for ((i=2;i<=$nf;i++))
-    do
-        entry=$(echo $line |awk -v i=$i -F\| '{print $i}')
-        key=$(echo $entry|cut -d { -f 2|cut -d } -f 1|cut -d : -f 1)
-        value=$(echo $entry|cut -d { -f 2|cut -d } -f 1|cut -d : -f 2)
-        if [ "$key" = "tcp_port" ]
-        then
-            echo tcp port: $value
-            R_TCP[$number]=$value
-        elif [ "$key" = "udp_port" ]
-        then
-            echo udp port: $value
-            R_UDP[$number]=$value
-        elif [ "$key" = "plugin" ]
-        then
-            echo plugin: $value
-            echo $line_key
-            if [ "$line_key" = "P" ]
-            then
-                P_PLUGIN[$n,$m]=$value
-                echo $n $m ${P_PLUGIN[$n,$m]}
-            elif [ "$line_key" = "K" ]
-            then
-                K_PLUGIN[$number]=$value
-            fi
-        fi
-    done
-}
-
-read_topology(){
-    
-local filename=$1
-while read line; do
-# reading each line
-    echo $line
-    key=$(cut -c -1 <<< $line)
-    if [ "$key" = "M" ]
-    then
-        LOCAL_M=$(cut -d : -f 2 <<< $line)
-        echo $LOCAL_M
-    elif [ "$key" = "N" ]
-    then
-        GLOBAL_N=$(cut -d : -f 2 <<< $line)
-        echo $GLOBAL_N
-    for ((i=1;i<=$GLOBAL_N;i++))
-    do
-        R_TCP[$i]=0
-        R_UDP[$i]=0
-    done    
-    elif [ "$key" = "X" ]
-    then
-        KNOWN=$(cut -d : -f 2 <<< $line)
-        echo $KNOWN
-    elif [ "$key" = "T" ]
-    then
-        PLUGIN=$(cut -d : -f 2 <<< $line)
-        echo $PLUGIN
-    elif [ "$key" = "K" ]
-    then
-        echo know node
-        extract_attributes $key $line
-    elif [ "$key" = "R" ]
-    then
-        echo router
-        extract_attributes $key $line
-    elif [ "$key" = "P" ]
-    then
-        echo node
-        extract_attributes $key $line
-    fi
-done < $filename
-}
-
-
-
diff --git a/src/service/topology/gnunet-daemon-topology.c b/src/service/topology/gnunet-daemon-topology.c
index 159ba2a07..a95b67908 100644
--- a/src/service/topology/gnunet-daemon-topology.c
+++ b/src/service/topology/gnunet-daemon-topology.c
@@ -699,6 +699,7 @@ consider_for_advertising (const struct GNUNET_MessageHeader *hello)
     GNUNET_HELLO_builder_iterate (builder_old,
                                   &address_iterator,
                                   &num_addresses_old);
+    GNUNET_HELLO_builder_free (builder_old);
     if (GNUNET_TIME_absolute_cmp (new_hello_exp, >, now) &&
         (GNUNET_TIME_absolute_cmp (new_hello_exp, >, old_hello_exp) ||
          num_addresses_old < num_addresses_new))
diff --git a/src/service/transport/Makefile.am b/src/service/transport/Makefile.am
index 56ed8fc13..eac451882 100644
--- a/src/service/transport/Makefile.am
+++ b/src/service/transport/Makefile.am
@@ -15,11 +15,10 @@ if USE_COVERAGE
 endif
 
 noinst_PROGRAMS = \
- test_transport_start_with_config \
  gnunet-communicator-udp
 
 TESTING_LIBS = \
-  libgnunettransporttesting2.la
+  libgnunettestingtransport.la
 
 lib_LTLIBRARIES = \
   libgnunettransportapplication.la \
@@ -28,32 +27,29 @@ lib_LTLIBRARIES = \
   libgnunettransportmonitor.la \
   $(TESTING_LIBS)
 
-libgnunettransporttesting2_la_SOURCES = \
-  transport_api_traits.c \
-  testing_api_cmd_stop_peer.c \
-  testing_api_cmd_start_peer.c \
-  transport_api_cmd_connecting_peers.c \
-  transport_api_cmd_backchannel_check.c \
-  transport_api_cmd_start_peer.c \
-  transport_api_cmd_stop_peer.c \
-  transport_api_cmd_send_simple.c \
-  transport_api_cmd_send_simple_performance.c \
-  transport-testing2.c transport-testing2.h \
-  transport-testing-cmds.h \
-  transport-testing-filenames2.c \
-  transport-testing-loggers2.c \
-  transport-testing-main2.c \
-  transport-testing-send2.c \
-  transport-testing-communicator.c transport-testing-communicator.h
-libgnunettransporttesting2_la_LIBADD = \
+libgnunettestingtransport_la_SOURCES = \
+  testing_transport_traits.c transport-testing-cmds.h \
+  transport-testing-communicator.c transport-testing-communicator.h 
+#  transport_api_cmd_connecting_peers.c \
+#  transport_api_cmd_backchannel_check.c \
+#  transport_api_cmd_send_simple.c \
+#  transport_api_cmd_send_simple_performance.c \
+#  transport-testing2.c transport-testing2.h \
+#  transport-testing-cmds.h \
+#  transport-testing-filenames2.c \
+#  transport-testing-loggers2.c \
+#  transport-testing-main2.c \
+#  transport-testing-send2.c 
+libgnunettestingtransport_la_LIBADD = \
   libgnunettransportapplication.la \
   libgnunettransportcore.la \
+  $(top_builddir)/src/service/testbed/libgnunettestbed.la \
   $(top_builddir)/src/service/arm/libgnunetarm.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
   $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
-libgnunettransporttesting2_la_LDFLAGS = \
+libgnunettestingtransport_la_LDFLAGS = \
   $(GN_LIBINTL) \
   $(GN_LIB_LDFLAGS) \
   -version-info 0:0:0
@@ -189,21 +185,21 @@ gnunet_service_transport_LDADD = \
   $(LIBGCRYPT_LIBS) \
   $(GN_LIBINTL)
 
-plugin_LTLIBRARIES = \
-  libgnunet_test_transport_plugin_cmd_simple_send_performance.la \
-  libgnunet_test_transport_plugin_cmd_nat_upnp.la \
-  libgnunet_test_transport_plugin_cmd_simple_send.la \
-  libgnunet_test_transport_plugin_cmd_simple_send_broadcast.la \
-  libgnunet_test_transport_plugin_cmd_simple_send_dv.la \
-  libgnunet_test_transport_plugin_cmd_udp_backchannel.la
+#plugin_LTLIBRARIES = \
+#  libgnunet_test_transport_plugin_cmd_simple_send_performance.la \
+#  libgnunet_test_transport_plugin_cmd_nat_upnp.la \
+#  libgnunet_test_transport_plugin_cmd_simple_send.la \
+#  libgnunet_test_transport_plugin_cmd_simple_send_broadcast.la \
+#  libgnunet_test_transport_plugin_cmd_simple_send_dv.la \
+#  libgnunet_test_transport_plugin_cmd_udp_backchannel.la
 
 libgnunet_test_transport_plugin_cmd_nat_upnp_la_SOURCES = \
  test_transport_plugin_cmd_nat_upnp.c
 libgnunet_test_transport_plugin_cmd_nat_upnp_la_LIBADD = \
-  libgnunettransporttesting2.la \
+  libgnunettestingtransport.la \
   libgnunettransportapplication.la \
   libgnunettransportcore.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
@@ -216,10 +212,10 @@ libgnunet_test_transport_plugin_cmd_nat_upnp_la_LDFLAGS = \
 libgnunet_test_transport_plugin_cmd_udp_backchannel_la_SOURCES = \
  test_transport_plugin_cmd_udp_backchannel.c
 libgnunet_test_transport_plugin_cmd_udp_backchannel_la_LIBADD = \
-  libgnunettransporttesting2.la \
+  libgnunettestingtransport.la \
   libgnunettransportapplication.la \
   libgnunettransportcore.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
@@ -232,10 +228,10 @@ libgnunet_test_transport_plugin_cmd_udp_backchannel_la_LDFLAGS = \
 libgnunet_test_transport_plugin_cmd_simple_send_la_SOURCES = \
  test_transport_plugin_cmd_simple_send.c
 libgnunet_test_transport_plugin_cmd_simple_send_la_LIBADD = \
-  libgnunettransporttesting2.la \
+  libgnunettestingtransport.la \
   libgnunettransportapplication.la \
   libgnunettransportcore.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
@@ -248,10 +244,10 @@ libgnunet_test_transport_plugin_cmd_simple_send_la_LDFLAGS = \
 libgnunet_test_transport_plugin_cmd_simple_send_performance_la_SOURCES = \
  test_transport_plugin_cmd_simple_send_performance.c
 libgnunet_test_transport_plugin_cmd_simple_send_performance_la_LIBADD = \
-  libgnunettransporttesting2.la \
+  libgnunettestingtransport.la \
   libgnunettransportapplication.la \
   libgnunettransportcore.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
@@ -264,10 +260,10 @@ libgnunet_test_transport_plugin_cmd_simple_send_performance_la_LDFLAGS = \
 libgnunet_test_transport_plugin_cmd_simple_send_broadcast_la_SOURCES = \
  test_transport_plugin_cmd_simple_send_broadcast.c
 libgnunet_test_transport_plugin_cmd_simple_send_broadcast_la_LIBADD = \
-  libgnunettransporttesting2.la \
+  libgnunettestingtransport.la \
   libgnunettransportapplication.la \
   libgnunettransportcore.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
@@ -280,10 +276,10 @@ libgnunet_test_transport_plugin_cmd_simple_send_broadcast_la_LDFLAGS = \
 libgnunet_test_transport_plugin_cmd_simple_send_dv_la_SOURCES = \
  test_transport_plugin_cmd_simple_send_dv.c
 libgnunet_test_transport_plugin_cmd_simple_send_dv_la_LIBADD = \
-  libgnunettransporttesting2.la \
+  libgnunettestingtransport.la \
   libgnunettransportapplication.la \
   libgnunettransportcore.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/testing/libgnunettesting.la \
   $(top_builddir)/src/service/peerstore/libgnunetpeerstore.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/hello/libgnunethello.la \
@@ -304,17 +300,17 @@ check_PROGRAMS = \
 if HAVE_EXPERIMENTAL
 check_PROGRAMS += test_communicator_basic-quic \
  test_communicator_basic-unix
-check_SCRIPTS= \
-  test_transport_start_testcase.sh \
-  test_transport_simple_send_performance.sh \
-  test_transport_nat_icmp_tcp.sh \
-  test_transport_nat_upnp.sh \
-  test_transport_simple_send_string.sh \
-  test_transport_simple_send.sh \
-  test_transport_simple_send_broadcast.sh \
-  test_transport_udp_backchannel.sh \
-  test_transport_simple_send_dv_circle.sh \
-  test_transport_simple_send_dv_inverse.sh
+# check_SCRIPTS= \
+  # test_transport_start_testcase.sh \
+  # test_transport_simple_send_performance.sh \
+  # test_transport_nat_icmp_tcp.sh \
+  # test_transport_nat_upnp.sh \
+  # test_transport_simple_send_string.sh \
+  # test_transport_simple_send.sh \
+  # test_transport_simple_send_broadcast.sh \
+  # test_transport_udp_backchannel.sh \
+  # test_transport_simple_send_dv_circle.sh \
+  # test_transport_simple_send_dv_inverse.sh
 endif
 
 if ENABLE_TEST_RUN
@@ -325,76 +321,68 @@ TESTS = \
 endif
 
 
-test_transport_start_with_config_SOURCES = \
- test_transport_start_with_config.c
-test_transport_start_with_config_LDADD = \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
- $(top_builddir)/src/lib/util/libgnunetutil.la \
- $(top_builddir)/src/lib/hello/libgnunethello.la \
- libgnunettransportcore.la \
- libgnunettransporttesting2.la
 
 test_communicator_basic_unix_SOURCES = \
  test_communicator_basic.c
 test_communicator_basic_unix_LDADD = \
- libgnunettransporttesting2.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
+ libgnunettestingtransport.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(top_builddir)/src/service/statistics/libgnunetstatistics.la
 
 test_communicator_basic_tcp_SOURCES = \
  test_communicator_basic.c
 test_communicator_basic_tcp_LDADD = \
- libgnunettransporttesting2.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
+ libgnunettestingtransport.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(top_builddir)/src/service/statistics/libgnunetstatistics.la
 
 test_communicator_basic_udp_SOURCES = \
  test_communicator_basic.c
 test_communicator_basic_udp_LDADD = \
- libgnunettransporttesting2.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
+ libgnunettestingtransport.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(top_builddir)/src/service/statistics/libgnunetstatistics.la
 
 test_communicator_basic_quic_SOURCES = \
  test_communicator_basic.c
 test_communicator_basic_quic_LDADD = \
- libgnunettransporttesting2.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
+ libgnunettestingtransport.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(top_builddir)/src/service/statistics/libgnunetstatistics.la
 
 test_communicator_rekey_tcp_SOURCES = \
  test_communicator_basic.c
 test_communicator_rekey_tcp_LDADD = \
- libgnunettransporttesting2.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
+ libgnunettestingtransport.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(top_builddir)/src/service/statistics/libgnunetstatistics.la
 
 test_communicator_rekey_udp_SOURCES = \
  test_communicator_basic.c
 test_communicator_rekey_udp_LDADD = \
- libgnunettransporttesting2.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
+ libgnunettestingtransport.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(top_builddir)/src/service/statistics/libgnunetstatistics.la
 
 test_communicator_backchannel_udp_SOURCES = \
  test_communicator_basic.c
 test_communicator_backchannel_udp_LDADD = \
- libgnunettransporttesting2.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
+ libgnunettestingtransport.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(top_builddir)/src/service/statistics/libgnunetstatistics.la
 
 test_communicator_bidirect_tcp_SOURCES = \
  test_communicator_basic.c
 test_communicator_bidirect_tcp_LDADD = \
- libgnunettransporttesting2.la \
- $(top_builddir)/src/service/testing/libgnunettesting.la \
+ libgnunettestingtransport.la \
+ $(top_builddir)/src/lib/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la \
  $(top_builddir)/src/service/statistics/libgnunetstatistics.la
 
@@ -403,7 +391,7 @@ test_transport_api2_tcp_SOURCES = \
 test_transport_api2_tcp_LDADD = \
  $(top_builddir)/src/lib/hello/libgnunethello.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la  \
- libgnunettransporttesting2.la
+ libgnunettestingtransport.la
 
 EXTRA_DIST = \
 test_transport_start_testcase.sh \
diff --git a/src/service/transport/gnunet-communicator-tcp.c b/src/service/transport/gnunet-communicator-tcp.c
index 02a547335..5d9b9055f 100644
--- a/src/service/transport/gnunet-communicator-tcp.c
+++ b/src/service/transport/gnunet-communicator-tcp.c
@@ -27,8 +27,8 @@
  * - support NAT connection reversal method (#5529)
  * - support other TCP-specific NAT traversal methods (#5531)
  */
-#include "gnunet_common.h"
 #include "platform.h"
+#include "gnunet_common.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_core_service.h"
 #include "gnunet_peerstore_service.h"
@@ -2369,7 +2369,6 @@ extract_address (const char *bindto)
   char *token;
   char *cp;
   char *rest = NULL;
-  char *res;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "extract address with bindto %s\n",
@@ -2402,8 +2401,7 @@ extract_address (const char *bindto)
     else
     {
       token++;
-      res = GNUNET_strdup (token);
-      addr = GNUNET_strdup (res);
+      addr = GNUNET_strdup (token);
     }
   }
 
@@ -3349,6 +3347,7 @@ mq_init (void *cls, const struct GNUNET_PeerIdentity *peer, const char *address)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Queue for %s already exists or is in construction\n", address);
+    GNUNET_free (in);
     return GNUNET_NO;
   }
   switch (in->sa_family)
@@ -3799,7 +3798,8 @@ init_socket (struct sockaddr *addr,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Bound to `%s'\n",
               GNUNET_a2s ((const struct sockaddr *) &in_sto, sto_len));
-  stats = GNUNET_STATISTICS_create ("communicator-tcp", cfg);
+  if (NULL == stats)
+    stats = GNUNET_STATISTICS_create ("communicator-tcp", cfg);
 
   if (NULL == is)
     is = GNUNET_NT_scanner_init ();
diff --git a/src/service/transport/gnunet-communicator-udp.c b/src/service/transport/gnunet-communicator-udp.c
index e9496c571..fa5294218 100644
--- a/src/service/transport/gnunet-communicator-udp.c
+++ b/src/service/transport/gnunet-communicator-udp.c
@@ -883,6 +883,8 @@ bi_destroy (struct BroadcastInterface *bi)
   GNUNET_free (bi);
 }
 
+static int
+secret_destroy (struct SharedSecret *ss);
 
 /**
  * Destroys a receiving state due to timeout or shutdown.
@@ -892,7 +894,7 @@ bi_destroy (struct BroadcastInterface *bi)
 static void
 receiver_destroy (struct ReceiverAddress *receiver)
 {
-
+  struct SharedSecret *ss;
   receiver->receiver_destroy_called = GNUNET_YES;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -909,6 +911,11 @@ receiver_destroy (struct ReceiverAddress *receiver)
     GNUNET_TRANSPORT_communicator_mq_del (receiver->d_qh);
     receiver->d_qh = NULL;
   }
+  else if (NULL != receiver->d_mq)
+  {
+    GNUNET_MQ_destroy (receiver->d_mq);
+    receiver->d_mq = NULL;
+  }
   GNUNET_assert (GNUNET_YES ==
                  GNUNET_CONTAINER_multihashmap_remove (receivers,
                                                        &receiver->key,
@@ -918,6 +925,10 @@ receiver_destroy (struct ReceiverAddress *receiver)
                          "# receivers active",
                          GNUNET_CONTAINER_multihashmap_size (receivers),
                          GNUNET_NO);
+  while (NULL != (ss = receiver->ss_head))
+  {
+    secret_destroy (ss);
+  }
   GNUNET_free (receiver->address);
   GNUNET_free (receiver->foreign_addr);
   GNUNET_free (receiver);
@@ -1065,6 +1076,7 @@ secret_destroy (struct SharedSecret *ss)
 static void
 sender_destroy (struct SenderAddress *sender)
 {
+  struct SharedSecret *ss;
   sender->sender_destroy_called = GNUNET_YES;
   GNUNET_assert (
     GNUNET_YES ==
@@ -1074,6 +1086,10 @@ sender_destroy (struct SenderAddress *sender)
                          "# senders active",
                          GNUNET_CONTAINER_multihashmap_size (senders),
                          GNUNET_NO);
+  while (NULL != (ss = sender->ss_head))
+  {
+    secret_destroy (ss);
+  }
   GNUNET_free (sender->address);
   GNUNET_free (sender);
 }
@@ -2892,6 +2908,7 @@ mq_init (void *cls, const struct GNUNET_PeerIdentity *peer, const char *address)
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "receiver %s already exist or is being connected to\n",
                 address);
+    GNUNET_free (in);
     return GNUNET_NO;
   }
 
diff --git a/src/service/transport/gnunet-service-transport.c b/src/service/transport/gnunet-service-transport.c
index f4be5e759..91ce801db 100644
--- a/src/service/transport/gnunet-service-transport.c
+++ b/src/service/transport/gnunet-service-transport.c
@@ -920,7 +920,7 @@ struct TransportValidationResponseMessage
 struct TransportGlobalNattedAddress
 {
   /**
-   * Length of the address following the struct.
+   * Length of the address following the struct in NBO.
    */
   unsigned int address_length;
 
@@ -3657,6 +3657,8 @@ remove_global_addresses (void *cls,
   struct TransportGlobalNattedAddress *tgna = value;
 
   GNUNET_free (tgna);
+
+  return GNUNET_OK;
 }
 
 
@@ -3681,6 +3683,7 @@ free_neighbour (struct Neighbour *neighbour)
   GNUNET_CONTAINER_multipeermap_iterate (neighbour->natted_addresses,
                                          &remove_global_addresses,
                                          NULL);
+  GNUNET_CONTAINER_multipeermap_destroy (neighbour->natted_addresses);
   while (NULL != (dvh = neighbour->dv_head))
   {
     struct DistanceVector *dv = dvh->dv;
@@ -5344,27 +5347,35 @@ static char *
 get_address_without_port (const char *address);
 
 
+struct AddGlobalAddressesContext
+{
+  size_t off;
+  char *tgnas;
+};
+
+
 static enum GNUNET_GenericReturnValue
 add_global_addresses (void *cls,
                       const struct GNUNET_PeerIdentity *pid,
                       void *value)
 {
-  char *tgnas = cls;
+  struct AddGlobalAddressesContext *ctx = cls;
   struct TransportGlobalNattedAddress *tgna = value;
   char *addr = (char *) &tgna[1];
   size_t address_len = strlen (addr);
-  unsigned int off = 0;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "sending address %s length %u\n",
+              "sending address %s length %lu\n",
               addr,
               address_len);
   tgna = GNUNET_malloc (sizeof (struct TransportGlobalNattedAddress) + address_len);
   tgna->address_length = htonl (address_len);
   GNUNET_memcpy (&tgna[1], addr, address_len);
-  GNUNET_memcpy (&tgnas[off], tgna, sizeof (struct TransportGlobalNattedAddress) + address_len);
+  GNUNET_memcpy (&(ctx->tgnas[ctx->off]), tgna, sizeof (struct TransportGlobalNattedAddress) + address_len);
   GNUNET_free (tgna);
-  off += sizeof(struct TransportGlobalNattedAddress) + address_len;
+  ctx->off += sizeof(struct TransportGlobalNattedAddress) + address_len;
+
+  return GNUNET_OK;
 }
 
 
@@ -5386,17 +5397,20 @@ consider_sending_fc (void *cls)
 
   if (0 < n->number_of_addresses)
   {
-    char *tgnas = GNUNET_malloc (n->number_of_addresses * sizeof (struct TransportGlobalNattedAddress) + n->size_of_global_addresses);
-    size_t addresses_size;
+    size_t addresses_size =
+      n->number_of_addresses * sizeof (struct TransportGlobalNattedAddress) + n->size_of_global_addresses;
+    char *tgnas = GNUNET_malloc (addresses_size);
+    struct AddGlobalAddressesContext ctx;
+    ctx.off = 0;
+    ctx.tgnas = tgnas;
 
-    addresses_size = n->number_of_addresses * sizeof (struct TransportGlobalNattedAddress) + n->size_of_global_addresses;
     fc = GNUNET_malloc (sizeof (struct TransportFlowControlMessage) + addresses_size);
     fc->header.size = htons (sizeof(struct TransportFlowControlMessage) + addresses_size);
     fc->size_of_addresses = htonl (n->size_of_global_addresses);
     fc->number_of_addresses = htonl (n->number_of_addresses);
     GNUNET_CONTAINER_multipeermap_iterate (n->natted_addresses,
                                            &add_global_addresses,
-                                           tgnas);
+                                           &ctx);
     GNUNET_memcpy (&fc[1], tgnas, addresses_size);
     GNUNET_free (tgnas);
   }
@@ -5939,19 +5953,16 @@ handle_add_address (void *cls,
   struct TransportClient *tc = cls;
   struct AddressListEntry *ale;
   size_t slen;
-  char *address;
 
   /* 0-termination of &aam[1] was checked in #check_add_address */
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Communicator added address `%s'!\n",
               (const char *) &aam[1]);
   slen = ntohs (aam->header.size) - sizeof(*aam);
-  address = GNUNET_malloc (slen);
-  memcpy (address, &aam[1], slen);
   ale = create_address_entry (tc,
                         GNUNET_TIME_relative_ntoh (aam->expiration),
                         (enum GNUNET_NetworkType) ntohl (aam->nt),
-                        address,
+                        (const char *) &aam[1],
                         aam->aid,
                         slen);
   GNUNET_CONTAINER_DLL_insert (tc->details.communicator.addr_head,
@@ -9610,11 +9621,10 @@ static int
 check_flow_control (void *cls, const struct TransportFlowControlMessage *fc)
 {
   (void) cls;
-  struct TransportGlobalNattedAddress *addresses = (struct TransportGlobalNattedAddress *) &fc[1];
   unsigned int number_of_addresses = ntohl (fc->number_of_addresses);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Flow control header size %u size of addresses %u number of addresses %u size of message struct %u second struct %u\n",
+              "Flow control header size %u size of addresses %u number of addresses %u size of message struct %lu second struct %lu\n",
               ntohs (fc->header.size),
               ntohl (fc->size_of_addresses),
               ntohl (fc->number_of_addresses),
@@ -11595,16 +11605,14 @@ iterate_address_and_compare_cb (void *cls,
                                 const char *uri)
 {
   struct Queue *queue = cls;
-  struct Neighbour *neighbour = queue->neighbour;
-  const char *dash;
   const char *slash;
   char *address_uri;
   char *prefix;
   char *uri_without_port;
-  char *address_uri_without_port = get_address_without_port (queue->address); 
+  char *address_uri_without_port;
 
   slash = strrchr (uri, '/');
-  prefix = GNUNET_strndup (uri, (slash - uri) - 2); 
+  prefix = GNUNET_strndup (uri, (slash - uri) - 2);
   GNUNET_assert (NULL != slash);
   slash++;
   GNUNET_asprintf (&address_uri,
@@ -11674,7 +11682,8 @@ contains_address (void *cls,
   struct TransportGlobalNattedAddress *tgna = value;
   char *addr = (char *) &tgna[1];
 
-  if (0 == GNUNET_memcmp (addr, tgna_cls->addr))
+  if (strlen(tgna_cls->addr) == ntohl (tgna->address_length)
+      && 0 == strncmp (addr, tgna_cls->addr, ntohl (tgna->address_length)))
   {
     tgna_cls->tgna = tgna;
     return GNUNET_NO;
@@ -11728,18 +11737,20 @@ check_for_global_natted (void *cls,
   GNUNET_HELLO_builder_free (builder);
 
   tgna_cls.addr = get_address_without_port (queue->address);
+  tgna_cls.tgna = NULL;
   address_len_without_port = strlen (tgna_cls.addr);
   GNUNET_CONTAINER_multipeermap_get_multiple (neighbour->natted_addresses,
                                               &neighbour->pid,
                                               &contains_address,
                                               &tgna_cls);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              " tgna_cls.tgna tgna %p %u %u %u\n",
-              tgna_cls.tgna,
-              neighbour->size_of_global_addresses,
-              tgna_cls.tgna->address_length,
-              neighbour->number_of_addresses);
-  if (0 == tgna_cls.tgna->address_length && GNUNET_YES == queue->is_global_natted)
+  if (NULL != tgna_cls.tgna)
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                " tgna_cls.tgna tgna %p %lu %u %u\n",
+                tgna_cls.tgna,
+                neighbour->size_of_global_addresses,
+                ntohl (tgna_cls.tgna->address_length),
+                neighbour->number_of_addresses);
+  if (NULL == tgna_cls.tgna && GNUNET_YES == queue->is_global_natted)
   {
     struct TransportGlobalNattedAddress *tgna;
 
@@ -11756,7 +11767,7 @@ check_for_global_natted (void *cls,
                 "Created tgna %p\n",
                 tgna);
   }
-  else if (0 != tgna_cls.tgna->address_length && GNUNET_NO == queue->is_global_natted)
+  else if (NULL != tgna_cls.tgna && GNUNET_NO == queue->is_global_natted)
   {
     GNUNET_CONTAINER_multipeermap_remove (neighbour->natted_addresses,
                                           &neighbour->pid,
diff --git a/src/service/transport/meson.build b/src/service/transport/meson.build
index 1fdc47699..2f01c4a44 100644
--- a/src/service/transport/meson.build
+++ b/src/service/transport/meson.build
@@ -74,23 +74,10 @@ pkg.generate(libgnunettransportmonitor, url: 'https://www.gnunet.org',
              description : 'Provides monitor API for accessing the transport service')
 libgnunettransportmonitor_dep = declare_dependency(link_with : libgnunettransportmonitor)
 
-libgnunettransporttesting2 = library('gnunettransporttesting2',
+libgnunettestingtransport = library('gnunettestingtransport',
                                      [
-                                       'transport_api_traits.c',
-                                       'transport_api_cmd_connecting_peers.c',
-                                       'transport_api_cmd_backchannel_check.c',
-                                       'transport_api_cmd_start_peer.c',
-                                       'transport_api_cmd_stop_peer.c',
-                                       'testing_api_cmd_start_peer.c',
-                                       'testing_api_cmd_stop_peer.c',
-                                       'transport_api_cmd_send_simple.c',
-                                       'transport_api_cmd_send_simple_performance.c',
-                                       'transport-testing2.c',
-                                       'transport-testing-filenames2.c',
-                                       'transport-testing-loggers2.c',
-                                       'transport-testing-main2.c',
-                                       'transport-testing-send2.c',
-                                       'transport-testing-communicator.c',
+                                       'testing_transport_traits.c',
+                                       'transport-testing-communicator.c'
                                      ],
                                      soversion: '0',
                                      version: '0.0.0',
@@ -103,7 +90,7 @@ libgnunettransporttesting2 = library('gnunettransporttesting2',
                                      include_directories: [incdir, configuration_inc],
                                      install: true,
                                      install_dir: get_option('libdir'))
-libgnunettransporttesting2_dep = declare_dependency(link_with : libgnunettransporttesting2)
+libgnunettestingtransport_dep = declare_dependency(link_with : libgnunettestingtransport)
 
 executable ('gnunet-service-transport',
             gnunetservicetransport_src,
@@ -168,12 +155,14 @@ executable ('gnunet-communicator-quic',
             install_dir: get_option('libdir') / 'gnunet' / 'libexec')
 endif
 
+if false
+
 libgnunettesttransport_cmd_simplesend = library('gnunet_test_transport_plugin_cmd_simple_send',
                                                 ['test_transport_plugin_cmd_simple_send.c'],
                                                 dependencies: [
                                                   libgnunetutil_dep,
                                                   libgnunettransportapplication_dep,
-                                                  libgnunettransporttesting2_dep,
+                                                  libgnunettestingtransport_dep,
                                                   libgnunettransportcore_dep,
                                                   libgnunettesting_dep,
                                                   libgnunetpeerstore_dep,
@@ -191,7 +180,7 @@ libgnunettesttransport_cmd_simplesendbc = library('gnunet_test_transport_plugin_
                                                   dependencies: [
                                                     libgnunetutil_dep,
                                                     libgnunettransportapplication_dep,
-                                                    libgnunettransporttesting2_dep,
+                                                    libgnunettestingtransport_dep,
                                                     libgnunettransportcore_dep,
                                                     libgnunettesting_dep,
                                                     libgnunetpeerstore_dep,
@@ -209,7 +198,7 @@ libgnunettesttransport_cmd_simplesenddv = library('gnunet_test_transport_plugin_
                                                   dependencies: [
                                                     libgnunetutil_dep,
                                                     libgnunettransportapplication_dep,
-                                                    libgnunettransporttesting2_dep,
+                                                    libgnunettestingtransport_dep,
                                                     libgnunettransportcore_dep,
                                                     libgnunettesting_dep,
                                                     libgnunetpeerstore_dep,
@@ -227,7 +216,7 @@ libgnunettesttransport_cmd_simplesendperf = library('gnunet_test_transport_plugi
                                                     dependencies: [
                                                       libgnunetutil_dep,
                                                       libgnunettransportapplication_dep,
-                                                      libgnunettransporttesting2_dep,
+                                                      libgnunettestingtransport_dep,
                                                       libgnunettransportcore_dep,
                                                       libgnunettesting_dep,
                                                       libgnunetpeerstore_dep,
@@ -244,7 +233,7 @@ libgnunettesttransport_cmd_udpback = library('gnunet_test_transport_plugin_cmd_u
                                              ['test_transport_plugin_cmd_udp_backchannel.c'],
                                              dependencies: [
                                                libgnunetutil_dep,
-                                               libgnunettransporttesting2_dep,
+                                               libgnunettestingtransport_dep,
                                                libgnunettransportapplication_dep,
                                                libgnunettransportcore_dep,
                                                libgnunettesting_dep,
@@ -263,7 +252,7 @@ libgnunettesttransport_cmd_natupnp = library('gnunet_test_transport_plugin_cmd_n
                                              dependencies: [
                                                libgnunetutil_dep,
                                                libgnunettransportapplication_dep,
-                                               libgnunettransporttesting2_dep,
+                                               libgnunettestingtransport_dep,
                                                libgnunettransportcore_dep,
                                                libgnunettesting_dep,
                                                libgnunetpeerstore_dep,
@@ -275,6 +264,7 @@ libgnunettesttransport_cmd_natupnp = library('gnunet_test_transport_plugin_cmd_n
                                              include_directories: [incdir, configuration_inc],
                                              install: true,
                                              install_dir: get_option('libdir')/'gnunet')
+endif
 
 configure_file(input : 'test_transport_defaults.conf',
                output : 'test_transport_defaults.conf',
@@ -317,7 +307,7 @@ testcommunicator_basic_unix = executable('test_communicator_basic-unix',
                                          dependencies: [
                                            libgnunetutil_dep,
                                            libgnunettransportapplication_dep,
-                                           libgnunettransporttesting2_dep,
+                                           libgnunettestingtransport_dep,
                                            libgnunettransportcore_dep,
                                            libgnunettesting_dep,
                                            libgnunetpeerstore_dep,
@@ -333,7 +323,7 @@ testcommunicator_basic_tcp = executable('test_communicator_basic-tcp',
                                         dependencies: [
                                           libgnunetutil_dep,
                                           libgnunettransportapplication_dep,
-                                          libgnunettransporttesting2_dep,
+                                          libgnunettestingtransport_dep,
                                           libgnunettransportcore_dep,
                                           libgnunettesting_dep,
                                           libgnunetpeerstore_dep,
@@ -349,7 +339,7 @@ testcommunicator_basic_udp = executable('test_communicator_basic-udp',
                                         dependencies: [
                                           libgnunetutil_dep,
                                           libgnunettransportapplication_dep,
-                                          libgnunettransporttesting2_dep,
+                                          libgnunettestingtransport_dep,
                                           libgnunettransportcore_dep,
                                           libgnunettesting_dep,
                                           libgnunetpeerstore_dep,
@@ -366,7 +356,7 @@ if quic_dep.found() and get_option('experimental')
                                            dependencies: [
                                              libgnunetutil_dep,
                                              libgnunettransportapplication_dep,
-                                             libgnunettransporttesting2_dep,
+                                             libgnunettestingtransport_dep,
                                              libgnunettransportcore_dep,
                                              libgnunettesting_dep,
                                              libgnunetpeerstore_dep,
@@ -384,7 +374,7 @@ testcommunicator_rekey_tcp = executable('test_communicator_rekey-tcp',
                                         dependencies: [
                                           libgnunetutil_dep,
                                           libgnunettransportapplication_dep,
-                                          libgnunettransporttesting2_dep,
+                                          libgnunettestingtransport_dep,
                                           libgnunettransportcore_dep,
                                           libgnunettesting_dep,
                                           libgnunetpeerstore_dep,
@@ -401,7 +391,7 @@ testcommunicator_rekey_udp = executable('test_communicator_rekey-udp',
                                         dependencies: [
                                           libgnunetutil_dep,
                                           libgnunettransportapplication_dep,
-                                          libgnunettransporttesting2_dep,
+                                          libgnunettestingtransport_dep,
                                           libgnunettransportcore_dep,
                                           libgnunettesting_dep,
                                           libgnunetpeerstore_dep,
@@ -418,7 +408,7 @@ testcommunicator_backchannel_udp = executable('test_communicator_backchannel-udp
                                               dependencies: [
                                                 libgnunetutil_dep,
                                                 libgnunettransportapplication_dep,
-                                                libgnunettransporttesting2_dep,
+                                                libgnunettestingtransport_dep,
                                                 libgnunettransportcore_dep,
                                                 libgnunettesting_dep,
                                                 libgnunetpeerstore_dep,
@@ -435,7 +425,7 @@ testcommunicator_bidirect_tcp = executable('test_communicator_bidirect-tcp',
                                            dependencies: [
                                              libgnunetutil_dep,
                                              libgnunettransportapplication_dep,
-                                             libgnunettransporttesting2_dep,
+                                             libgnunettestingtransport_dep,
                                              libgnunettransportcore_dep,
                                              libgnunettesting_dep,
                                              libgnunetpeerstore_dep,
diff --git a/src/service/transport/test_transport_plugin_cmd_simple_send_broadcast.c b/src/service/transport/test_transport_plugin_cmd_simple_send_broadcast.c
index 62f7d820f..79b369b18 100644
--- a/src/service/transport/test_transport_plugin_cmd_simple_send_broadcast.c
+++ b/src/service/transport/test_transport_plugin_cmd_simple_send_broadcast.c
@@ -24,13 +24,11 @@
  * @author t3sserakt
  */
 #include "platform.h"
-#include "gnunet_testing_barrier.h"
-#include "gnunet_testing_netjail_lib.h"
+#include "gnunet_testing_lib.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_transport_application_service.h"
 #include "transport-testing2.h"
 #include "transport-testing-cmds.h"
-#include "gnunet_testing_barrier.h"
 
 /**
  * Generic logging shortcut
diff --git a/src/service/transport/test_transport_plugin_cmd_simple_send_performance.c b/src/service/transport/test_transport_plugin_cmd_simple_send_performance.c
index 33deb3323..fe92e0ad9 100644
--- a/src/service/transport/test_transport_plugin_cmd_simple_send_performance.c
+++ b/src/service/transport/test_transport_plugin_cmd_simple_send_performance.c
@@ -24,13 +24,11 @@
  * @author t3sserakt
  */
 #include "platform.h"
-#include "gnunet_testing_barrier.h"
-#include "gnunet_testing_netjail_lib.h"
 #include "gnunet_util_lib.h"
+#include "gnunet_testing_lib.h"
 #include "gnunet_transport_application_service.h"
 #include "transport-testing2.h"
 #include "transport-testing-cmds.h"
-#include "gnunet_testing_barrier.h"
 
 /**
  * Generic logging shortcut
diff --git a/src/service/transport/test_transport_plugin_cmd_udp_backchannel.c b/src/service/transport/test_transport_plugin_cmd_udp_backchannel.c
index 75fb85e66..7e67d6fad 100644
--- a/src/service/transport/test_transport_plugin_cmd_udp_backchannel.c
+++ b/src/service/transport/test_transport_plugin_cmd_udp_backchannel.c
@@ -176,26 +176,15 @@ all_local_tests_prepared ()
 
 
 /**
- * Function to start a local test case.
+ * Entry point for the plugin.
  *
- * @param write_message Callback to send a message to the master loop.
- * @param router_ip Global address of the network namespace.
- * @param node_ip The IP address of the node.
- * @param m The number of the node in a network namespace.
- * @param n The number of the network namespace.
- * @param local_m The number of nodes in a network namespace.
+ * @param cls NULL
+ * @return the exported block API
  */
-static struct GNUNET_TESTING_Interpreter *
-start_testcase (GNUNET_TESTING_cmd_helper_write_cb write_message,
-                const char *router_ip,
-                const char *node_ip,
-                const char *m,
-                const char *n,
-                const char *local_m,
-                const char *topology_data,
-                unsigned int *read_file,
-                GNUNET_TESTING_cmd_helper_finish_cb finished_cb)
+void *
+libgnunet_test_transport_plugin_cmd_udp_backchannel_init (void *cls)
 {
+  struct GNUNET_TESTING_PluginFunctions *api;
 
   unsigned int n_int;
   unsigned int m_int;
@@ -318,38 +307,42 @@ start_testcase (GNUNET_TESTING_cmd_helper_write_cb write_message,
     GNUNET_TESTING_cmd_end ()
   };
 
-  ts->write_message = write_message;
-
-  is = GNUNET_TESTING_run (commands,
-                           TIMEOUT,
-                           &handle_result,
-                           ts);
-  return is;
+  return GNUNET_TESTING_make_plugin (commands);
 }
 
 
-/**
- * Entry point for the plugin.
- *
- * @param cls NULL
- * @return the exported block API
- */
-void *
-libgnunet_test_transport_plugin_cmd_udp_backchannel_init (void *cls)
-{
-  struct GNUNET_TESTING_PluginFunctions *api;
-
-  GNUNET_log_setup ("udp-backchannel",
-                    "DEBUG",
-                    "plugin.out");
-
-  api = GNUNET_new (struct GNUNET_TESTING_PluginFunctions);
-  api->start_testcase = &start_testcase;
-  api->all_peers_started = &all_peers_started;
-  api->all_local_tests_prepared = all_local_tests_prepared;
-  api->get_waiting_for_barriers = get_waiting_for_barriers;
-  return api;
-}
+GNUNET_TESTING_MAKE_PLUGIN (
+  libgnunet,
+  udp_backchannel,
+  GNUNET_TESTING_cmd_system_create ("system-create",
+                                    ts->testdir),
+  GNUNET_TRANSPORT_cmd_start_peer ("start-peer",
+                                   "system-create",
+                                   num,
+                                   node_ip,
+                                   handlers,
+                                   ts->cfgname,
+                                   notify_connect,
+                                   GNUNET_NO),
+  GNUNET_TESTING_cmd_send_peer_ready (
+    "send-peer-ready",
+    write_message),
+  block_send,
+  connect_peers,
+  GNUNET_TRANSPORT_cmd_backchannel_check (
+    "backchannel-check",
+    "start-peer",
+    "system-create",
+    num,
+    m_int,
+    n_int,
+    topology),
+  local_prepared,
+  GNUNET_TRANSPORT_cmd_stop_peer ("stop-peer",
+                                  "start-peer"),
+  GNUNET_TESTING_cmd_system_destroy ("system-destroy",
+                                     "system-create")
+  );
 
 
 /**
diff --git a/src/service/transport/test_transport_simple_send.sh b/src/service/transport/test_transport_simple_send.sh
index 0250070be..af7515753 100755
--- a/src/service/transport/test_transport_simple_send.sh
+++ b/src/service/transport/test_transport_simple_send.sh
@@ -1,11 +1,4 @@
 #!/bin/bash
-if ! [ -d "/run/netns" ]; then
-    echo You have to create the directory /run/netns.
-fi
-if [ -f /proc/sys/kernel/unprivileged_userns_clone ]; then
-  if  [ "$(cat /proc/sys/kernel/unprivileged_userns_clone)" != 1 ]; then
-    echo -e "Error during test setup: The kernel parameter kernel.unprivileged_userns_clone has to be set to 1! One has to execute\n\n sysctl kernel.unprivileged_userns_clone=1\n"
-    exit 78
-  fi
-fi
-exec unshare -r -nmU bash -c "mount -t tmpfs --make-rshared tmpfs /run/netns; ./test_transport_start_with_config test_transport_simple_send_topo.conf"
+exec netjail_test_master.sh ./test_transport_start_with_config test_transport_simple_send_topo.conf
+
+# exec netjail_test_master.sh gnunet-testing-netjail-launcher test_transport_simple_send_topo.conf
diff --git a/src/service/transport/test_transport_start_with_config.c b/src/service/transport/test_transport_start_with_config.c
index 349cd65a5..2c00dde8a 100644
--- a/src/service/transport/test_transport_start_with_config.c
+++ b/src/service/transport/test_transport_start_with_config.c
@@ -24,8 +24,7 @@
  * @author t3sserakt
  */
 #include "platform.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_testing_netjail_lib.h"
+#include "gnunet_testing_lib.h"
 #include "gnunet_util_lib.h"
 
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 600)
diff --git a/src/service/transport/testing_api_cmd_start_peer.c b/src/service/transport/testing_api_cmd_start_peer.c
deleted file mode 100644
index 4454b2939..000000000
--- a/src/service/transport/testing_api_cmd_start_peer.c
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2021 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testing_api_cmd_start_peer.c
- * @brief cmd to start a peer.
- * @author t3sserakt
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "transport-testing-cmds.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_transport_testing_ng_lib.h"
-
-
-/**
- * Generic logging shortcut
- */
-#define LOG(kind, ...) GNUNET_log (kind, __VA_ARGS__)
-
-
-/**
- * The run method of this cmd will start all services of a peer to test the transport service.
- *
- */
-static void
-start_peer_run (void *cls,
-                struct GNUNET_TESTING_Interpreter *is)
-{
-  struct GNUNET_TESTING_StartPeerState *sps = cls;
-  char *emsg = NULL;
-  struct GNUNET_PeerIdentity dummy;
-  const struct GNUNET_TESTING_Command *system_cmd;
-  const struct GNUNET_TESTING_System *tl_system;
-  char *home;
-  char *transport_unix_path;
-  char *tcp_communicator_unix_path;
-  char *udp_communicator_unix_path;
-  char *bindto;
-  char *bindto_udp;
-
-  if (GNUNET_NO == GNUNET_DISK_file_test (sps->cfgname))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "File not found: `%s'\n",
-         sps->cfgname);
-    GNUNET_TESTING_interpreter_fail (is);
-    return;
-  }
-
-
-  sps->cfg = GNUNET_CONFIGURATION_create ();
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CONFIGURATION_load (sps->cfg, sps->cfgname));
-
-  GNUNET_asprintf (&home,
-                   "$GNUNET_TMP/test-transport/api-tcp-p%u",
-                   sps->no);
-
-  GNUNET_asprintf (&transport_unix_path,
-                   "$GNUNET_RUNTIME_DIR/tng-p%u.sock",
-                   sps->no);
-
-  GNUNET_asprintf (&tcp_communicator_unix_path,
-                   "$GNUNET_RUNTIME_DIR/tcp-comm-p%u.sock",
-                   sps->no);
-
-  GNUNET_asprintf (&udp_communicator_unix_path,
-                   "$GNUNET_RUNTIME_DIR/tcp-comm-p%u.sock",
-                   sps->no);
-
-  GNUNET_asprintf (&bindto,
-                   "%s:60002",
-                   sps->node_ip);
-
-  GNUNET_asprintf (&bindto_udp,
-                   "2086");
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "node_ip %s\n",
-       bindto);
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "bind_udp %s\n",
-       GNUNET_YES == sps->broadcast ?
-       bindto_udp : bindto);
-
-  GNUNET_CONFIGURATION_set_value_string (sps->cfg, "PATHS", "GNUNET_TEST_HOME",
-                                         home);
-  GNUNET_CONFIGURATION_set_value_string (sps->cfg, "transport", "UNIXPATH",
-                                         transport_unix_path);
-  GNUNET_CONFIGURATION_set_value_string (sps->cfg, "communicator-tcp",
-                                         "BINDTO",
-                                         bindto);
-  GNUNET_CONFIGURATION_set_value_string (sps->cfg, "communicator-udp",
-                                         "BINDTO",
-                                         GNUNET_YES == sps->broadcast ?
-                                         bindto_udp : bindto);
-  GNUNET_CONFIGURATION_set_value_string (sps->cfg, "communicator-tcp",
-                                         "UNIXPATH",
-                                         tcp_communicator_unix_path);
-  GNUNET_CONFIGURATION_set_value_string (sps->cfg, "communicator-udp",
-                                         "UNIXPATH",
-                                         udp_communicator_unix_path);
-
-
-  system_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
-                                                          sps->system_label);
-  GNUNET_TESTING_get_trait_test_system (system_cmd,
-                                        &tl_system);
-
-  sps->tl_system = tl_system;
-
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Creating testing library with key number %u\n",
-       sps->no);
-
-  if (GNUNET_SYSERR ==
-      GNUNET_TESTING_configuration_create ((struct
-                                            GNUNET_TESTING_System *) tl_system,
-                                           sps->cfg))
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Testing library failed to create unique configuration based on `%s'\n",
-         sps->cfgname);
-    GNUNET_CONFIGURATION_destroy (sps->cfg);
-    GNUNET_TESTING_interpreter_fail (is);
-    return;
-  }
-
-  sps->peer = GNUNET_TESTING_peer_configure ((struct
-                                              GNUNET_TESTING_System *) sps->
-                                             tl_system,
-                                             sps->cfg,
-                                             sps->no,
-                                             NULL,
-                                             &emsg);
-  if (NULL == sps->peer)
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Testing library failed to create unique configuration based on `%s': `%s' with key number %u\n",
-         sps->cfgname,
-         emsg,
-         sps->no);
-    GNUNET_free (emsg);
-    GNUNET_TESTING_interpreter_fail (is);
-    return;
-  }
-
-  if (GNUNET_OK != GNUNET_TESTING_peer_start (sps->peer))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Testing library failed to create unique configuration based on `%s'\n",
-         sps->cfgname);
-    GNUNET_free (emsg);
-    GNUNET_TESTING_interpreter_fail (is);
-    return;
-  }
-
-  memset (&dummy,
-          '\0',
-          sizeof(dummy));
-
-  GNUNET_TESTING_peer_get_identity (sps->peer,
-                                    &sps->id);
-
-  if (0 == memcmp (&dummy,
-                   &sps->id,
-                   sizeof(struct GNUNET_PeerIdentity)))
-  {
-    LOG (GNUNET_ERROR_TYPE_ERROR,
-         "Testing library failed to obtain peer identity for peer %u\n",
-         sps->no);
-    GNUNET_free (emsg);
-    GNUNET_TESTING_interpreter_fail (is);
-    return;
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Peer %u configured with identity `%s'\n",
-       sps->no,
-       GNUNET_i2s_full (&sps->id));
-
-  GNUNET_free (home);
-  GNUNET_free (transport_unix_path);
-  GNUNET_free (tcp_communicator_unix_path);
-  GNUNET_free (udp_communicator_unix_path);
-  GNUNET_free (bindto);
-  GNUNET_free (bindto_udp);
-}
-
-
-/**
- * The cleanup function of this cmd frees resources the cmd allocated.
- *
- */
-static void
-start_peer_cleanup (void *cls)
-{
-  struct GNUNET_TESTING_StartPeerState *sps = cls;
-
-  //TODO Investigate why this caused problems during shutdown.
-  /*if (NULL != sps->cfg)
-  {
-    GNUNET_CONFIGURATION_destroy (sps->cfg);
-    sps->cfg = NULL;
-    }*/
-  GNUNET_free (sps->cfgname);
-  GNUNET_free (sps->node_ip);
-  GNUNET_free (sps->system_label);
-  GNUNET_free (sps->hello);
-  GNUNET_free (sps->connected_peers_map);
-  GNUNET_free (sps);
-}
-
-
-/**
- * This function prepares an array with traits.
- *
- */
-static int
-start_peer_traits (void *cls,
-                   const void **ret,
-                   const char *trait,
-                   unsigned int index)
-{
-  struct GNUNET_TESTING_StartPeerState *sps = cls;
-  struct GNUNET_TRANSPORT_ApplicationHandle *ah = sps->ah;
-  struct GNUNET_PeerIdentity *id = &sps->id;
-  struct GNUNET_CONTAINER_MultiShortmap *connected_peers_map =
-    sps->connected_peers_map;
-  char *hello = sps->hello;
-  size_t hello_size = sps->hello_size;
-  struct GNUNET_TESTING_Trait traits[] = {
-    GNUNET_TRANSPORT_TESTING_make_trait_application_handle ((const void *) ah),
-    GNUNET_TRANSPORT_TESTING_make_trait_peer_id ((const void *) id),
-    GNUNET_TRANSPORT_TESTING_make_trait_connected_peers_map ((const
-                                                      void *)
-                                                     connected_peers_map),
-    GNUNET_TRANSPORT_TESTING_make_trait_hello ((const void *) hello),
-    GNUNET_TRANSPORT_TESTING_make_trait_hello_size ((const void *) hello_size),
-    GNUNET_TRANSPORT_TESTING_make_trait_state ((const void *) sps),
-    GNUNET_TRANSPORT_TESTING_make_trait_broadcast ((const void *) &sps->broadcast),
-    GNUNET_TESTING_trait_end ()
-  };
-
-  return GNUNET_TESTING_get_trait (traits,
-                                   ret,
-                                   trait,
-                                   index);
-}
-
-
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_start_peer (const char *label,
-                                 const char *system_label,
-                                 uint32_t no,
-                                 const char *node_ip,
-                                 const char *cfgname,
-                                 unsigned int broadcast)
-{
-  struct GNUNET_TESTING_StartPeerState *sps;
-  struct GNUNET_CONTAINER_MultiShortmap *connected_peers_map =
-    GNUNET_CONTAINER_multishortmap_create (1,GNUNET_NO);
-
-  sps = GNUNET_new (struct GNUNET_TESTING_StartPeerState);
-  sps->no = no;
-  sps->system_label = GNUNET_strdup (system_label);
-  sps->connected_peers_map = connected_peers_map;
-  sps->cfgname = GNUNET_strdup (cfgname);
-  sps->node_ip = GNUNET_strdup (node_ip);
-  sps->broadcast = broadcast;
-
-  return GNUNET_TESTING_command_new (sps,
-                                     label,
-                                     &start_peer_run,
-                                     &start_peer_cleanup,
-                                     &start_peer_traits,
-                                     NULL);
-}
diff --git a/src/service/transport/testing_api_cmd_stop_peer.c b/src/service/transport/testing_api_cmd_stop_peer.c
deleted file mode 100644
index ce8d824f5..000000000
--- a/src/service/transport/testing_api_cmd_stop_peer.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-      This file is part of GNUnet
-      Copyright (C) 2021 GNUnet e.V.
-
-      GNUnet is free software: you can redistribute it and/or modify it
-      under the terms of the GNU Affero General Public License as published
-      by the Free Software Foundation, either version 3 of the License,
-      or (at your option) any later version.
-
-      GNUnet is distributed in the hope that it will be useful, but
-      WITHOUT ANY WARRANTY; without even the implied warranty of
-      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      Affero General Public License for more details.
-
-      You should have received a copy of the GNU Affero General Public License
-      along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     SPDX-License-Identifier: AGPL3.0-or-later
- */
-
-/**
- * @file testing_api_cmd_stop_peer.c
- * @brief cmd to stop a peer.
- * @author t3sserakt
- */
-#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_transport_testing_ng_lib.h"
-
-/**
- * Generic logging shortcut
- */
-#define LOG(kind, ...) GNUNET_log (kind, __VA_ARGS__)
-
-
-/**
- * Struct to hold information for callbacks.
- *
- */
-struct StopPeerState
-{
-  // Label of the cmd to start the peer.
-  const char *start_label;
-};
-
-
-/**
- * The run method of this cmd will stop all services of a peer which were used to test the transport service.
- *
- */
-static void
-stop_peer_run (void *cls,
-               struct GNUNET_TESTING_Interpreter *is)
-{
-  struct StopPeerState *stop_ps = cls;
-  const struct GNUNET_TESTING_StartPeerState *sps;
-  const struct GNUNET_TESTING_Command *start_cmd;
-
-  start_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
-                                                         stop_ps->start_label);
-  GNUNET_TRANSPORT_TESTING_get_trait_state (start_cmd,
-                                            &sps);
-  
-  if (NULL != sps->peer)
-  {
-    if (GNUNET_OK !=
-        GNUNET_TESTING_peer_stop (sps->peer))
-    {
-      LOG (GNUNET_ERROR_TYPE_ERROR,
-           "Testing lib failed to stop peer %u (`%s')\n",
-           sps->no,
-           GNUNET_i2s (&sps->id));
-    }
-    GNUNET_TESTING_peer_destroy (sps->peer);
-  }
-  if (NULL != sps->rh_task)
-    GNUNET_SCHEDULER_cancel (sps->rh_task);
-}
-
-
-/**
- * The cleanup function of this cmd frees resources the cmd allocated.
- *
- */
-static void
-stop_peer_cleanup (void *cls)
-{
-  struct StopPeerState *sps = cls;
-
-  GNUNET_free (sps);
-}
-
-
-/**
- * Trait function of this cmd does nothing.
- *
- */
-static int
-stop_peer_traits (void *cls,
-                  const void **ret,
-                  const char *trait,
-                  unsigned int index)
-{
-  return GNUNET_OK;
-}
-
-
-/**
- * Create command.
- *
- * @param label name for command.
- * @param start_label Label of the cmd to start the peer.
- * @return command.
- */
-struct GNUNET_TESTING_Command
-GNUNET_TESTING_cmd_stop_peer (const char *label,
-                                const char *start_label)
-{
-  struct StopPeerState *sps;
-
-  sps = GNUNET_new (struct StopPeerState);
-  sps->start_label = start_label;
-  return GNUNET_TESTING_command_new (sps,
-                                     label,
-                                     &stop_peer_run,
-                                     &stop_peer_cleanup,
-                                     &stop_peer_traits,
-                                     NULL);
-}
diff --git a/src/service/transport/testing_transport_traits.c b/src/service/transport/testing_transport_traits.c
new file mode 100644
index 000000000..131c42a5d
--- /dev/null
+++ b/src/service/transport/testing_transport_traits.c
@@ -0,0 +1,35 @@
+/*
+      This file is part of GNUnet
+      Copyright (C) 2021 GNUnet e.V.
+
+      GNUnet is free software: you can redistribute it and/or modify it
+      under the terms of the GNU Affero General Public License as published
+      by the Free Software Foundation, either version 3 of the License,
+      or (at your option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Affero General Public License for more details.
+
+      You should have received a copy of the GNU Affero General Public License
+      along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+/**
+ * @file transport/test_transport_start_with_config.c
+ * @brief Generic program to start testcases in an configurable topology.
+ * @author t3sserakt
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testing_lib.h"
+#include "transport-testing-cmds.h"
+
+GNUNET_TRANSPORT_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_IMPL_SIMPLE_TRAIT,
+                                GNUNET_TRANSPORT_TESTING)
+
+GNUNET_TRANSPORT_TESTING_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_IMPL_SIMPLE_TRAIT,
+                                        GNUNET_TRANSPORT_TESTING)
diff --git a/src/service/transport/transport-testing-cmds.h b/src/service/transport/transport-testing-cmds.h
index 7ebc84d11..478b3cba6 100644
--- a/src/service/transport/transport-testing-cmds.h
+++ b/src/service/transport/transport-testing-cmds.h
@@ -27,8 +27,8 @@
 #ifndef TRANSPORT_TESTING_CMDS_H
 #define TRANSPORT_TESTING_CMDS_H
 
-#include "gnunet_testing_ng_lib.h"
-#include "gnunet_transport_testing_ng_lib.h"
+#include "gnunet_testing_lib.h"
+#include "gnunet_testing_transport_lib.h"
 
 
 /**
@@ -48,7 +48,7 @@ struct ConnectPeersState
   /**
    * The testing system of this node.
    */
-  const struct GNUNET_TESTING_System *tl_system;
+  const struct GNUNET_TESTBED_System *tl_system;
 
   // Label of the cmd which started the test system.
   const char *create_label;
@@ -104,27 +104,14 @@ struct ConnectPeersState
 };
 
 
-
 typedef void *
 (*GNUNET_TRANSPORT_notify_connect_cb) (struct GNUNET_TESTING_Interpreter *is,
                                        const struct GNUNET_PeerIdentity *peer);
 
 
-
 struct TestState
 {
   /**
-   * Callback to write messages to the master loop.
-   *
-   */
-  GNUNET_TESTING_cmd_helper_write_cb write_message;
-
-  /**
-   * Callback to notify the helper test case has finished.
-   */
-  GNUNET_TESTING_cmd_helper_finish_cb finished_cb;
-
-  /**
    * The name for a specific test environment directory.
    *
    */
@@ -214,7 +201,7 @@ GNUNET_TRANSPORT_cmd_send_simple (const char *label,
                                   topology);
 
 /**
- * 
+ *
  *
  * @param label name for command.
  * @param start_peer_label Label of the cmd to start a peer.
@@ -227,13 +214,14 @@ GNUNET_TRANSPORT_cmd_send_simple (const char *label,
  */
 struct GNUNET_TESTING_Command
 GNUNET_TRANSPORT_cmd_send_simple_performance (const char *label,
-                                  const char *start_peer_label,
-                                  const char *create_label,
-                                  uint32_t num,
-                                  int size,
-                                  int max_send,
-                                  struct GNUNET_TESTING_NetjailTopology *
-                                  topology);
+                                              const char *start_peer_label,
+                                              const char *create_label,
+                                              uint32_t num,
+                                              int size,
+                                              int max_send,
+                                              struct
+                                              GNUNET_TESTING_NetjailTopology *
+                                              topology);
 
 
 /**
@@ -259,14 +247,14 @@ GNUNET_TRANSPORT_cmd_backchannel_check (const char *label,
                                         topology);
 
 
-
 /**
  * Call #op on all simple traits.
  */
 #define GNUNET_TRANSPORT_SIMPLE_TRAITS(op, prefix)                 \
-  op (prefix, connect_peer_state, const struct ConnectPeersState) 
+        op (prefix, connect_peer_state, const struct ConnectPeersState)
 
-GNUNET_TRANSPORT_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_DECL_SIMPLE_TRAIT, GNUNET_TRANSPORT_TESTING)
+GNUNET_TRANSPORT_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_DECL_SIMPLE_TRAIT,
+                                GNUNET_TRANSPORT_TESTING)
 
 
 #endif
diff --git a/src/service/transport/transport-testing2.h b/src/service/transport/transport-testing2.h
index a68c9df38..42ffce3f2 100644
--- a/src/service/transport/transport-testing2.h
+++ b/src/service/transport/transport-testing2.h
@@ -234,7 +234,7 @@ struct GNUNET_TRANSPORT_TESTING_Handle
   /**
    * Testing library system handle
    */
-  struct GNUNET_TESTING_System *tl_system;
+  struct GNUNET_TESTBED_System *tl_system;
 
   /**
    * head DLL of connect contexts
diff --git a/src/service/transport/transport_api_cmd_backchannel_check.c b/src/service/transport/transport_api_cmd_backchannel_check.c
index f23230798..6fa61adb7 100644
--- a/src/service/transport/transport_api_cmd_backchannel_check.c
+++ b/src/service/transport/transport_api_cmd_backchannel_check.c
@@ -67,7 +67,7 @@ struct CheckState
   /**
    * The testing system of this node.
    */
-  const struct GNUNET_TESTING_System *tl_system;
+  const struct GNUNET_TESTBED_System *tl_system;
 
   // Label of the cmd which started the test system.
   const char *create_label;
@@ -402,7 +402,7 @@ backchannel_check_run (void *cls,
 {
   struct CheckState *cs = cls;
   const struct GNUNET_TESTING_Command *system_cmd;
-  const struct GNUNET_TESTING_System *tl_system;
+  const struct GNUNET_TESTBED_System *tl_system;
   const struct GNUNET_TESTING_Command *peer1_cmd;
   const struct GNUNET_TRANSPORT_ApplicationHandle *ah;
   struct GNUNET_CONTAINER_MultiShortmapIterator *node_it;
@@ -467,7 +467,8 @@ backchannel_check_run (void *cls,
     node_it = GNUNET_CONTAINER_multishortmap_iterator_create (
       namespace->nodes);
     while (GNUNET_YES == GNUNET_CONTAINER_multishortmap_iterator_next (node_it,
-                                                                       &node_key,
+                                                                       &node_key
+                                                                       ,
                                                                        (const
                                                                         void**)
                                                                        &node))
@@ -544,10 +545,10 @@ GNUNET_TRANSPORT_cmd_backchannel_check (const char *label,
   cs->node_n = node_n;
   cs->namespace_n = namespace_n;
 
-  return GNUNET_TESTING_command_new (cs,
-                                     label,
-                                     &backchannel_check_run,
-                                     &backchannel_check_cleanup,
-                                     &backchannel_check_traits,
-                                     &cs->ac);
+  return GNUNET_TESTING_command_new_ac (cs,
+                                        label,
+                                        &backchannel_check_run,
+                                        &backchannel_check_cleanup,
+                                        &backchannel_check_traits,
+                                        &cs->ac);
 }
diff --git a/src/service/transport/transport_api_cmd_connecting_peers.c b/src/service/transport/transport_api_cmd_connecting_peers.c
index b7c072169..280c0e9a2 100644
--- a/src/service/transport/transport_api_cmd_connecting_peers.c
+++ b/src/service/transport/transport_api_cmd_connecting_peers.c
@@ -25,7 +25,8 @@
  */
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_testing_ng_lib.h"
+#include "gnunet_testing_lib.h"
+#include "gnunet_testbed_lib.h"
 #include "gnunet_transport_testing_ng_lib.h"
 #include "transport-testing-cmds.h"
 #include "gnunet_transport_application_service.h"
@@ -45,7 +46,7 @@ connect_peers_run (void *cls,
 {
   struct ConnectPeersState *cps = cls;
   const struct GNUNET_TESTING_Command *system_cmd;
-  const struct GNUNET_TESTING_System *tl_system;
+  const struct GNUNET_TESTBED_System *tl_system;
 
 
   const struct GNUNET_TESTING_Command *peer1_cmd;
@@ -83,7 +84,7 @@ connect_peers_run (void *cls,
 
   system_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
                                                           cps->create_label);
-  GNUNET_TESTING_get_trait_test_system (system_cmd,
+  GNUNET_TESTBED_get_trait_test_system (system_cmd,
                                         &tl_system);
 
   cps->tl_system = tl_system;
@@ -292,22 +293,23 @@ GNUNET_TRANSPORT_cmd_connect_peers (const char *label,
   cps->additional_connects = additional_connects;
   cps->wait_for_connect = wait_for_connect;
 
+  // FIXME: wrap with cmd_make_unblocking!
   if (GNUNET_YES == wait_for_connect)
-    return GNUNET_TESTING_command_new (cps,
-                                       label,
-                                       &connect_peers_run,
-                                       &connect_peers_cleanup,
-                                       &connect_peers_traits,
-                                       &cps->ac);
+    return GNUNET_TESTING_command_new_ac (cps,
+                                          label,
+                                          &connect_peers_run,
+                                          &connect_peers_cleanup,
+                                          &connect_peers_traits,
+                                          &cps->ac);
   else
     return GNUNET_TESTING_command_new (cps,
                                        label,
                                        &connect_peers_run,
                                        &connect_peers_cleanup,
-                                       &connect_peers_traits,
-                                       NULL);
+                                       &connect_peers_traits);
 }
 
 
 // FIXME: likely not ideally placed here, move to its own file
-GNUNET_TRANSPORT_TESTING_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_IMPL_SIMPLE_TRAIT, GNUNET_TRANSPORT_TESTING)
+GNUNET_TRANSPORT_TESTING_SIMPLE_TRAITS (GNUNET_TESTING_MAKE_IMPL_SIMPLE_TRAIT,
+                                        GNUNET_TRANSPORT_TESTING)
diff --git a/src/service/transport/transport_api_cmd_send_simple.c b/src/service/transport/transport_api_cmd_send_simple.c
index 3e732ffc9..b0f443584 100644
--- a/src/service/transport/transport_api_cmd_send_simple.c
+++ b/src/service/transport/transport_api_cmd_send_simple.c
@@ -118,12 +118,12 @@ send_simple_run (void *cls,
   const struct GNUNET_CONTAINER_MultiShortmap *connected_peers_map;
   const struct GNUNET_TESTING_Command *peer1_cmd;
   const struct GNUNET_TESTING_Command *system_cmd;
-  const struct GNUNET_TESTING_System *tl_system;
+  const struct GNUNET_TESTBED_System *tl_system;
 
   peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
                                                          sss->start_peer_label);
   GNUNET_TRANSPORT_TESTING_get_trait_connected_peers_map (peer1_cmd,
-                                                &connected_peers_map);
+                                                          &connected_peers_map);
 
   system_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
                                                           sss->create_label);
@@ -157,6 +157,5 @@ GNUNET_TRANSPORT_cmd_send_simple (const char *label,
                                      label,
                                      &send_simple_run,
                                      &send_simple_cleanup,
-                                     NULL,
                                      NULL);
 }
diff --git a/src/service/transport/transport_api_cmd_send_simple_performance.c b/src/service/transport/transport_api_cmd_send_simple_performance.c
index 5979e47fe..a3012d9cd 100644
--- a/src/service/transport/transport_api_cmd_send_simple_performance.c
+++ b/src/service/transport/transport_api_cmd_send_simple_performance.c
@@ -168,7 +168,7 @@ send_simple_run (void *cls,
   const struct GNUNET_CONTAINER_MultiShortmap *connected_peers_map;
   const struct GNUNET_TESTING_Command *peer1_cmd;
   const struct GNUNET_TESTING_Command *system_cmd;
-  const struct GNUNET_TESTING_System *tl_system;
+  const struct GNUNET_TESTBED_System *tl_system;
 
 
   peer1_cmd = GNUNET_TESTING_interpreter_lookup_command (is,
@@ -208,13 +208,12 @@ GNUNET_TRANSPORT_cmd_send_simple_performance (const char *label,
   sss->topology = topology;
   sss->size = size;
   sss->max_send = max_send;
-
-  cmd = GNUNET_TESTING_command_new (sss,
-                                    label,
-                                    &send_simple_run,
-                                    &send_simple_cleanup,
-                                    NULL,
-                                    &sss->ac);
+  cmd = GNUNET_TESTING_command_new_ac (sss,
+                                       label,
+                                       &send_simple_run,
+                                       &send_simple_cleanup,
+                                       NULL,
+                                       &sss->ac);
   cmd.asynchronous_finish = GNUNET_YES;
   return cmd;
 }
diff --git a/src/service/transport/transport_api_cmd_start_peer.c b/src/service/transport/transport_api_cmd_start_peer.c
index 5afbb338b..862d28b4c 100644
--- a/src/service/transport/transport_api_cmd_start_peer.c
+++ b/src/service/transport/transport_api_cmd_start_peer.c
@@ -84,11 +84,11 @@ retrieve_hello (void *cls)
   struct GNUNET_TESTING_StartPeerState *sps = cls;
   sps->rh_task = NULL;
   sps->pic = GNUNET_PEERSTORE_iteration_start (sps->ph,
-                                             "transport",
-                                             &sps->id,
-                                             GNUNET_PEERSTORE_TRANSPORT_HELLO_KEY,
-                                             hello_iter_cb,
-                                             sps);
+                                               "transport",
+                                               &sps->id,
+                                               GNUNET_PEERSTORE_TRANSPORT_HELLO_KEY,
+                                               hello_iter_cb,
+                                               sps);
 
 }
 
@@ -172,7 +172,7 @@ start_peer_run (void *cls,
   char *emsg = NULL;
   struct GNUNET_PeerIdentity dummy;
   const struct GNUNET_TESTING_Command *system_cmd;
-  const struct GNUNET_TESTING_System *tl_system;
+  const struct GNUNET_TESTBED_System *tl_system;
   char *home;
   char *transport_unix_path;
   char *tcp_communicator_unix_path;
@@ -258,7 +258,7 @@ start_peer_run (void *cls,
 
   if (GNUNET_SYSERR ==
       GNUNET_TESTING_configuration_create ((struct
-                                            GNUNET_TESTING_System *) tl_system,
+                                            GNUNET_TESTBED_System *) tl_system,
                                            sps->cfg))
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -270,7 +270,7 @@ start_peer_run (void *cls,
   }
 
   sps->peer = GNUNET_TESTING_peer_configure ((struct
-                                              GNUNET_TESTING_System *) sps->
+                                              GNUNET_TESTBED_System *) sps->
                                              tl_system,
                                              sps->cfg,
                                              sps->no,
@@ -475,10 +475,10 @@ GNUNET_TRANSPORT_cmd_start_peer (const char *label,
                    handlers,
                    i * sizeof(struct GNUNET_MQ_MessageHandler));
   }
-  return GNUNET_TESTING_command_new (sps,
-                                     label,
-                                     &start_peer_run,
-                                     &start_peer_cleanup,
-                                     &start_peer_traits,
-                                     &sps->ac);
+  return GNUNET_TESTING_command_new_ac (sps,
+                                        label,
+                                        &start_peer_run,
+                                        &start_peer_cleanup,
+                                        &start_peer_traits,
+                                        &sps->ac);
 }
diff --git a/src/service/transport/transport_api_cmd_stop_peer.c b/src/service/transport/transport_api_cmd_stop_peer.c
index fbd2b1df3..76a30d638 100644
--- a/src/service/transport/transport_api_cmd_stop_peer.c
+++ b/src/service/transport/transport_api_cmd_stop_peer.c
@@ -149,6 +149,5 @@ GNUNET_TRANSPORT_cmd_stop_peer (const char *label,
                                      label,
                                      &stop_peer_run,
                                      &stop_peer_cleanup,
-                                     &stop_peer_traits,
-                                     NULL);
+                                     &stop_peer_traits);
 }