Merge branch 'master' of ssh://git.gnunet.org/gnunet

36 files changed, 556 insertions, 435 deletions

diff --git a/data/hellos/EFBZMC2ME19SE00QCSF6X4405EQ2NPBG2XKRA1FEM6S3WRQ6N4H0 b/data/hellos/EFBZMC2ME19SE00QCSF6X4405EQ2NPBG2XKRA1FEM6S3WRQ6N4H0
index d0c2e320b..78a0d9721 100644
--- a/data/hellos/EFBZMC2ME19SE00QCSF6X4405EQ2NPBG2XKRA1FEM6S3WRQ6N4H0
+++ b/data/hellos/EFBZMC2ME19SE00QCSF6X4405EQ2NPBG2XKRA1FEM6S3WRQ6N4H0
diff --git a/meson.build b/meson.build
index ba9e4b3c9..39ac14eb8 100644
--- a/meson.build
+++ b/meson.build
@@ -420,6 +420,7 @@ pkg = import('pkgconfig')
 subdir('src')
 subdir('doc')
 subdir('contrib')
+subdir('data')
 
 meson.add_dist_script('meson-dist-script')
 
diff --git a/src/plugin/namestore/Makefile.am b/src/plugin/namestore/Makefile.am
index 03b743d7a..3db174225 100644
--- a/src/plugin/namestore/Makefile.am
+++ b/src/plugin/namestore/Makefile.am
@@ -19,62 +19,7 @@ if USE_COVERAGE
 endif
 
 
-if HAVE_SQLITE
-SQLITE_PLUGIN = libgnunet_plugin_namestore_sqlite.la
-SQLITE_TESTS = test_plugin_namestore_sqlite \
- test_namestore_api_store_sqlite \
- test_namestore_api_store_update_sqlite \
- test_namestore_api_zone_iteration_sqlite \
- test_namestore_api_remove_sqlite \
- test_namestore_api_lookup_nick_sqlite \
- test_namestore_api_monitoring_sqlite \
- test_namestore_api_remove_not_existing_record_sqlite \
- test_namestore_api_zone_iteration_nick_sqlite \
- test_namestore_api_zone_iteration_specific_zone_sqlite \
- test_namestore_api_zone_iteration_stop_sqlite \
- test_namestore_api_monitoring_existing_sqlite \
- test_namestore_api_zone_to_name_sqlite \
- perf_namestore_api_zone_iteration_sqlite \
- perf_namestore_api_import_sqlite \
- perf_namestore_api_import_postgres \
- test_namestore_api_tx_rollback_sqlite
-endif
-
-
-if HAVE_POSTGRESQL
-POSTGRES_PLUGIN = libgnunet_plugin_namestore_postgres.la
-POSTGRES_TESTS = test_plugin_namestore_postgres \
- test_namestore_api_store_postgres \
- test_namestore_api_store_update_postgres \
- test_namestore_api_remove_postgres \
- test_namestore_api_zone_iteration_postgres \
- test_namestore_api_lookup_nick_postgres \
- test_namestore_api_monitoring_postgres \
- test_namestore_api_remove_not_existing_record_postgres \
- test_namestore_api_zone_iteration_nick_postgres \
- test_namestore_api_zone_iteration_specific_zone_postgres \
- test_namestore_api_zone_iteration_stop_postgres \
- test_namestore_api_monitoring_existing_postgres \
- test_namestore_api_zone_to_name_postgres \
- perf_namestore_api_zone_iteration_postgres \
- test_namestore_api_tx_rollback_postgres
-if HAVE_EXPERIMENTAL
-POSTGRES_TESTS += test_namestore_api_edit_records_postgres
-endif
-endif
-
-if HAVE_SQLITE
-check_PROGRAMS = \
- $(SQLITE_TESTS) \
- $(POSTGRES_TESTS)
-endif
 
-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) \
-  $(check_SCRIPTS)
-endif
 
 plugin_LTLIBRARIES = \
   $(SQLITE_PLUGIN) \
@@ -101,311 +46,34 @@ libgnunet_plugin_namestore_postgres_la_LIBADD = \
 libgnunet_plugin_namestore_postgres_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS) $(POSTGRESQL_LDFLAGS)
 
-test_namestore_api_store_sqlite_SOURCES = \
- test_namestore_api_store.c
-test_namestore_api_store_sqlite_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_store_postgres_SOURCES = \
- test_namestore_api_store.c
-test_namestore_api_store_postgres_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_store_update_sqlite_SOURCES = \
- test_namestore_api_store_update.c
-test_namestore_api_store_update_sqlite_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_store_update_postgres_SOURCES = \
- test_namestore_api_store_update.c
-test_namestore_api_store_update_postgres_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_lookup_nick_sqlite_SOURCES = \
- test_namestore_api_lookup_nick.c
-test_namestore_api_lookup_nick_sqlite_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_lookup_nick_postgres_SOURCES = \
- test_namestore_api_lookup_nick.c
-test_namestore_api_lookup_nick_postgres_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_remove_sqlite_SOURCES = \
- test_namestore_api_remove.c
-test_namestore_api_remove_sqlite_LDADD = \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_remove_postgres_SOURCES = \
- test_namestore_api_remove.c
-test_namestore_api_remove_postgres_LDADD = \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_remove_not_existing_record_sqlite_SOURCES = \
- test_namestore_api_remove_not_existing_record.c
-test_namestore_api_remove_not_existing_record_sqlite_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_remove_not_existing_record_postgres_SOURCES = \
- test_namestore_api_remove_not_existing_record.c
-test_namestore_api_remove_not_existing_record_postgres_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_zone_to_name_sqlite_SOURCES = \
- test_namestore_api_zone_to_name.c
-test_namestore_api_zone_to_name_sqlite_LDADD = \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_zone_to_name_postgres_SOURCES = \
- test_namestore_api_zone_to_name.c
-test_namestore_api_zone_to_name_postgres_LDADD = \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_monitoring_sqlite_SOURCES = \
- test_namestore_api_monitoring.c
-test_namestore_api_monitoring_sqlite_LDADD = \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_namestore_api_monitoring_postgres_SOURCES = \
- test_namestore_api_monitoring.c
-test_namestore_api_monitoring_postgres_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_namestore_api_monitoring_existing_sqlite_SOURCES = \
- test_namestore_api_monitoring_existing.c
-test_namestore_api_monitoring_existing_sqlite_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_namestore_api_monitoring_existing_postgres_SOURCES = \
- test_namestore_api_monitoring_existing.c
-test_namestore_api_monitoring_existing_postgres_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_namestore_api_tx_rollback_sqlite_SOURCES = \
- test_namestore_api_tx_rollback.c
-test_namestore_api_tx_rollback_sqlite_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-test_namestore_api_tx_rollback_postgres_SOURCES = \
- test_namestore_api_tx_rollback.c
-test_namestore_api_tx_rollback_postgres_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
-
-if HAVE_EXPERIMENTAL
-test_namestore_api_edit_records_postgres_SOURCES = \
- test_namestore_api_edit_records.c
-test_namestore_api_edit_records_postgres_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la
+if HAVE_SQLITE
+SQLITE_PLUGIN = libgnunet_plugin_namestore_sqlite.la
+SQLITE_TESTS = test_plugin_namestore_sqlite
 endif
 
