42 files changed, 44 insertions, 44 deletions

diff --git a/src/core/test_core_api_peer1.conf b/src/core/test_core_api_peer1.conf
index a6888b683..88e8ad806 100644
--- a/src/core/test_core_api_peer1.conf
+++ b/src/core/test_core_api_peer1.conf
@@ -17,7 +17,7 @@ PLUGINS = tcp
 
 [arm]
 PORT = 12466
-DEFAULTSERVICES = resolver
+DEFAULTSERVICES = 
 #GLOBAL_PREFIX = xterm -e valgrind --tool=memcheck
 
 [statistics]
diff --git a/src/core/test_core_api_peer2.conf b/src/core/test_core_api_peer2.conf
index 9f7f89c0f..fe97fdd03 100644
--- a/src/core/test_core_api_peer2.conf
+++ b/src/core/test_core_api_peer2.conf
@@ -17,7 +17,7 @@ PLUGINS = tcp
 
 [arm]
 PORT = 22466
-DEFAULTSERVICES = resolver
+DEFAULTSERVICES = 
 #GLOBAL_PREFIX = xterm -e valgrind --tool=memcheck
 
 [statistics]
diff --git a/src/datastore/test_datastore_api_data.conf b/src/datastore/test_datastore_api_data.conf
index 59374dc40..3f2e067eb 100644
--- a/src/datastore/test_datastore_api_data.conf
+++ b/src/datastore/test_datastore_api_data.conf
@@ -3,7 +3,7 @@ SERVICEHOME = /tmp/test-gnunet-datastore/
 DEFAULTCONFIG = test_datastore_api_data.conf
 
 [arm]
-DEFAULTSERVICES = resolver 
+DEFAULTSERVICES = 
 PORT = 42466
 HOSTNAME = localhost
 
diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf
index c91fa7338..6c05d880b 100644
--- a/src/dht/test_dht_api_data.conf
+++ b/src/dht/test_dht_api_data.conf
@@ -112,7 +112,7 @@ HOSTNAME = localhost
 PORT = 2088
 
 [arm]
-DEFAULTSERVICES = resolver transport core
+DEFAULTSERVICES = 
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-arm
diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf
index 10fc273a7..33ca838f3 100644
--- a/src/dht/test_dht_api_peer1.conf
+++ b/src/dht/test_dht_api_peer1.conf
@@ -114,7 +114,7 @@ HOSTNAME = localhost
 PORT = 12092
 
 [arm]
-DEFAULTSERVICES = peerinfo core dht
+DEFAULTSERVICES = 
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-arm
diff --git a/src/dv/test_transport_api_data.conf b/src/dv/test_transport_api_data.conf
index 4b51ece96..1e003b3e1 100644
--- a/src/dv/test_transport_api_data.conf
+++ b/src/dv/test_transport_api_data.conf
@@ -103,7 +103,7 @@ HOSTNAME = localhost
 PORT = 2088
 
 [arm]
-DEFAULTSERVICES = resolver transport core
+DEFAULTSERVICES = 
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-arm
diff --git a/src/dv/test_transport_api_dv_peer1.conf b/src/dv/test_transport_api_dv_peer1.conf
index f335439ae..c919f78b0 100644
--- a/src/dv/test_transport_api_dv_peer1.conf
+++ b/src/dv/test_transport_api_dv_peer1.conf
@@ -112,7 +112,7 @@ HOSTNAME = localhost
 PORT = 12092
 
 [arm]
-DEFAULTSERVICES = core dv statistics
+DEFAULTSERVICES = 
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-arm
diff --git a/src/dv/test_transport_api_dv_peer2.conf b/src/dv/test_transport_api_dv_peer2.conf
index 78d9af072..31338d6e9 100644
--- a/src/dv/test_transport_api_dv_peer2.conf
+++ b/src/dv/test_transport_api_dv_peer2.conf
@@ -113,7 +113,7 @@ HOSTNAME = localhost
 PORT = 22370
 
 [arm]
