diff --git a/broker/src/asapo_broker/main/broker.go b/broker/src/asapo_broker/main/broker.go
index 8b935e679f2605b10f14b76c468087ebe799ab58..a0cebee6f657c40d7ee0923ecc9c804773a44842 100644
--- a/broker/src/asapo_broker/main/broker.go
+++ b/broker/src/asapo_broker/main/broker.go
@@ -45,7 +45,7 @@ func main() {
 
 	err = server.InitDB(NewDefaultDatabase())
 	if err != nil {
-		log.Fatal(err.Error())
+		log.Error(err.Error())
 	}
 	defer server.CleanupDB()
 	server.Start()
diff --git a/examples/consumer/getnext_broker/check_windows.bat b/examples/consumer/getnext_broker/check_windows.bat
index 5173773f54f2947b0d760baaf683868ac8a90624..fb2e3816a0f446df3e0bbef9d2a06ef6aa88ef86 100644
--- a/examples/consumer/getnext_broker/check_windows.bat
+++ b/examples/consumer/getnext_broker/check_windows.bat
@@ -27,5 +27,5 @@ exit /b 1
 c:\opt\consul\nomad stop discovery
 c:\opt\consul\nomad stop broker
 c:\opt\consul\nomad stop nginx
-c:\opt\consul\nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
+c:\opt\consul\nomad run nginx_kill.nmd  && c:\opt\consul\nomad stop -yes -purge nginx_kill
 echo db.dropDatabase() | %mongo_exe% %database_name%
diff --git a/examples/consumer/getnext_broker_python/check_windows.bat b/examples/consumer/getnext_broker_python/check_windows.bat
index 29ab51360092af77dbbcbdb190494c8eef8baddc..3c35ea11f8fde3818710bb6523b8d8882f08d5a7 100644
--- a/examples/consumer/getnext_broker_python/check_windows.bat
+++ b/examples/consumer/getnext_broker_python/check_windows.bat
@@ -51,5 +51,5 @@ exit /b 1
 c:\opt\consul\nomad stop discovery
 c:\opt\consul\nomad stop broker
 c:\opt\consul\nomad stop nginx
-c:\opt\consul\nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
+c:\opt\consul\nomad run nginx_kill.nmd  && c:\opt\consul\nomad stop -yes -purge nginx_kill
 echo db.dropDatabase() | %mongo_exe% %database_name%
diff --git a/examples/pipeline/in_to_out/check_windows.bat b/examples/pipeline/in_to_out/check_windows.bat
index 099d19f6855ba89243bd35dbfcebd0cfb27a6616..30a6407fab67ffb8ed1cc2b636bf52c5f7b86e97 100644
--- a/examples/pipeline/in_to_out/check_windows.bat
+++ b/examples/pipeline/in_to_out/check_windows.bat
@@ -67,7 +67,7 @@ exit /b 1
 c:\opt\consul\nomad stop discovery
 c:\opt\consul\nomad stop broker
 c:\opt\consul\nomad stop nginx
-c:\opt\consul\nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
+c:\opt\consul\nomad run nginx_kill.nmd  && c:\opt\consul\nomad stop -yes -purge nginx_kill
 c:\opt\consul\nomad stop receiver
 c:\opt\consul\nomad stop authorizer
 
diff --git a/examples/pipeline/in_to_out_python/check_windows.bat b/examples/pipeline/in_to_out_python/check_windows.bat
index a3dbdeea2afc89838125f53fc1a2066404ea206e..a4d705c93e6929c1a2eb77b5de8f6fd08aa2542e 100644
--- a/examples/pipeline/in_to_out_python/check_windows.bat
+++ b/examples/pipeline/in_to_out_python/check_windows.bat
@@ -60,7 +60,7 @@ exit /b 1
 c:\opt\consul\nomad stop discovery
 c:\opt\consul\nomad stop broker
 c:\opt\consul\nomad stop nginx
-c:\opt\consul\nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
+c:\opt\consul\nomad run nginx_kill.nmd  && c:\opt\consul\nomad stop -yes -purge nginx_kill
 c:\opt\consul\nomad stop receiver
 c:\opt\consul\nomad stop authorizer
 
diff --git a/tests/automatic/bug_fixes/producer_send_after_restart/check_windows.bat b/tests/automatic/bug_fixes/producer_send_after_restart/check_windows.bat
index b4ef7c054427f35833aa1f29c76c5eb0e4fe5c0f..170c10d0cc810b7da436a067e31842aa2e2fcad6 100644
--- a/tests/automatic/bug_fixes/producer_send_after_restart/check_windows.bat
+++ b/tests/automatic/bug_fixes/producer_send_after_restart/check_windows.bat
@@ -66,7 +66,7 @@ c:\opt\consul\nomad stop discovery
 c:\opt\consul\nomad stop broker
 c:\opt\consul\nomad stop authorizer
 c:\opt\consul\nomad stop nginx
-c:\opt\consul\nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
+c:\opt\consul\nomad run nginx_kill.nmd  && c:\opt\consul\nomad stop -yes -purge nginx_kill
 
 rmdir /S /Q %receiver_root_folder%
 rmdir /S /Q c:\tmp\asapo\test_in\test1
diff --git a/tests/automatic/consumer/consumer_api/check_windows.bat b/tests/automatic/consumer/consumer_api/check_windows.bat
index 27bfdd19048f3bb6048e870c0b24d7aea59e71a4..b3489c09a7f19c170c902471fd93fd185f597463 100644
--- a/tests/automatic/consumer/consumer_api/check_windows.bat
+++ b/tests/automatic/consumer/consumer_api/check_windows.bat
@@ -39,7 +39,7 @@ exit /b 1
 c:\opt\consul\nomad stop discovery
 c:\opt\consul\nomad stop broker
 c:\opt\consul\nomad stop nginx
-c:\opt\consul\nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
+c:\opt\consul\nomad run nginx_kill.nmd  && c:\opt\consul\nomad stop -yes -purge nginx_kill
 echo db.dropDatabase() | %mongo_exe% %database_name%
 del "1 1_1"
 
diff --git a/tests/automatic/consumer/consumer_api_python/check_windows.bat b/tests/automatic/consumer/consumer_api_python/check_windows.bat
index 5af7b07fb456534215696ec197ecedeb29011346..3d91e3db336a23d4937949849572efe69e898e87 100644
--- a/tests/automatic/consumer/consumer_api_python/check_windows.bat
+++ b/tests/automatic/consumer/consumer_api_python/check_windows.bat
@@ -40,6 +40,6 @@ exit /b 1
 c:\opt\consul\nomad stop discovery
 c:\opt\consul\nomad stop broker
 c:\opt\consul\nomad stop nginx
-c:\opt\consul\nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
+c:\opt\consul\nomad run nginx_kill.nmd  && c:\opt\consul\nomad stop -yes -purge nginx_kill
 echo db.dropDatabase() | %mongo_exe% %database_name%
 del "1 1_1"
diff --git a/tests/automatic/consumer/next_multithread_broker/check_windows.bat b/tests/automatic/consumer/next_multithread_broker/check_windows.bat
index 1d95f02d473214b724dbf156808e41279bcc500f..6a349c08632f6d609256224fe9466f802bdf0b38 100644
--- a/tests/automatic/consumer/next_multithread_broker/check_windows.bat
+++ b/tests/automatic/consumer/next_multithread_broker/check_windows.bat
@@ -25,5 +25,5 @@ exit /b 1
 c:\opt\consul\nomad stop discovery
 c:\opt\consul\nomad stop broker
 c:\opt\consul\nomad stop nginx
-c:\opt\consul\nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
+c:\opt\consul\nomad run nginx_kill.nmd  && c:\opt\consul\nomad stop -yes -purge nginx_kill
 echo db.dropDatabase() | %mongo_exe% %database_name%
diff --git a/tests/automatic/full_chain/simple_chain/check_windows.bat b/tests/automatic/full_chain/simple_chain/check_windows.bat
index c15b693361eebb520c012c2d00e665d814faaf8c..38ce093a3b4d249af775ab1dcd1133fc3bfe7c06 100644
--- a/tests/automatic/full_chain/simple_chain/check_windows.bat
+++ b/tests/automatic/full_chain/simple_chain/check_windows.bat
@@ -44,7 +44,7 @@ c:\opt\consul\nomad stop discovery
 c:\opt\consul\nomad stop broker
 c:\opt\consul\nomad stop authorizer
 c:\opt\consul\nomad stop nginx
-c:\opt\consul\nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
+c:\opt\consul\nomad run nginx_kill.nmd  && c:\opt\consul\nomad stop -yes -purge nginx_kill
 rmdir /S /Q %receiver_root_folder%
 del /f token
 echo db.dropDatabase() | %mongo_exe% %beamtime_id%_detector
diff --git a/tests/automatic/full_chain/simple_chain_dataset/check_windows.bat b/tests/automatic/full_chain/simple_chain_dataset/check_windows.bat
index cb7fa5f8c496cdd7f37bb48b41baf94a21d49577..2e3ae695f517b1be77ebc2e1cb4263c873dcc7f0 100644
--- a/tests/automatic/full_chain/simple_chain_dataset/check_windows.bat
+++ b/tests/automatic/full_chain/simple_chain_dataset/check_windows.bat
@@ -44,7 +44,7 @@ c:\opt\consul\nomad stop discovery
 c:\opt\consul\nomad stop broker
 c:\opt\consul\nomad stop authorizer
 c:\opt\consul\nomad stop nginx
-c:\opt\consul\nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
+c:\opt\consul\nomad run nginx_kill.nmd  && c:\opt\consul\nomad stop -yes -purge nginx_kill
 rmdir /S /Q %receiver_root_folder%
 del /f token
 echo db.dropDatabase() | %mongo_exe% %beamtime_id%_detector
diff --git a/tests/automatic/full_chain/simple_chain_filegen/check_windows.bat b/tests/automatic/full_chain/simple_chain_filegen/check_windows.bat
index 2579f63b32588647c85abce242d51504cd220a8c..a98eae7e63d3f0e4c89b44a83851c379c6d7334a 100644
--- a/tests/automatic/full_chain/simple_chain_filegen/check_windows.bat
+++ b/tests/automatic/full_chain/simple_chain_filegen/check_windows.bat
@@ -56,7 +56,7 @@ c:\opt\consul\nomad stop discovery
 c:\opt\consul\nomad stop broker
 c:\opt\consul\nomad stop authorizer
 c:\opt\consul\nomad stop nginx
-c:\opt\consul\nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
+c:\opt\consul\nomad run nginx_kill.nmd  && c:\opt\consul\nomad stop -yes -purge nginx_kill
 rmdir /S /Q %receiver_root_folder%
 rmdir /S /Q c:\tmp\asapo\test_in\test1
 rmdir /S /Q c:\tmp\asapo\test_in\test2
diff --git a/tests/automatic/full_chain/simple_chain_filegen_batches/check_windows.bat b/tests/automatic/full_chain/simple_chain_filegen_batches/check_windows.bat
index 96f6ce79f103303f79b01fb6206302ac23f3a95c..ba872e426e6bcbe8b980945a4643efbd94185e27 100644
--- a/tests/automatic/full_chain/simple_chain_filegen_batches/check_windows.bat
+++ b/tests/automatic/full_chain/simple_chain_filegen_batches/check_windows.bat
@@ -57,7 +57,7 @@ c:\opt\consul\nomad stop discovery
 c:\opt\consul\nomad stop broker
 c:\opt\consul\nomad stop authorizer
 c:\opt\consul\nomad stop nginx
-c:\opt\consul\nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
+c:\opt\consul\nomad run nginx_kill.nmd  && c:\opt\consul\nomad stop -yes -purge nginx_kill
 rmdir /S /Q %receiver_root_folder%
 rmdir /S /Q c:\tmp\asapo\test_in\test1
 rmdir /S /Q c:\tmp\asapo\test_in\test2
diff --git a/tests/automatic/full_chain/simple_chain_filegen_multisource/check_windows.bat b/tests/automatic/full_chain/simple_chain_filegen_multisource/check_windows.bat
index e4063095f8f028c27d8e31a479b4250006f8e5f3..63684cf4eaa8ac5c325ec2f1f1b35022211da0a4 100644
--- a/tests/automatic/full_chain/simple_chain_filegen_multisource/check_windows.bat
+++ b/tests/automatic/full_chain/simple_chain_filegen_multisource/check_windows.bat
@@ -63,7 +63,7 @@ c:\opt\consul\nomad stop discovery
 c:\opt\consul\nomad stop broker
 c:\opt\consul\nomad stop authorizer
 c:\opt\consul\nomad stop nginx
-c:\opt\consul\nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
+c:\opt\consul\nomad run nginx_kill.nmd  && c:\opt\consul\nomad stop -yes -purge nginx_kill
 rmdir /S /Q %receiver_root_folder%
 rmdir /S /Q c:\tmp\asapo\test_in\test1
 rmdir /S /Q c:\tmp\asapo\test_in\test2
diff --git a/tests/automatic/full_chain/simple_chain_filegen_readdata_cache/check_windows.bat b/tests/automatic/full_chain/simple_chain_filegen_readdata_cache/check_windows.bat
index f505c6699d4e4853d7b62b8f145856eb4cae1a63..d7b66fe93eca6452c27ba1a676dc0549201409df 100644
--- a/tests/automatic/full_chain/simple_chain_filegen_readdata_cache/check_windows.bat
+++ b/tests/automatic/full_chain/simple_chain_filegen_readdata_cache/check_windows.bat
@@ -60,7 +60,7 @@ c:\opt\consul\nomad stop discovery
 c:\opt\consul\nomad stop broker
 c:\opt\consul\nomad stop authorizer
 c:\opt\consul\nomad stop nginx
-c:\opt\consul\nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
+c:\opt\consul\nomad run nginx_kill.nmd  && c:\opt\consul\nomad stop -yes -purge nginx_kill
 rmdir /S /Q %receiver_root_folder%
 rmdir /S /Q c:\tmp\asapo\test_in\test1
 rmdir /S /Q c:\tmp\asapo\test_in\test2
diff --git a/tests/automatic/full_chain/simple_chain_filegen_readdata_file/check_windows.bat b/tests/automatic/full_chain/simple_chain_filegen_readdata_file/check_windows.bat
index 432cfd42618ab5b4436b70116f57e4631b5046e2..ce45d9597678ec75e0ce9f084f4020874dee0ee2 100644
--- a/tests/automatic/full_chain/simple_chain_filegen_readdata_file/check_windows.bat
+++ b/tests/automatic/full_chain/simple_chain_filegen_readdata_file/check_windows.bat
@@ -60,7 +60,7 @@ c:\opt\consul\nomad stop discovery
 c:\opt\consul\nomad stop broker
 c:\opt\consul\nomad stop authorizer
 c:\opt\consul\nomad stop nginx
-c:\opt\consul\nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
+c:\opt\consul\nomad run nginx_kill.nmd  && c:\opt\consul\nomad stop -yes -purge nginx_kill
 rmdir /S /Q %receiver_root_folder%
 rmdir /S /Q c:\tmp\asapo\test_in\test1
 rmdir /S /Q c:\tmp\asapo\test_in\test2
diff --git a/tests/automatic/full_chain/simple_chain_metadata/check_windows.bat b/tests/automatic/full_chain/simple_chain_metadata/check_windows.bat
index 58ac4c035a09b3709968abbab18bd33ed850100e..0627cdd21296f6f4f0881df1f166996982aa64cb 100644
--- a/tests/automatic/full_chain/simple_chain_metadata/check_windows.bat
+++ b/tests/automatic/full_chain/simple_chain_metadata/check_windows.bat
@@ -42,7 +42,7 @@ c:\opt\consul\nomad stop discovery
 c:\opt\consul\nomad stop broker
 c:\opt\consul\nomad stop authorizer
 c:\opt\consul\nomad stop nginx
-c:\opt\consul\nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
+c:\opt\consul\nomad run nginx_kill.nmd  && c:\opt\consul\nomad stop -yes -purge nginx_kill
 rmdir /S /Q %receiver_root_folder%
 del /f token
 echo db.dropDatabase() | %mongo_exe% %beamtime_id%_detector
diff --git a/tests/automatic/full_chain/simple_chain_usermeta_python/check_windows.bat b/tests/automatic/full_chain/simple_chain_usermeta_python/check_windows.bat
index fe1b30a1eee38f71c1603036f00dd14f0d8198e7..f60eb6035f451d44a303eebb1e013e6e01fac8e6 100644
--- a/tests/automatic/full_chain/simple_chain_usermeta_python/check_windows.bat
+++ b/tests/automatic/full_chain/simple_chain_usermeta_python/check_windows.bat
@@ -44,7 +44,7 @@ c:\opt\consul\nomad stop discovery
 c:\opt\consul\nomad stop broker
 c:\opt\consul\nomad stop authorizer
 c:\opt\consul\nomad stop nginx
-c:\opt\consul\nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
+c:\opt\consul\nomad run nginx_kill.nmd  && c:\opt\consul\nomad stop -yes -purge nginx_kill
 rmdir /S /Q %receiver_root_folder%
 del /f token
 echo db.dropDatabase() | %mongo_exe% %beamtime_id%_detector
diff --git a/tests/automatic/full_chain/two_beamlines/check_windows.bat b/tests/automatic/full_chain/two_beamlines/check_windows.bat
index 33de538e46929ce035674c6ea69e09c376a34695..16e353f58f7d7a3db29d5ebd731985716a067d38 100644
--- a/tests/automatic/full_chain/two_beamlines/check_windows.bat
+++ b/tests/automatic/full_chain/two_beamlines/check_windows.bat
@@ -58,7 +58,7 @@ c:\opt\consul\nomad stop discovery
 c:\opt\consul\nomad stop broker
 c:\opt\consul\nomad stop authorizer
 c:\opt\consul\nomad stop nginx
-c:\opt\consul\nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
+c:\opt\consul\nomad run nginx_kill.nmd  && c:\opt\consul\nomad stop -yes -purge nginx_kill
 rmdir /S /Q %receiver_root_folder%
 del /f token1
 del /f token2
diff --git a/tests/automatic/full_chain/two_streams/check_windows.bat b/tests/automatic/full_chain/two_streams/check_windows.bat
index f2c24716367ff0685d2e6ab9844cb13b8b1da981..af2f4ec61a64feb5a83d26b72ec541cd48136eea 100644
--- a/tests/automatic/full_chain/two_streams/check_windows.bat
+++ b/tests/automatic/full_chain/two_streams/check_windows.bat
@@ -53,7 +53,7 @@ c:\opt\consul\nomad stop discovery
 c:\opt\consul\nomad stop broker
 c:\opt\consul\nomad stop authorizer
 c:\opt\consul\nomad stop nginx
-c:\opt\consul\nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
+c:\opt\consul\nomad run nginx_kill.nmd  && c:\opt\consul\nomad stop -yes -purge nginx_kill
 rmdir /S /Q %receiver_root_folder%
 del /f token1
 del /f token2
diff --git a/tests/automatic/producer/python_api/check_linux.sh b/tests/automatic/producer/python_api/check_linux.sh
index 76ee5358e644a1100b080000a68b25e8936ca657..e7654d39438bd8a4b457a1e77d3c00f1778706cd 100644
--- a/tests/automatic/producer/python_api/check_linux.sh
+++ b/tests/automatic/producer/python_api/check_linux.sh
@@ -17,7 +17,7 @@ Cleanup() {
     nomad stop discovery >/dev/null
     nomad stop authorizer >/dev/null
     nomad stop nginx >/dev/null
-    nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill > dev/null
+    nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill > /dev/null
     echo "db.dropDatabase()" | mongo ${beamtime_id}_${stream} >/dev/null
 }
 
diff --git a/tests/automatic/producer/python_api/check_windows.bat b/tests/automatic/producer/python_api/check_windows.bat
index 2f228a4e61b02a65e81eddf07a7dad6e0ea10f01..070a6e8445028d7c55041b161a8405c40ae50190 100644
--- a/tests/automatic/producer/python_api/check_windows.bat
+++ b/tests/automatic/producer/python_api/check_windows.bat
@@ -41,7 +41,7 @@ exit /b 1
 c:\opt\consul\nomad stop receiver
 c:\opt\consul\nomad stop discovery
 c:\opt\consul\nomad stop nginx
-c:\opt\consul\nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
+c:\opt\consul\nomad run nginx_kill.nmd  && c:\opt\consul\nomad stop -yes -purge nginx_kill
 c:\opt\consul\nomad stop authorizer
 rmdir /S /Q %receiver_root_folder%
 echo db.dropDatabase() | %mongo_exe% %dbname%
diff --git a/tests/automatic/producer_receiver/transfer_datasets/check_windows.bat b/tests/automatic/producer_receiver/transfer_datasets/check_windows.bat
index d8b5fcf359ecfd4fddee4fe37bda67ea9ef45ef7..36c820e9c109152ee05c66e9b39ea00ab8526f65 100644
--- a/tests/automatic/producer_receiver/transfer_datasets/check_windows.bat
+++ b/tests/automatic/producer_receiver/transfer_datasets/check_windows.bat
@@ -45,7 +45,7 @@ exit /b 1
 c:\opt\consul\nomad stop receiver
 c:\opt\consul\nomad stop discovery
 c:\opt\consul\nomad stop nginx
-c:\opt\consul\nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
+c:\opt\consul\nomad run nginx_kill.nmd  && c:\opt\consul\nomad stop -yes -purge nginx_kill
 c:\opt\consul\nomad stop authorizer
 rmdir /S /Q %receiver_root_folder%
 echo db.dropDatabase() | %mongo_exe% %beamtime_id%_detector
diff --git a/tests/automatic/producer_receiver/transfer_single_file/check_windows.bat b/tests/automatic/producer_receiver/transfer_single_file/check_windows.bat
index 4efa12c900e72f57b941de40078ea9e4fb018e99..a42e99585d8ec6bb756b5805d063dc6292c3f8ff 100644
--- a/tests/automatic/producer_receiver/transfer_single_file/check_windows.bat
+++ b/tests/automatic/producer_receiver/transfer_single_file/check_windows.bat
@@ -36,7 +36,7 @@ exit /b 1
 c:\opt\consul\nomad stop receiver
 c:\opt\consul\nomad stop discovery
 c:\opt\consul\nomad stop nginx
-c:\opt\consul\nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
+c:\opt\consul\nomad run nginx_kill.nmd  && c:\opt\consul\nomad stop -yes -purge nginx_kill
 c:\opt\consul\nomad stop authorizer
 rmdir /S /Q %receiver_root_folder%
 echo db.dropDatabase() | %mongo_exe% %beamtime_id%_detector