-test_namestore_api_zone_iteration_sqlite_SOURCES = \
- test_namestore_api_zone_iteration.c
-test_namestore_api_zone_iteration_sqlite_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_zone_iteration_postgres_SOURCES = \
- test_namestore_api_zone_iteration.c
-test_namestore_api_zone_iteration_postgres_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-perf_namestore_api_zone_iteration_postgres_SOURCES = \
- perf_namestore_api_zone_iteration.c
-perf_namestore_api_zone_iteration_postgres_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-perf_namestore_api_import_sqlite_SOURCES = \
- perf_namestore_api_import.c
-perf_namestore_api_import_sqlite_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-perf_namestore_api_import_postgres_SOURCES = \
- perf_namestore_api_import.c
-perf_namestore_api_import_postgres_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
 
-perf_namestore_api_zone_iteration_sqlite_SOURCES = \
- perf_namestore_api_zone_iteration.c
-perf_namestore_api_zone_iteration_sqlite_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_zone_iteration_nick_sqlite_SOURCES = \
- test_namestore_api_zone_iteration_nick.c
-test_namestore_api_zone_iteration_nick_sqlite_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_zone_iteration_nick_postgres_SOURCES = \
- test_namestore_api_zone_iteration_nick.c
-test_namestore_api_zone_iteration_nick_postgres_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_zone_iteration_specific_zone_sqlite_SOURCES = \
- test_namestore_api_zone_iteration_specific_zone.c
-test_namestore_api_zone_iteration_specific_zone_sqlite_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_zone_iteration_specific_zone_postgres_SOURCES = \
- test_namestore_api_zone_iteration_specific_zone.c
-test_namestore_api_zone_iteration_specific_zone_postgres_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_zone_iteration_stop_sqlite_SOURCES = \
- test_namestore_api_zone_iteration_stop.c
-test_namestore_api_zone_iteration_stop_sqlite_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
-
-test_namestore_api_zone_iteration_stop_postgres_SOURCES = \
- test_namestore_api_zone_iteration_stop.c
-test_namestore_api_zone_iteration_stop_postgres_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
-  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+if HAVE_POSTGRESQL
+POSTGRES_PLUGIN = libgnunet_plugin_namestore_postgres.la
+POSTGRES_TESTS = test_plugin_namestore_postgres
+endif
+if HAVE_SQLITE
+check_PROGRAMS = \
+ $(SQLITE_TESTS) \
+ $(POSTGRES_TESTS)
+endif
 
 test_plugin_namestore_sqlite_SOURCES = \
  test_plugin_namestore.c
 test_plugin_namestore_sqlite_LDADD = \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 test_plugin_namestore_postgres_SOURCES = \
   test_plugin_namestore.c
 test_plugin_namestore_postgres_LDADD = \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/service/testing/libgnunettesting.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la
 
 EXTRA_DIST = \
-  test_common.c \
-  test_namestore_api.conf \
-  test_namestore_api_postgres.conf \
-  test_namestore_api_sqlite.conf \
-  perf_namestore_api_postgres.conf \
-  perf_namestore_api_sqlite.conf \
   test_plugin_namestore_sqlite.conf \
   test_plugin_namestore_postgres.conf \
-  $(sql_DATA)
+        $(sql_DATA)
+
diff --git a/src/plugin/namestore/meson.build b/src/plugin/namestore/meson.build
index d51b4b730..4a077915d 100644
--- a/src/plugin/namestore/meson.build
+++ b/src/plugin/namestore/meson.build
@@ -10,6 +10,10 @@ shared_module('gnunet_plugin_namestore_sqlite',
         install: true,
         install_dir: get_option('libdir')/'gnunet')
 
+configure_file(copy: true,
+               input: 'test_plugin_namestore_sqlite.conf',
+               output: 'test_plugin_namestore_sqlite.conf')
+
 if pq_dep.found()
   shared_module('gnunet_plugin_namestore_postgres',
           ['plugin_namestore_postgres.c'],
@@ -20,5 +24,28 @@ if pq_dep.found()
           include_directories: [incdir, configuration_inc],
           install: true,
           install_dir: get_option('libdir')/'gnunet')
+configure_file(copy: true,
+               input: 'test_plugin_namestore_postgres.conf',
+               output: 'test_plugin_namestore_postgres.conf')
+
+  testpluginnamestore_pq = executable ('test_plugin_namestore_postgres',
+              ['test_plugin_namestore.c'],
+              dependencies: [
+                libgnunetutil_dep
+              ],
+              include_directories: [incdir, configuration_inc],
+              install: false)
+  test('test_plugin_namestore_postgres', testpluginnamestore_pq, workdir: meson.current_build_dir(),
+     suite: 'namestore')
 endif
 