-DEFAULTSERVICES = core dv statistics
+DEFAULTSERVICES = 
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-arm
diff --git a/src/dv/test_transport_api_dv_peer3.conf b/src/dv/test_transport_api_dv_peer3.conf
index 6522bc50a..83e8d81c6 100644
--- a/src/dv/test_transport_api_dv_peer3.conf
+++ b/src/dv/test_transport_api_dv_peer3.conf
@@ -113,7 +113,7 @@ HOSTNAME = localhost
 PORT = 32370
 
 [arm]
-DEFAULTSERVICES = core dv statistics
+DEFAULTSERVICES = 
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-arm
diff --git a/src/fs/fs_test_lib_data.conf b/src/fs/fs_test_lib_data.conf
index a4941af7b..d65bce262 100644
--- a/src/fs/fs_test_lib_data.conf
+++ b/src/fs/fs_test_lib_data.conf
@@ -17,7 +17,7 @@ PLUGINS = tcp
 [arm]
 PORT = 43466
 HOSTNAME = localhost
-DEFAULTSERVICES = resolver datastore transport core fs peerinfo
+DEFAULTSERVICES = 
 
 [datastore]
 #DEBUG = YES
diff --git a/src/fs/test_fs_data.conf b/src/fs/test_fs_data.conf
index 23c263702..1ee233c78 100644
--- a/src/fs/test_fs_data.conf
+++ b/src/fs/test_fs_data.conf
@@ -17,7 +17,7 @@ PLUGINS =
 [arm]
 PORT = 42466
 HOSTNAME = localhost
-DEFAULTSERVICES = resolver datastore fs
+DEFAULTSERVICES =
 
 [datastore]
 #DEBUG = YES
diff --git a/src/fs/test_fs_download_data.conf b/src/fs/test_fs_download_data.conf
index cf84afb72..c5e839765 100644
--- a/src/fs/test_fs_download_data.conf
+++ b/src/fs/test_fs_download_data.conf
@@ -16,7 +16,7 @@ PLUGINS =
 [arm]
 PORT = 42466
 HOSTNAME = localhost
-DEFAULTSERVICES = resolver datastore fs
+DEFAULTSERVICES = 
 
 [datastore]
 # DEBUG = YES
diff --git a/src/fs/test_fs_file_information_data.conf b/src/fs/test_fs_file_information_data.conf
index 5ca36d99f..55cfddff4 100644
--- a/src/fs/test_fs_file_information_data.conf
+++ b/src/fs/test_fs_file_information_data.conf
@@ -16,7 +16,7 @@ PLUGINS =
 [arm]
 PORT = 42466
 HOSTNAME = localhost
-DEFAULTSERVICES = resolver datastore transport core fs
+DEFAULTSERVICES = 
 
 [datastore]
 #DEBUG = YES
diff --git a/src/fs/test_fs_list_indexed_data.conf b/src/fs/test_fs_list_indexed_data.conf
index 6c3b024d3..9f717b2e0 100644
--- a/src/fs/test_fs_list_indexed_data.conf
+++ b/src/fs/test_fs_list_indexed_data.conf
@@ -16,7 +16,7 @@ PLUGINS =
 [arm]
 PORT = 42466
 HOSTNAME = localhost
-DEFAULTSERVICES = resolver datastore fs
+DEFAULTSERVICES =
 
 [datastore]
 #DEBUG = YES
diff --git a/src/fs/test_fs_namespace_data.conf b/src/fs/test_fs_namespace_data.conf
index 349a9218a..fd0b14261 100644
--- a/src/fs/test_fs_namespace_data.conf
+++ b/src/fs/test_fs_namespace_data.conf
@@ -16,7 +16,7 @@ PLUGINS =
 [arm]
 PORT = 42466
 HOSTNAME = localhost
-DEFAULTSERVICES = resolver datastore fs
+DEFAULTSERVICES = 
 
 [datastore]
 # DEBUG = YES