+testpluginnamestore_sq = executable ('test_plugin_namestore_sqlite',
+            ['test_plugin_namestore.c'],
+            dependencies: [
+              libgnunetutil_dep
+            ],
+            include_directories: [incdir, configuration_inc],
+            install: false)
+test('test_plugin_namestore_sqlite', testpluginnamestore_sq, workdir: meson.current_build_dir(),
+   suite: 'namestore')
+
diff --git a/src/plugin/namestore/test_plugin_namestore.c b/src/plugin/namestore/test_plugin_namestore.c
index 388b23f57..d90651255 100644
--- a/src/plugin/namestore/test_plugin_namestore.c
+++ b/src/plugin/namestore/test_plugin_namestore.c
@@ -25,7 +25,6 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_namestore_plugin.h"
-#include "gnunet_testing_lib.h"
 
 #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
 
@@ -36,7 +35,7 @@ static int ok;
  */
 static const char *plugin_name;
 
-
+#ifndef DARWIN // #5582
 /**
  * Function called when the service shuts down.  Unloads our namestore
  * plugin.
@@ -52,7 +51,7 @@ unload_plugin (struct GNUNET_NAMESTORE_PluginFunctions *api)
   GNUNET_break (NULL == GNUNET_PLUGIN_unload (libname, api));
   GNUNET_free (libname);
 }
-
+#endif
 
 /**
  * Load the namestore plugin.
diff --git a/src/service/arm/gnunet-service-arm.c b/src/service/arm/gnunet-service-arm.c
index da94efdd8..5ecb1e80b 100644
--- a/src/service/arm/gnunet-service-arm.c
+++ b/src/service/arm/gnunet-service-arm.c
@@ -1120,7 +1120,7 @@ create_listen_socket (struct sockaddr *sa,
     GNUNET_free (sa);
     return;
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               _ ("ARM now monitors connections to service `%s' at `%s'\n"),
               sl->name,
               GNUNET_a2s (sa, addr_len));
diff --git a/src/service/dht/gnunet-service-dht.c b/src/service/dht/gnunet-service-dht.c
index c3ce2f284..0689af9aa 100644
--- a/src/service/dht/gnunet-service-dht.c
+++ b/src/service/dht/gnunet-service-dht.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  * @author Nathan Evans
  */
+#include "gnunet_common.h"
 #include "platform.h"
 #include "gnunet_block_lib.h"
 #include "gnunet_util_lib.h"
@@ -264,10 +265,21 @@ u_address_add (void *cls,
 {
   struct GDS_Underlay *u = cls;
   struct MyAddress *a;
+  enum GNUNET_GenericReturnValue add_success;
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Underlay adds address %s for this peer\n",
               address);
+  if (GNUNET_OK != (add_success = GNUNET_HELLO_builder_add_address (
+                      GDS_my_hello,
+                      address)))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Adding address `%s' from underlay %s\n",
+                address,
+                GNUNET_NO == add_success ? "not done" : "failed");
+    return;
+  }
   a = GNUNET_new (struct MyAddress);
   a->source = source;
   a->url = GNUNET_strdup (address);
@@ -276,8 +288,7 @@ u_address_add (void *cls,
                                a_tail,
                                a);
   *ctx = a;
-  GNUNET_HELLO_builder_add_address (GDS_my_hello,
-                                    address);
+
   if (NULL != hello_task)
     GNUNET_SCHEDULER_cancel (hello_task);
   hello_task = GNUNET_SCHEDULER_add_now (&broadcast_hello,
diff --git a/src/service/namestore/Makefile.am b/src/service/namestore/Makefile.am
index 7f49e680f..d8f6a5318 100644
--- a/src/service/namestore/Makefile.am
+++ b/src/service/namestore/Makefile.am
@@ -61,3 +61,350 @@ gnunet_service_namestore_LDADD = \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   libgnunetnamestore.la \
   $(GN_LIBINTL)
+
+if HAVE_SQLITE
+SQLITE_TESTS = \
+ test_namestore_api_store_sqlite \
+ test_namestore_api_store_update_sqlite \
+ test_namestore_api_zone_iteration_sqlite \
+ test_namestore_api_remove_sqlite \
+ test_namestore_api_lookup_nick_sqlite \
+ test_namestore_api_monitoring_sqlite \
+ test_namestore_api_remove_not_existing_record_sqlite \
+ test_namestore_api_zone_iteration_nick_sqlite \
+ test_namestore_api_zone_iteration_specific_zone_sqlite \
+ test_namestore_api_zone_iteration_stop_sqlite \
+ test_namestore_api_monitoring_existing_sqlite \
+ test_namestore_api_zone_to_name_sqlite \
+ perf_namestore_api_zone_iteration_sqlite \
+ perf_namestore_api_import_sqlite \
+ perf_namestore_api_import_postgres \
+ test_namestore_api_tx_rollback_sqlite
+endif
+
+
+if HAVE_POSTGRESQL
+POSTGRES_TESTS = \
+ test_namestore_api_store_postgres \
+ test_namestore_api_store_update_postgres \
+ test_namestore_api_remove_postgres \
+ test_namestore_api_zone_iteration_postgres \
+ test_namestore_api_lookup_nick_postgres \
+ test_namestore_api_monitoring_postgres \
+ test_namestore_api_remove_not_existing_record_postgres \
+ test_namestore_api_zone_iteration_nick_postgres \
+ test_namestore_api_zone_iteration_specific_zone_postgres \
+ test_namestore_api_zone_iteration_stop_postgres \
+ test_namestore_api_monitoring_existing_postgres \
+ test_namestore_api_zone_to_name_postgres \
+ perf_namestore_api_zone_iteration_postgres \
+ test_namestore_api_tx_rollback_postgres
+if HAVE_EXPERIMENTAL
+POSTGRES_TESTS += test_namestore_api_edit_records_postgres
+endif
+endif
+
+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;
+TESTS = \
+  $(check_PROGRAMS) \
+  $(check_SCRIPTS)
+endif
+
+test_namestore_api_store_sqlite_SOURCES = \
+ test_namestore_api_store.c
+test_namestore_api_store_sqlite_LDADD = \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_store_postgres_SOURCES = \
+ test_namestore_api_store.c
+test_namestore_api_store_postgres_LDADD = \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_store_update_sqlite_SOURCES = \
+ test_namestore_api_store_update.c
+test_namestore_api_store_update_sqlite_LDADD = \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_store_update_postgres_SOURCES = \
+ test_namestore_api_store_update.c
+test_namestore_api_store_update_postgres_LDADD = \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_lookup_nick_sqlite_SOURCES = \
+ test_namestore_api_lookup_nick.c
+test_namestore_api_lookup_nick_sqlite_LDADD = \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_lookup_nick_postgres_SOURCES = \
+ test_namestore_api_lookup_nick.c
+test_namestore_api_lookup_nick_postgres_LDADD = \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/namecache/libgnunetnamecache.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_remove_sqlite_SOURCES = \
+ test_namestore_api_remove.c
+test_namestore_api_remove_sqlite_LDADD = \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_remove_postgres_SOURCES = \
+ test_namestore_api_remove.c
+test_namestore_api_remove_postgres_LDADD = \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_remove_not_existing_record_sqlite_SOURCES = \
+ test_namestore_api_remove_not_existing_record.c
+test_namestore_api_remove_not_existing_record_sqlite_LDADD = \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_remove_not_existing_record_postgres_SOURCES = \
+ test_namestore_api_remove_not_existing_record.c
+test_namestore_api_remove_not_existing_record_postgres_LDADD = \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_zone_to_name_sqlite_SOURCES = \
+ test_namestore_api_zone_to_name.c
+test_namestore_api_zone_to_name_sqlite_LDADD = \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_zone_to_name_postgres_SOURCES = \
+ test_namestore_api_zone_to_name.c
+test_namestore_api_zone_to_name_postgres_LDADD = \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_monitoring_sqlite_SOURCES = \
+ test_namestore_api_monitoring.c
+test_namestore_api_monitoring_sqlite_LDADD = \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la
+
+test_namestore_api_monitoring_postgres_SOURCES = \
+ test_namestore_api_monitoring.c
+test_namestore_api_monitoring_postgres_LDADD = \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la
+
+test_namestore_api_monitoring_existing_sqlite_SOURCES = \
+ test_namestore_api_monitoring_existing.c
+test_namestore_api_monitoring_existing_sqlite_LDADD = \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la
+
+test_namestore_api_monitoring_existing_postgres_SOURCES = \
+ test_namestore_api_monitoring_existing.c
+test_namestore_api_monitoring_existing_postgres_LDADD = \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la
+
+test_namestore_api_tx_rollback_sqlite_SOURCES = \
+ test_namestore_api_tx_rollback.c
+test_namestore_api_tx_rollback_sqlite_LDADD = \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la
+
+test_namestore_api_tx_rollback_postgres_SOURCES = \
+ test_namestore_api_tx_rollback.c
+test_namestore_api_tx_rollback_postgres_LDADD = \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la
+
+if HAVE_EXPERIMENTAL
+test_namestore_api_edit_records_postgres_SOURCES = \
+ test_namestore_api_edit_records.c
+test_namestore_api_edit_records_postgres_LDADD = \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la
+endif
+
+test_namestore_api_zone_iteration_sqlite_SOURCES = \
+ test_namestore_api_zone_iteration.c
+test_namestore_api_zone_iteration_sqlite_LDADD = \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_zone_iteration_postgres_SOURCES = \
+ test_namestore_api_zone_iteration.c
+test_namestore_api_zone_iteration_postgres_LDADD = \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+perf_namestore_api_zone_iteration_postgres_SOURCES = \
+ perf_namestore_api_zone_iteration.c
+perf_namestore_api_zone_iteration_postgres_LDADD = \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+perf_namestore_api_import_sqlite_SOURCES = \
+ perf_namestore_api_import.c
+perf_namestore_api_import_sqlite_LDADD = \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+perf_namestore_api_import_postgres_SOURCES = \
+ perf_namestore_api_import.c
+perf_namestore_api_import_postgres_LDADD = \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+
+perf_namestore_api_zone_iteration_sqlite_SOURCES = \
+ perf_namestore_api_zone_iteration.c
+perf_namestore_api_zone_iteration_sqlite_LDADD = \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_zone_iteration_nick_sqlite_SOURCES = \
+ test_namestore_api_zone_iteration_nick.c
+test_namestore_api_zone_iteration_nick_sqlite_LDADD = \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_zone_iteration_nick_postgres_SOURCES = \
+ test_namestore_api_zone_iteration_nick.c
+test_namestore_api_zone_iteration_nick_postgres_LDADD = \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_zone_iteration_specific_zone_sqlite_SOURCES = \
+ test_namestore_api_zone_iteration_specific_zone.c
+test_namestore_api_zone_iteration_specific_zone_sqlite_LDADD = \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_zone_iteration_specific_zone_postgres_SOURCES = \
+ test_namestore_api_zone_iteration_specific_zone.c
+test_namestore_api_zone_iteration_specific_zone_postgres_LDADD = \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_zone_iteration_stop_sqlite_SOURCES = \
+ test_namestore_api_zone_iteration_stop.c
+test_namestore_api_zone_iteration_stop_sqlite_LDADD = \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+test_namestore_api_zone_iteration_stop_postgres_SOURCES = \
+ test_namestore_api_zone_iteration_stop.c
+test_namestore_api_zone_iteration_stop_postgres_LDADD = \
+  $(top_builddir)/src/service/testing/libgnunettesting.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/service/namestore/libgnunetnamestore.la
+
+
+EXTRA_DIST = \
+  test_common.c \
+  test_namestore_api.conf \
+  test_namestore_api_postgres.conf \
+  test_namestore_api_sqlite.conf \
+  perf_namestore_api_postgres.conf \
+  perf_namestore_api_sqlite.conf
+
diff --git a/src/service/namestore/meson.build b/src/service/namestore/meson.build
index 912b312fa..4169e7fde 100644
--- a/src/service/namestore/meson.build
+++ b/src/service/namestore/meson.build
@@ -55,3 +55,62 @@ executable ('gnunet-namestore-fcfsd',
             install: true,
             install_dir: get_option('libdir')/'gnunet'/'libexec')
 
+
+configure_file(copy: true,
+               input: 'test_namestore_api.conf',
+               output: 'test_namestore_api.conf')
+
+configure_file(copy: true,
+               input: 'test_namestore_api_sqlite.conf',
+               output: 'test_namestore_api_sqlite.conf')
+
+namestoreapitestnames = [
+  'test_namestore_api_lookup_nick',
+  'test_namestore_api_monitoring',
+  'test_namestore_api_monitoring_existing',
+  'test_namestore_api_remove',
+  'test_namestore_api_remove_not_existing_record',
+  'test_namestore_api_store',
+  'test_namestore_api_store_update',
+  'test_namestore_api_tx_rollback',
+  'test_namestore_api_zone_iteration',
+  'test_namestore_api_zone_iteration_nick',
+  'test_namestore_api_zone_iteration_specific_zone',
+  'test_namestore_api_zone_iteration_stop',
+  'test_namestore_api_zone_to_name'
+  ]
+
+if get_option('experimental')
+  namestoreapitestnames +='test_namestore_api_edit_records'
+endif
+
+foreach tn : namestoreapitestnames
+  t = executable (tn + '_sqlite',
+            [tn + '.c'],
+            dependencies: [
+              libgnunettesting_dep,
+              libgnunetutil_dep,
+              libgnunetgnsrecord_dep,
+              libgnunetidentity_dep,
+              libgnunetnamestore_dep],
+            include_directories: [incdir, configuration_inc],
+            install: false)
+  test(tn + '_sqlite', t, workdir: meson.current_build_dir(),
+     suite: 'namestore')
+  if pq_dep.found()
+    t_pq = executable (tn + '_postgres',
+              [tn + '.c'],
+              dependencies: [
+                libgnunettesting_dep,
+                libgnunetutil_dep,
+                libgnunetgnsrecord_dep,
+                libgnunetidentity_dep,
+                libgnunetnamestore_dep],
+              include_directories: [incdir, configuration_inc],
+              install: false)
+    test(tn + '_postgres', t, workdir: meson.current_build_dir(),
+       suite: 'namestore')
+  endif
+endforeach
+
+# FIXME perf tests missing
diff --git a/src/plugin/namestore/perf_namestore_api_import.c b/src/service/namestore/perf_namestore_api_import.c
index e56fb961c..bf8093f43 100644
--- a/src/plugin/namestore/perf_namestore_api_import.c
+++ b/src/service/namestore/perf_namestore_api_import.c
@@ -25,7 +25,7 @@
 #include "platform.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
-#include "namestore.h"
+#include "../service/namestore/namestore.h"
 
 #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
 
@@ -382,7 +382,7 @@ int
 main (int argc,
       char *argv[])
 {
-  const char *plugin_name;
+  char *plugin_name;
   char *cfg_name;
 
   SETUP_CFG2 ("perf_namestore_api_%s.conf", plugin_name, cfg_name);
diff --git a/src/plugin/namestore/perf_namestore_api_postgres.conf b/src/service/namestore/perf_namestore_api_postgres.conf
index 5e02c2df3..5e02c2df3 100644
--- a/src/plugin/namestore/perf_namestore_api_postgres.conf
+++ b/src/service/namestore/perf_namestore_api_postgres.conf
diff --git a/src/plugin/namestore/perf_namestore_api_sqlite.conf b/src/service/namestore/perf_namestore_api_sqlite.conf
index 55c3dc812..55c3dc812 100644
--- a/src/plugin/namestore/perf_namestore_api_sqlite.conf
+++ b/src/service/namestore/perf_namestore_api_sqlite.conf
diff --git a/src/plugin/namestore/perf_namestore_api_zone_iteration.c b/src/service/namestore/perf_namestore_api_zone_iteration.c
index e16748f5b..1b669fdac 100644
--- a/src/plugin/namestore/perf_namestore_api_zone_iteration.c
+++ b/src/service/namestore/perf_namestore_api_zone_iteration.c
@@ -25,7 +25,7 @@
 #include "platform.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
-#include "namestore.h"
+#include "../service/namestore/namestore.h"
 
 #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
 
@@ -354,7 +354,7 @@ int
 main (int argc,
       char *argv[])
 {
-  const char *plugin_name;
+  char *plugin_name;
   char *cfg_name;
 
   SETUP_CFG (plugin_name, cfg_name);
diff --git a/src/plugin/namestore/test_common.c b/src/service/namestore/test_common.c
index 4df24a7f7..4df24a7f7 100644
--- a/src/plugin/namestore/test_common.c
+++ b/src/service/namestore/test_common.c
diff --git a/src/plugin/namestore/test_namestore_api.conf b/src/service/namestore/test_namestore_api.conf
index 1648c7cae..647cd8e20 100644
--- a/src/plugin/namestore/test_namestore_api.conf
+++ b/src/service/namestore/test_namestore_api.conf
@@ -1,5 +1,5 @@
-@INLINE@ ../../contrib/conf/gnunet/no_forcestart.conf
-@INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf
+@INLINE@ ../../../contrib/conf/gnunet/no_forcestart.conf
+@INLINE@ ../../../contrib/conf/gnunet/no_autostart_above_core.conf
 
 [PATHS]
 GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-namestore/
diff --git a/src/plugin/namestore/test_namestore_api_edit_records.c b/src/service/namestore/test_namestore_api_edit_records.c
index a6bce7c17..94b4f4fc1 100644
--- a/src/plugin/namestore/test_namestore_api_edit_records.c
+++ b/src/service/namestore/test_namestore_api_edit_records.c
@@ -375,7 +375,7 @@ run (void *cls,
 int
 main (int argc, char *argv[])
 {
-  const char *plugin_name;
+  char *plugin_name;
   char *cfg_name;
 
   SETUP_CFG (plugin_name, cfg_name);
diff --git a/src/plugin/namestore/test_namestore_api_lookup_nick.c b/src/service/namestore/test_namestore_api_lookup_nick.c
index 21fc1ef79..22734baab 100644
--- a/src/plugin/namestore/test_namestore_api_lookup_nick.c
+++ b/src/service/namestore/test_namestore_api_lookup_nick.c
@@ -323,7 +323,7 @@ run (void *cls,
 int
 main (int argc, char *argv[])
 {
-  const char *plugin_name;
+  char *plugin_name;
   char *cfg_name;
 
   SETUP_CFG (plugin_name, cfg_name);
diff --git a/src/plugin/namestore/test_namestore_api_monitoring.c b/src/service/namestore/test_namestore_api_monitoring.c
index 74dad3749..0b879786c 100644
--- a/src/plugin/namestore/test_namestore_api_monitoring.c
+++ b/src/service/namestore/test_namestore_api_monitoring.c
@@ -24,7 +24,7 @@
 #include "platform.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
-#include "namestore.h"
+#include "../service/namestore/namestore.h"
 
 #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
 
@@ -354,7 +354,7 @@ int
 main (int argc,
       char *argv[])
 {
-  const char *plugin_name;
+  char *plugin_name;
   char *cfg_name;
 
   SETUP_CFG (plugin_name, cfg_name);
diff --git a/src/plugin/namestore/test_namestore_api_monitoring_existing.c b/src/service/namestore/test_namestore_api_monitoring_existing.c
index fe17833c8..ff7e39504 100644
--- a/src/plugin/namestore/test_namestore_api_monitoring_existing.c
+++ b/src/service/namestore/test_namestore_api_monitoring_existing.c
@@ -24,7 +24,7 @@
 #include "platform.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
-#include "namestore.h"
+#include "../service/namestore/namestore.h"
 
 #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
 
@@ -368,7 +368,7 @@ int
 main (int argc,
       char *argv[])
 {
-  const char *plugin_name;
+  char *plugin_name;
   char *cfg_name;
 
   SETUP_CFG (plugin_name, cfg_name);
diff --git a/src/plugin/namestore/test_namestore_api_postgres.conf b/src/service/namestore/test_namestore_api_postgres.conf
index 007168280..007168280 100644
--- a/src/plugin/namestore/test_namestore_api_postgres.conf
+++ b/src/service/namestore/test_namestore_api_postgres.conf
diff --git a/src/plugin/namestore/test_namestore_api_remove.c b/src/service/namestore/test_namestore_api_remove.c
index 1a4a7c867..4efdb7efa 100644
--- a/src/plugin/namestore/test_namestore_api_remove.c
+++ b/src/service/namestore/test_namestore_api_remove.c
@@ -195,7 +195,7 @@ run (void *cls,
 int
 main (int argc, char *argv[])
 {
-  const char *plugin_name;
+  char *plugin_name;
   char *cfg_name;
 
   SETUP_CFG (plugin_name, cfg_name);
diff --git a/src/plugin/namestore/test_namestore_api_remove_not_existing_record.c b/src/service/namestore/test_namestore_api_remove_not_existing_record.c
index 11a69bea1..4a21b0ff9 100644
--- a/src/plugin/namestore/test_namestore_api_remove_not_existing_record.c
+++ b/src/service/namestore/test_namestore_api_remove_not_existing_record.c
@@ -155,7 +155,7 @@ run (void *cls,
 int
 main (int argc, char *argv[])
 {
-  const char *plugin_name;
+  char *plugin_name;
   char *cfg_name;
 
   SETUP_CFG (plugin_name, cfg_name);
diff --git a/src/plugin/namestore/test_namestore_api_sqlite.conf b/src/service/namestore/test_namestore_api_sqlite.conf
index 342356247..342356247 100644
--- a/src/plugin/namestore/test_namestore_api_sqlite.conf
+++ b/src/service/namestore/test_namestore_api_sqlite.conf
diff --git a/src/plugin/namestore/test_namestore_api_store.c b/src/service/namestore/test_namestore_api_store.c
index 22b92fbe5..e7b87c28b 100644
--- a/src/plugin/namestore/test_namestore_api_store.c
+++ b/src/service/namestore/test_namestore_api_store.c
@@ -148,7 +148,7 @@ run (void *cls,
 int
 main (int argc, char *argv[])
 {
-  const char *plugin_name;
+  char *plugin_name;
   char *cfg_name;
 
   SETUP_CFG (plugin_name, cfg_name);
diff --git a/src/plugin/namestore/test_namestore_api_store_update.c b/src/service/namestore/test_namestore_api_store_update.c
index 86495e261..f2af41841 100644
--- a/src/plugin/namestore/test_namestore_api_store_update.c
+++ b/src/service/namestore/test_namestore_api_store_update.c
@@ -143,7 +143,7 @@ lookup_success (void *cls,
                                            &rd_new,
                                            &put_cont,
                                            (void *) name);
-    GNUNET_free (rd_new.data);
+    GNUNET_free_nz ((void*) rd_new.data);
     update_performed = GNUNET_YES;
   }
   else
@@ -168,22 +168,12 @@ static void
 put_cont (void *cls,
           enum GNUNET_ErrorCode ec)
 {
-  const char *name = cls;
-  struct GNUNET_HashCode derived_hash;
-
   nsqe = NULL;
   GNUNET_assert (NULL != cls);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Name store added record for `%s': %s\n",
               name,
               (GNUNET_EC_NONE == ec) ? "SUCCESS" : "FAIL");