diff --git a/src/fs/test_fs_publish_data.conf b/src/fs/test_fs_publish_data.conf
index 5bca3aeae..d6952c4d4 100644
--- a/src/fs/test_fs_publish_data.conf
+++ b/src/fs/test_fs_publish_data.conf
@@ -16,7 +16,7 @@ PLUGINS =
 [arm]
 PORT = 42466
 HOSTNAME = localhost
-DEFAULTSERVICES = resolver datastore fs
+DEFAULTSERVICES = 
 
 [datastore]
 #DEBUG = YES
diff --git a/src/fs/test_fs_search_data.conf b/src/fs/test_fs_search_data.conf
index 654754ffe..d8b34d91d 100644
--- a/src/fs/test_fs_search_data.conf
+++ b/src/fs/test_fs_search_data.conf
@@ -16,7 +16,7 @@ PLUGINS =
 [arm]
 PORT = 42466
 HOSTNAME = localhost
-DEFAULTSERVICES = peerinfo resolver datastore fs
+DEFAULTSERVICES = 
 
 [datastore]
 # DEBUG = YES
diff --git a/src/fs/test_fs_unindex_data.conf b/src/fs/test_fs_unindex_data.conf
index a92ff5bb7..b54d16f85 100644
--- a/src/fs/test_fs_unindex_data.conf
+++ b/src/fs/test_fs_unindex_data.conf
@@ -16,7 +16,7 @@ PLUGINS =
 [arm]
 PORT = 42466
 HOSTNAME = localhost
-DEFAULTSERVICES = resolver datastore fs
+DEFAULTSERVICES = 
 
 [datastore]
 #DEBUG = YES
diff --git a/src/fs/test_gnunet_fs_idx_data.conf b/src/fs/test_gnunet_fs_idx_data.conf
index 2140e06b3..43fcfc963 100644
--- a/src/fs/test_gnunet_fs_idx_data.conf
+++ b/src/fs/test_gnunet_fs_idx_data.conf
@@ -16,7 +16,7 @@ PLUGINS =
 [arm]
 PORT = 46466
 HOSTNAME = localhost
-DEFAULTSERVICES = resolver datastore statistics fs
+DEFAULTSERVICES = 
 
 [datastore]
 # DEBUG = YES
diff --git a/src/fs/test_gnunet_fs_ns_data.conf b/src/fs/test_gnunet_fs_ns_data.conf
index 7eef81b65..e45cea44a 100644
--- a/src/fs/test_gnunet_fs_ns_data.conf
+++ b/src/fs/test_gnunet_fs_ns_data.conf
@@ -16,7 +16,7 @@ PLUGINS =
 [arm]
 PORT = 47466
 HOSTNAME = localhost
-DEFAULTSERVICES = resolver datastore statistics fs
+DEFAULTSERVICES = 
 
 [datastore]
 # DEBUG = YES
diff --git a/src/fs/test_gnunet_fs_psd_data.conf b/src/fs/test_gnunet_fs_psd_data.conf
index 52be58575..75a96a1ae 100644
--- a/src/fs/test_gnunet_fs_psd_data.conf
+++ b/src/fs/test_gnunet_fs_psd_data.conf
@@ -16,7 +16,7 @@ PLUGINS =
 [arm]
 PORT = 45466
 HOSTNAME = localhost
-DEFAULTSERVICES = resolver datastore statistics fs
+DEFAULTSERVICES = 
 
 [datastore]
 # DEBUG = YES
diff --git a/src/fs/test_gnunet_fs_rec_data.conf b/src/fs/test_gnunet_fs_rec_data.conf
index 7b758fc15..519ddb1d5 100644
--- a/src/fs/test_gnunet_fs_rec_data.conf
+++ b/src/fs/test_gnunet_fs_rec_data.conf
@@ -16,7 +16,7 @@ PLUGINS =
 [arm]
 PORT = 44466
 HOSTNAME = localhost
-DEFAULTSERVICES = resolver datastore statistics fs
+DEFAULTSERVICES = 
 
 [datastore]
 # DEBUG = YES