-  /* Create derived hash */
-  GNUNET_GNSRECORD_query_from_private_key (&privkey,
-                                           name,
-                                           &derived_hash);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Looking in namestore for `%s'\n",
-              GNUNET_h2s (&derived_hash));
   nsqe = GNUNET_NAMESTORE_records_lookup (nsh,
                                           &privkey,
                                           name,
@@ -222,6 +212,7 @@ run (void *cls,
 
   nsh = GNUNET_NAMESTORE_connect (cfg);
   GNUNET_break (NULL != nsh);
+
   nsqe = GNUNET_NAMESTORE_records_store (nsh,
                                          &privkey,
                                          name,
@@ -245,13 +236,13 @@ int
 main (int argc,
       char *argv[])
 {
-  const char *plugin_name;
+  char *plugin_name;
   char *cfg_name;
 
   SETUP_CFG (plugin_name, cfg_name);
   res = 1;
   if (0 !=
-      GNUNET_TESTING_peer_run ("test--store-update",
+      GNUNET_TESTING_peer_run ("test-namestore-store-update",
                                cfg_name,
                                &run,
                                NULL))
diff --git a/src/plugin/namestore/test_namestore_api_tx_rollback.c b/src/service/namestore/test_namestore_api_tx_rollback.c
index 4a701f60e..0c334d374 100644
--- a/src/plugin/namestore/test_namestore_api_tx_rollback.c
+++ b/src/service/namestore/test_namestore_api_tx_rollback.c
@@ -240,7 +240,7 @@ run (void *cls,
 int
 main (int argc, char *argv[])
 {
-  const char *plugin_name;
+  char *plugin_name;
   char *cfg_name;
 
   SETUP_CFG (plugin_name, cfg_name);
diff --git a/src/plugin/namestore/test_namestore_api_zone_iteration.c b/src/service/namestore/test_namestore_api_zone_iteration.c
index fb69fffcc..403a49a23 100644
--- a/src/plugin/namestore/test_namestore_api_zone_iteration.c
+++ b/src/service/namestore/test_namestore_api_zone_iteration.c
@@ -24,7 +24,7 @@
 #include "platform.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
-#include "namestore.h"
+#include "../service/namestore/namestore.h"
 
 #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
 
@@ -440,7 +440,7 @@ run (void *cls,
 int
 main (int argc, char *argv[])
 {
-  const char *plugin_name;
+  char *plugin_name;
   char *cfg_name;
 
   SETUP_CFG (plugin_name, cfg_name);
diff --git a/src/plugin/namestore/test_namestore_api_zone_iteration_nick.c b/src/service/namestore/test_namestore_api_zone_iteration_nick.c
index c494051d0..1ca7b3559 100644
--- a/src/plugin/namestore/test_namestore_api_zone_iteration_nick.c
+++ b/src/service/namestore/test_namestore_api_zone_iteration_nick.c
@@ -25,7 +25,7 @@
 #include "gnunet_namestore_service.h"
 #include "gnunet_gns_service.h"
 #include "gnunet_testing_lib.h"
-#include "namestore.h"
+#include "../service/namestore/namestore.h"
 
 #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
 
@@ -436,7 +436,7 @@ run (void *cls,
 int
 main (int argc, char *argv[])
 {
-  const char *plugin_name;
+  char *plugin_name;
   char *cfg_name;
 
   SETUP_CFG (plugin_name, cfg_name);
diff --git a/src/plugin/namestore/test_namestore_api_zone_iteration_specific_zone.c b/src/service/namestore/test_namestore_api_zone_iteration_specific_zone.c
index 02587706c..753e550ad 100644
--- a/src/plugin/namestore/test_namestore_api_zone_iteration_specific_zone.c
+++ b/src/service/namestore/test_namestore_api_zone_iteration_specific_zone.c
@@ -25,7 +25,7 @@
 #include "platform.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
-#include "namestore.h"
+#include "../service/namestore/namestore.h"
 
 #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
 
@@ -422,7 +422,7 @@ run (void *cls,
 int
 main (int argc, char *argv[])
 {
-  const char *plugin_name;
+  char *plugin_name;
   char *cfg_name;
 
   SETUP_CFG (plugin_name, cfg_name);
diff --git a/src/plugin/namestore/test_namestore_api_zone_iteration_stop.c b/src/service/namestore/test_namestore_api_zone_iteration_stop.c
index b6b0787ef..dd63837ce 100644
--- a/src/plugin/namestore/test_namestore_api_zone_iteration_stop.c
+++ b/src/service/namestore/test_namestore_api_zone_iteration_stop.c
@@ -24,7 +24,7 @@
 #include "platform.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
-#include "namestore.h"
+#include "../service/namestore/namestore.h"
 
 #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
 
@@ -424,7 +424,7 @@ run (void *cls,
 int
 main (int argc, char *argv[])
 {
-  const char *plugin_name;
+  char *plugin_name;
   char *cfg_name;
 
   SETUP_CFG (plugin_name, cfg_name);
diff --git a/src/plugin/namestore/test_namestore_api_zone_to_name.c b/src/service/namestore/test_namestore_api_zone_to_name.c
index c70eef53a..f41b41642 100644
--- a/src/plugin/namestore/test_namestore_api_zone_to_name.c
+++ b/src/service/namestore/test_namestore_api_zone_to_name.c
@@ -24,7 +24,7 @@
 #include "platform.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_testing_lib.h"
-#include "namestore.h"
+#include "../service/namestore/namestore.h"
 
 #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT
 
@@ -241,7 +241,7 @@ int
 main (int argc,
       char *argv[])
 {
-  const char *plugin_name;
+  char *plugin_name;
   char *cfg_name;
 
   (void) argc;
diff --git a/src/service/peerstore/gnunet-service-peerstore.c b/src/service/peerstore/gnunet-service-peerstore.c
index 2a8ecdfa2..364900674 100644
--- a/src/service/peerstore/gnunet-service-peerstore.c
+++ b/src/service/peerstore/gnunet-service-peerstore.c
@@ -157,7 +157,7 @@ static void
 expire_records_continuation (void *cls, int success)
 {
   if (success > 0)
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "%d records expired.\n", success);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%d records expired.\n", success);
   GNUNET_assert (NULL == expire_task);
   expire_task = GNUNET_SCHEDULER_add_delayed (
     GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
@@ -508,7 +508,7 @@ handle_store (void *cls, const struct StoreRecordMessage *srm)
 
   record = PEERSTORE_parse_record_message (srm);
   GNUNET_log (
-    GNUNET_ERROR_TYPE_INFO,
+    GNUNET_ERROR_TYPE_DEBUG,
     "Received a store request. Sub system `%s' Peer `%s Key `%s' Options: %u.\n",
     record->sub_system,
     GNUNET_i2s (&record->peer),
@@ -596,12 +596,18 @@ hosts_directory_scan_callback (void *cls, const char *fullname)
   }
   hello = (const struct GNUNET_MessageHeader *) &buffer[0];
   builder = GNUNET_HELLO_builder_from_msg (hello);
+  if (NULL == builder)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unable to parse HELLO message\n");
+    return GNUNET_OK;
+  }
   pid = GNUNET_HELLO_builder_get_id (builder);
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "store contrib hello for peer %s\n",
               GNUNET_i2s (pid));
-  
+
   if (GNUNET_OK != db->store_record (db->cls,
                                      "peerstore",
                                      pid,
diff --git a/src/service/testing/testing_api_loop.c b/src/service/testing/testing_api_loop.c
index 11cd02ec0..559a61c38 100644
--- a/src/service/testing/testing_api_loop.c
+++ b/src/service/testing/testing_api_loop.c
@@ -45,6 +45,11 @@ struct GNUNET_TESTING_Interpreter
   const struct GNUNET_HELPER_Handle **helper;
 
   /**
+   * Handle to a send op
+   */
+  struct GNUNET_HELPER_SendHandle *send_handle;
+
+  /**
    * Size of the array helper.
    *
    */
@@ -357,6 +362,11 @@ finish_test (void *cls)
     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);
@@ -731,37 +741,6 @@ GNUNET_TESTING_add_netjail_helper (struct GNUNET_TESTING_Interpreter *is,
 }
 
 
-/**
- * Send Message to netjail nodes.
- *
- * @param is The interpreter.
- * @param global_node_number The netjail node to inform.
- * @param header The message to send.
- */
-static void
-send_message_to_netjail (struct GNUNET_TESTING_Interpreter *is,
-                         unsigned int global_node_number,
-                         struct GNUNET_MessageHeader *header)
-{
-  const struct GNUNET_HELPER_Handle *helper;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "send message of type %u to locals\n",
-              ntohs (header->type));
-  helper = is->helper[global_node_number - 1];
-  /**
-     FIXME: This should probably be put into a linked list
-     inside is and cleaned up at some point.
-  */
-  struct GNUNET_HELPER_SendHandle *sh = GNUNET_HELPER_send (
-    (struct GNUNET_HELPER_Handle *) helper,
-    header,
-    GNUNET_NO,
-    &clear_msg,
-    NULL);
-}
-
-
 void
 TST_interpreter_send_barrier_crossable (struct GNUNET_TESTING_Interpreter *is,
                                         const char *barrier_name,
@@ -780,9 +759,19 @@ TST_interpreter_send_barrier_crossable (struct GNUNET_TESTING_Interpreter *is,
   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);
-  send_message_to_netjail (is,
-                           global_node_number,
-                           &adm->header);
+  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);
 }
 