diff --git a/src/hostlist/test_learning_adv_peer.conf b/src/hostlist/test_learning_adv_peer.conf
index ec4f58165..badc63b0b 100644
--- a/src/hostlist/test_learning_adv_peer.conf
+++ b/src/hostlist/test_learning_adv_peer.conf
@@ -11,7 +11,7 @@ PLUGINS = tcp
 
 [arm]
 PORT = 22966
-DEFAULTSERVICES = resolver transport core statistics topology hostlist
+DEFAULTSERVICES = topology hostlist
 #GLOBAL_PREFIX = xterm -e gdb -x cmd --args
 DEBUG=YES
 
diff --git a/src/hostlist/test_learning_learn_peer.conf b/src/hostlist/test_learning_learn_peer.conf
index 382259df5..d3c1488fa 100644
--- a/src/hostlist/test_learning_learn_peer.conf
+++ b/src/hostlist/test_learning_learn_peer.conf
@@ -11,7 +11,7 @@ PLUGINS = tcp
 
 [arm]
 PORT = 12966
-DEFAULTSERVICES = resolver transport core statistics topology hostlist
+DEFAULTSERVICES = topology hostlist
 #GLOBAL_PREFIX = xterm -e gdb -x cmd --args 
 DEBUG=YES
 
diff --git a/src/hostlist/test_learning_learn_peer2.conf b/src/hostlist/test_learning_learn_peer2.conf
index 1b98e8dea..32e0dbecf 100644
--- a/src/hostlist/test_learning_learn_peer2.conf
+++ b/src/hostlist/test_learning_learn_peer2.conf
@@ -11,7 +11,7 @@ PLUGINS = tcp
 
 [arm]
 PORT = 32966
-DEFAULTSERVICES = resolver transport core statistics topology hostlist
+DEFAULTSERVICES = topology hostlist
 #GLOBAL_PREFIX = xterm -e gdb -x cmd --args 
 DEBUG=NO
 
diff --git a/src/migration/test_gnunet_daemon_migration_data.conf b/src/migration/test_gnunet_daemon_migration_data.conf
index d920e9e88..d92f9eabf 100644
--- a/src/migration/test_gnunet_daemon_migration_data.conf
+++ b/src/migration/test_gnunet_daemon_migration_data.conf
@@ -14,7 +14,7 @@ PLUGINS = tcp
 
 [arm]
 PORT = 2666
-DEFAULTSERVICES = peerinfo transport core topology
+DEFAULTSERVICES = topology
 
 [statistics]
 PORT = 2667
diff --git a/src/peerinfo-tool/test_gnunet_peerinfo_data.conf b/src/peerinfo-tool/test_gnunet_peerinfo_data.conf
index 5641d5baf..648a33bcb 100644
--- a/src/peerinfo-tool/test_gnunet_peerinfo_data.conf
+++ b/src/peerinfo-tool/test_gnunet_peerinfo_data.conf
@@ -8,7 +8,7 @@ PORT = 24354
 PORT = 24355
 
 [arm]
-DEFAULTSERVICES = resolver peerinfo
+DEFAULTSERVICES = 
 
 [testing]
 WEAKRANDOM = YES
@@ -18,4 +18,4 @@ plugins = tcp
 PORT = 24356
 
 [transport-tcp]
-PORT = 24357
\ No newline at end of file
+PORT = 24357
diff --git a/src/testing/test_testing_connect_peer1.conf b/src/testing/test_testing_connect_peer1.conf
index 221fe2f7a..fdb1ed319 100644
--- a/src/testing/test_testing_connect_peer1.conf
+++ b/src/testing/test_testing_connect_peer1.conf
@@ -16,7 +16,7 @@ PLUGINS = tcp
 [arm]
 PORT = 12566
 HOSTNAME = localhost
-DEFAULTSERVICES = peerinfo transport core
+DEFAULTSERVICES = 
 #DEBUG = YES
 
 [statistics]