diff --git a/src/service/transport/gnunet-service-transport.c b/src/service/transport/gnunet-service-transport.c
index 9562c1f68..3f0027a98 100644
--- a/src/service/transport/gnunet-service-transport.c
+++ b/src/service/transport/gnunet-service-transport.c
@@ -5526,6 +5526,15 @@ shc_cont (void *cls, int success)
                                     GNUNET_PEERSTORE_STOREOPTION_MULTIPLE,
                                     &peerstore_store_own_cb,
                                     ale);
+  if (NULL == ale->sc)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Failed to store our address `%s' with peerstore\n",
+                ale->address);
+    ale->st = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
+                                            &store_pi,
+                                            ale);
+   }
 }
 
 
@@ -5543,6 +5552,7 @@ store_pi (void *cls)
   const char *dash;
   char *address_uri;
   char *prefix = GNUNET_HELLO_address_to_prefix (ale->address);
+  unsigned int add_success;
 
   dash = strchr (ale->address, '-');
   GNUNET_assert (NULL != dash);
@@ -5557,15 +5567,15 @@ store_pi (void *cls)
               "Storing our address `%s' in peerstore until %s!\n",
               ale->address,
               GNUNET_STRINGS_absolute_time_to_string (hello_mono_time));
-  if (GNUNET_OK != GNUNET_HELLO_builder_add_address (GST_my_hello,
-                                                     address_uri))
+  add_success = GNUNET_HELLO_builder_add_address (GST_my_hello,
+                                                  address_uri);
+  if (GNUNET_OK != add_success)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Address `%s' invalid\n",
-                address_uri);
+                "Storing our address `%s' %s\n",
+                address_uri,
+                GNUNET_NO == add_success ? "not done" : "failed");
     GNUNET_free (address_uri);