diff --git a/src/testing/test_testing_connect_peer2.conf b/src/testing/test_testing_connect_peer2.conf
index d64db475a..63d755e37 100644
--- a/src/testing/test_testing_connect_peer2.conf
+++ b/src/testing/test_testing_connect_peer2.conf
@@ -15,7 +15,7 @@ PLUGINS = tcp
 
 [arm]
 PORT = 22566
-DEFAULTSERVICES = peerinfo transport core
+DEFAULTSERVICES = 
 HOSTNAME = localhost
 #DEBUG = YES
 
diff --git a/src/testing/test_testing_data.conf b/src/testing/test_testing_data.conf
index 8af5d1a14..fbaf65945 100644
--- a/src/testing/test_testing_data.conf
+++ b/src/testing/test_testing_data.conf
@@ -13,7 +13,7 @@ PLUGINS = tcp
 
 [arm]
 PORT = 2566
-DEFAULTSERVICES = peerinfo transport core
+DEFAULTSERVICES = 
 
 [statistics]
 PORT = 2567
diff --git a/src/testing/test_testing_data_remote.conf b/src/testing/test_testing_data_remote.conf
index 26de59a85..69d8bb1be 100644
--- a/src/testing/test_testing_data_remote.conf
+++ b/src/testing/test_testing_data_remote.conf
@@ -1,4 +1,4 @@
-[PATHS]
+PATHS]
 SERVICEHOME = /tmp/test-gnunet-testing/
 DEFAULTCONFIG = test_testing_data.conf
 
@@ -13,7 +13,7 @@ PLUGINS = tcp
 
 [arm]
 PORT = 2566
-DEFAULTSERVICES = peerinfo transport core
+DEFAULTSERVICES = 
 
 [statistics]
 PORT = 2567
diff --git a/src/testing/test_testing_data_topology_2d_torus.conf b/src/testing/test_testing_data_topology_2d_torus.conf
index 8e8642bb5..820ce8ad5 100644
--- a/src/testing/test_testing_data_topology_2d_torus.conf
+++ b/src/testing/test_testing_data_topology_2d_torus.conf
@@ -14,7 +14,7 @@ PLUGINS = tcp
 
 [arm]
 PORT = 2566
-DEFAULTSERVICES = peerinfo transport core
+DEFAULTSERVICES = 
 
 [statistics]
 PORT = 2567
diff --git a/src/testing/test_testing_data_topology_blacklist.conf b/src/testing/test_testing_data_topology_blacklist.conf
index 07efe2bbc..b4bfe801d 100644
--- a/src/testing/test_testing_data_topology_blacklist.conf
+++ b/src/testing/test_testing_data_topology_blacklist.conf
@@ -16,7 +16,7 @@ BLACKLIST_FILE = $SERVICEHOME/blacklist
 
 [arm]
 PORT = 2566
-DEFAULTSERVICES = peerinfo transport core
+DEFAULTSERVICES = 
 
 [statistics]
 PORT = 2567
diff --git a/src/testing/test_testing_data_topology_clique.conf b/src/testing/test_testing_data_topology_clique.conf
index 183de29eb..6c0ee9320 100644
--- a/src/testing/test_testing_data_topology_clique.conf
+++ b/src/testing/test_testing_data_topology_clique.conf
@@ -15,7 +15,7 @@ PLUGINS = tcp
 
 [arm]
 PORT = 2566
-DEFAULTSERVICES = peerinfo transport core
+DEFAULTSERVICES = 
 
 [statistics]
 PORT = 2567
diff --git a/src/testing/test_testing_data_topology_clique_minimum.conf b/src/testing/test_testing_data_topology_clique_minimum.conf
index 41bc1122d..699d66abc 100644
--- a/src/testing/test_testing_data_topology_clique_minimum.conf
+++ b/src/testing/test_testing_data_topology_clique_minimum.conf
@@ -15,7 +15,7 @@ PLUGINS = tcp
 
 [arm]
 PORT = 2566
-DEFAULTSERVICES = peerinfo transport core
+DEFAULTSERVICES = 
 
 [statistics]
 PORT = 2567
diff --git a/src/testing/test_testing_data_topology_clique_random.conf b/src/testing/test_testing_data_topology_clique_random.conf
index 7def209ea..6bf33d12c 100644
--- a/src/testing/test_testing_data_topology_clique_random.conf
+++ b/src/testing/test_testing_data_topology_clique_random.conf
@@ -15,7 +15,7 @@ PLUGINS = tcp
 
 [arm]
 PORT = 2566
-DEFAULTSERVICES = peerinfo transport core
+DEFAULTSERVICES = 
 
 [statistics]
 PORT = 2567
diff --git a/src/testing/test_testing_data_topology_erdos_renyi.conf b/src/testing/test_testing_data_topology_erdos_renyi.conf
index a505c4df5..b5a716b48 100644
--- a/src/testing/test_testing_data_topology_erdos_renyi.conf
+++ b/src/testing/test_testing_data_topology_erdos_renyi.conf
@@ -14,7 +14,7 @@ PLUGINS = tcp
 
 [arm]
 PORT = 2566
-DEFAULTSERVICES = peerinfo transport core
+DEFAULTSERVICES = 
 
 [statistics]
 PORT = 2567
diff --git a/src/testing/test_testing_data_topology_internat.conf b/src/testing/test_testing_data_topology_internat.conf
index 89c0cdf06..8dc768cd4 100644
--- a/src/testing/test_testing_data_topology_internat.conf
+++ b/src/testing/test_testing_data_topology_internat.conf
@@ -14,7 +14,7 @@ PLUGINS = tcp
 
 [arm]
 PORT = 2566
-DEFAULTSERVICES = peerinfo transport core
+DEFAULTSERVICES = 
 
 [statistics]
 PORT = 2567
diff --git a/src/testing/test_testing_data_topology_ring.conf b/src/testing/test_testing_data_topology_ring.conf
index 480eb6392..d5672cc2a 100644
--- a/src/testing/test_testing_data_topology_ring.conf
+++ b/src/testing/test_testing_data_topology_ring.conf
@@ -14,7 +14,7 @@ PLUGINS = tcp
 
 [arm]
 PORT = 2566
-DEFAULTSERVICES = peerinfo transport core
+DEFAULTSERVICES = 
 
 [statistics]
 PORT = 2567
diff --git a/src/testing/test_testing_data_topology_small_world_ring.conf b/src/testing/test_testing_data_topology_small_world_ring.conf
index 3883f1bee..062601eee 100644
--- a/src/testing/test_testing_data_topology_small_world_ring.conf
+++ b/src/testing/test_testing_data_topology_small_world_ring.conf
@@ -14,7 +14,7 @@ PLUGINS = tcp
 
 [arm]
 PORT = 2566
-DEFAULTSERVICES = peerinfo transport core
+DEFAULTSERVICES = 
 
 [statistics]
 PORT = 2567
diff --git a/src/testing/test_testing_data_topology_small_world_torus.conf b/src/testing/test_testing_data_topology_small_world_torus.conf
index 0da71f89f..bb3c8ca22 100644
--- a/src/testing/test_testing_data_topology_small_world_torus.conf
+++ b/src/testing/test_testing_data_topology_small_world_torus.conf
@@ -14,7 +14,7 @@ PLUGINS = tcp
 
 [arm]
 PORT = 2566
-DEFAULTSERVICES = peerinfo transport core
+DEFAULTSERVICES = 
 
 [statistics]
 PORT = 2567
diff --git a/src/topology/test_gnunet_daemon_topology_data.conf b/src/topology/test_gnunet_daemon_topology_data.conf
index d920e9e88..d92f9eabf 100644
--- a/src/topology/test_gnunet_daemon_topology_data.conf
+++ b/src/topology/test_gnunet_daemon_topology_data.conf
@@ -14,7 +14,7 @@ PLUGINS = tcp
 
 [arm]
 PORT = 2666
-DEFAULTSERVICES = peerinfo transport core topology
+DEFAULTSERVICES = topology
 
 [statistics]
 PORT = 2667