-    ale->st =
-      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &store_pi, ale);
     return;
   }
   // FIXME hello_mono_time used here?? What about expiration in ale?
diff --git a/src/service/util/meson.build b/src/service/util/meson.build
index a7199fa4b..b7642c905 100644
--- a/src/service/util/meson.build
+++ b/src/service/util/meson.build
@@ -19,3 +19,16 @@ executable ('gnunet-service-resolver',
             include_directories: [incdir, configuration_inc],
             install: true,
             install_dir: get_option('libdir') / 'gnunet' / 'libexec')
+
+testresolverapi = executable ('test_resolver_api',
+            ['test_resolver_api.c'],
+            dependencies: [libgnunetutil_dep],
+            include_directories: [incdir, configuration_inc],
+            install: false)
+configure_file(copy: true,
+               input: 'test_resolver_api_data.conf',
+               output: 'test_resolver_api_data.conf')
+
+test('test_resolver_api', testresolverapi, workdir: meson.current_build_dir(),
+     suite: 'resolver')
+
diff --git a/src/service/util/test_resolver_api.c b/src/service/util/test_resolver_api.c
index 5ad0c6bf3..f8a2164a2 100644
--- a/src/service/util/test_resolver_api.c
+++ b/src/service/util/test_resolver_api.c
@@ -25,7 +25,7 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_resolver_service.h"
-#include "resolver.h"
+#include "../lib/util/resolver.h"
 
 
 static int disable_rootserver_check;