diff --git a/examples/consumer/getnext/CMakeLists.txt b/examples/consumer/getnext/CMakeLists.txt
index 1e7bd4ca74068e668977e62b76a03d58628fe4ff..6353d1706436a5acf5e9997b65436cbc4562d63f 100644
--- a/examples/consumer/getnext/CMakeLists.txt
+++ b/examples/consumer/getnext/CMakeLists.txt
@@ -14,10 +14,6 @@ set_target_properties(${TARGET_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY
 get_target_property(VAR ${TARGET_NAME} RUNTIME_OUTPUT_DIRECTORY)
 add_dependencies(${TARGET_NAME} asapo-broker)
 
-
-prepare_asapo()
-
-configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/settings/broker_settings.json settings.json COPYONLY)
 add_script_test("${TARGET_NAME}" "${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME}")
 
 endif()
diff --git a/examples/consumer/getnext/check_linux.sh b/examples/consumer/getnext/check_linux.sh
index 2c853792cf60bc9a171c6664a2a695ca71c0791f..2cb761da0fcdbc11a634e2c46dcfcb0417885c96 100644
--- a/examples/consumer/getnext/check_linux.sh
+++ b/examples/consumer/getnext/check_linux.sh
@@ -12,19 +12,9 @@ trap Cleanup EXIT
 
 Cleanup() {
     set +e
-    nomad stop nginx
-    nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
-    nomad stop discovery
-    nomad stop authorizer
-    nomad stop broker
   	echo "db.dropDatabase()" | mongo ${database_name}
 }
 
-nomad run nginx.nmd
-nomad run discovery.nmd
-nomad run authorizer.nmd
-nomad run broker.nmd
-
 for i in `seq 1 3`;
 do
 	echo 'db.data_default.insert({"_id":'$i',"size":100,"name":"'$i'","timestamp":0,"source":"none","buf_id":0,"dataset_substream":0,"meta":{"test":10}})' | mongo ${database_name}
@@ -32,7 +22,7 @@ done
 
 sleep 1
 
-$@ 127.0.0.1:8400 $source_path $beamtime_id 2 $token_test_run 12000 1  | tee /dev/stderr | grep "Processed 3 file(s)"
+$@ 127.0.0.1:8400 $source_path $beamtime_id 2 $token_test_run 3000 1  | tee /dev/stderr | grep "Processed 3 file(s)"
 
 
 
diff --git a/examples/consumer/getnext/check_windows.bat b/examples/consumer/getnext/check_windows.bat
index 1a3db40dff18fa2808fcdf3c3957eeb40f990e58..2e0870e3678408205d00f4f172153fc98336b199 100644
--- a/examples/consumer/getnext/check_windows.bat
+++ b/examples/consumer/getnext/check_windows.bat
@@ -7,12 +7,10 @@ SET database_name=%beamtime_id%_%data_source%
 SET mongo_exe="c:\Program Files\MongoDB\Server\4.2\bin\mongo.exe"
 set token_test_run=%BT_TEST_RUN_TOKEN%
 
-call start_services.bat
-
 for /l %%x in (1, 1, 3) do echo db.data_default.insert({"_id":%%x,"size":100,"name":"%%x","timestamp":0,"source":"none","buf_id":0,"dataset_substream":0,"meta":{"test":10}}) | %mongo_exe% %database_name%  || goto :error
 
 
-"%1" 127.0.0.1:8400 %source_path% %beamtime_id% 1 %token_test_run% 12000 1 | findstr /c:"Processed 3 file" || goto :error
+"%1" 127.0.0.1:8400 %source_path% %beamtime_id% 1 %token_test_run% 3000 1 | findstr /c:"Processed 3 file" || goto :error
 goto :clean
 
 :error
@@ -20,5 +18,4 @@ call :clean
 exit /b 1
 
 :clean
-call stop_services.bat
 echo db.dropDatabase() | %mongo_exe% %database_name%
diff --git a/examples/consumer/getnext_python/CMakeLists.txt b/examples/consumer/getnext_python/CMakeLists.txt
index a551c090300c7d24cd0a72dbf8b8602ae9806308..6c0804e29ecb0767b02f0ed30d616ef7d737b508 100644
--- a/examples/consumer/getnext_python/CMakeLists.txt
+++ b/examples/consumer/getnext_python/CMakeLists.txt
@@ -1,8 +1,5 @@
 set(TARGET_NAME getnext_python)
 
-
-prepare_asapo()
-
 if (UNIX)
     get_target_property(PYTHON_LIBS python-lib-consumer BINARY_DIR)
 else()
diff --git a/examples/consumer/getnext_python/check_linux.sh b/examples/consumer/getnext_python/check_linux.sh
index 50c4b25cfa5364a5566b8440a6296649cb043497..9f6fb85bd8f428a51c2cc9a163255c8e217ba456 100644
--- a/examples/consumer/getnext_python/check_linux.sh
+++ b/examples/consumer/getnext_python/check_linux.sh
@@ -12,19 +12,9 @@ trap Cleanup EXIT
 
 Cleanup() {
     set +e
-    nomad stop nginx
-    nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
-    nomad stop discovery
-    nomad stop authorizer
-    nomad stop broker
 	echo "db.dropDatabase()" | mongo ${database_name}
 }
 
-nomad run nginx.nmd
-nomad run discovery.nmd
-nomad run authorizer.nmd
-nomad run broker.nmd
-
 for i in `seq 1 3`;
 do
 	echo 'db.data_default.insert({"_id":'$i',"size":100,"name":"'$i'","timestamp":0,"source":"none","buf_id":0,"dataset_substream":0,"meta":{"test":10}})' | mongo ${database_name}
diff --git a/examples/consumer/getnext_python/check_windows.bat b/examples/consumer/getnext_python/check_windows.bat
index 9b96ec00e6ddc2373237820eb86ee333f0f2b7b0..e48e27bd8c3a9a23fef9fb366ac6ef564a297057 100644
--- a/examples/consumer/getnext_python/check_windows.bat
+++ b/examples/consumer/getnext_python/check_windows.bat
@@ -7,8 +7,6 @@ SET mongo_exe="c:\Program Files\MongoDB\Server\4.2\bin\mongo.exe"
 set token_test_run=%BT_TEST_RUN_TOKEN%
 set group_id=bif31l2uiddd4r0q6b40
 
-call start_services.bat
-
 for /l %%x in (1, 1, 3) do echo db.data_default.insert({"_id":%%x,"size":100,"name":"%%x","timestamp":0,"source":"none","buf_id":0,"dataset_substream":0,"meta":{"test":10}}) | %mongo_exe% %database_name%  || goto :error
 
 
@@ -44,5 +42,4 @@ call :clean
 exit /b 1
 
 :clean
-call stop_services.bat
 echo db.dropDatabase() | %mongo_exe% %database_name%
diff --git a/examples/consumer/getnext_python/getnext.py b/examples/consumer/getnext_python/getnext.py
index 0aec93df4bdfff79a2b6733e1cb225fa955e28b2..e521c98f5be613f2a1f6d04acc2251858017d5b2 100644
--- a/examples/consumer/getnext_python/getnext.py
+++ b/examples/consumer/getnext_python/getnext.py
@@ -6,7 +6,7 @@ import sys
 
 source, path, beamtime, token, group_id = sys.argv[1:]
 
-consumer = asapo_consumer.create_consumer(source,path,True, beamtime,"",token,60000)
+consumer = asapo_consumer.create_consumer(source,path,True, beamtime,"",token,5000)
 
 
 if group_id == "new":
diff --git a/examples/pipeline/in_to_out/CMakeLists.txt b/examples/pipeline/in_to_out/CMakeLists.txt
index efe0d0f8a6f0e87758fef1c4fa683fa469068fa0..60e211fb06c546e4e23bd3d8aaf02182332bb363 100644
--- a/examples/pipeline/in_to_out/CMakeLists.txt
+++ b/examples/pipeline/in_to_out/CMakeLists.txt
@@ -9,7 +9,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY
         ${CMAKE_CURRENT_BINARY_DIR}$<$<CONFIG:Debug>:>
         )
 
-prepare_asapo()
-
 add_script_test("${TARGET_NAME}" "${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME}" nomem)
 
diff --git a/examples/pipeline/in_to_out/check_linux.sh b/examples/pipeline/in_to_out/check_linux.sh
index 120bad4d0fc3a2e95e40fe9397e154f98bda7855..ceaeccdacc4c7a1d7e4091715cb2a35acda58a56 100644
--- a/examples/pipeline/in_to_out/check_linux.sh
+++ b/examples/pipeline/in_to_out/check_linux.sh
@@ -25,12 +25,6 @@ trap Cleanup EXIT
 
 Cleanup() {
     set +e
-    nomad stop nginx
-    nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
-    nomad stop discovery
-    nomad stop broker
-    nomad stop receiver
-    nomad stop authorizer
 	  echo "db.dropDatabase()" | mongo ${indatabase_name}
 	  echo "db.dropDatabase()" | mongo ${outdatabase_name}
     echo "db.dropDatabase()" | mongo ${outdatabase_name2}
@@ -40,12 +34,6 @@ Cleanup() {
 
 }
 
-nomad run nginx.nmd
-nomad run discovery.nmd
-nomad run broker.nmd
-nomad run receiver_tcp.nmd
-nomad run authorizer.nmd
-
 mkdir -p $receiver_folder
 mkdir processed
 echo hello1 > processed/file1
diff --git a/examples/pipeline/in_to_out/check_windows.bat b/examples/pipeline/in_to_out/check_windows.bat
index 57485dbe442e4ae171f7e63641a69aa5a31a4d5a..c2f2b91da85472b63607bea4094d63154d495f8c 100644
--- a/examples/pipeline/in_to_out/check_windows.bat
+++ b/examples/pipeline/in_to_out/check_windows.bat
@@ -18,8 +18,6 @@ SET receiver_folder="%receiver_root_folder%\test_facility\gpfs\%beamline%\2019\d
 
 SET mongo_exe="c:\Program Files\MongoDB\Server\4.2\bin\mongo.exe"
 
-call start_services.bat
-
 for /l %%x in (1, 1, 3) do echo db.data_default.insert({"_id":%%x,"size":6,"name":"processed\\file%%x","timestamp":0,"source":"none","buf_id":0,"dataset_substream":0,"meta":{"test":10}}) | %mongo_exe% %indatabase_name%  || goto :error
 
 mkdir %receiver_folder%
@@ -58,7 +56,6 @@ call :clean
 exit /b 1
 
 :clean
-call stop_services.bat
 
 echo db.dropDatabase() | %mongo_exe% %indatabase_name%
 echo db.dropDatabase() | %mongo_exe% %outdatabase_name%
diff --git a/examples/pipeline/in_to_out_python/CMakeLists.txt b/examples/pipeline/in_to_out_python/CMakeLists.txt
index bdac25363e1a04cf6afa0b7b7ca85ccaaf3feed3..f145b0aa21af7f648495347ea05f1aa63051522b 100644
--- a/examples/pipeline/in_to_out_python/CMakeLists.txt
+++ b/examples/pipeline/in_to_out_python/CMakeLists.txt
@@ -1,7 +1,5 @@
 set(TARGET_NAME pipeline_inout_python)
 
-prepare_asapo()
-
 if (UNIX)
     get_target_property(PYTHON_LIBS_CONSUMER python-lib-consumer BINARY_DIR)
     get_target_property(PYTHON_LIBS_PRODUCER python-lib-producer BINARY_DIR)
diff --git a/examples/pipeline/in_to_out_python/check_linux.sh b/examples/pipeline/in_to_out_python/check_linux.sh
index 12f7444f8c7462af63d647efb8eb1ebed74c4ec1..4a1a7438585878bf130886ffa9405174ef151ab6 100644
--- a/examples/pipeline/in_to_out_python/check_linux.sh
+++ b/examples/pipeline/in_to_out_python/check_linux.sh
@@ -29,12 +29,6 @@ trap Cleanup EXIT
 
 Cleanup() {
     set +e
-    nomad stop nginx
-    nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
-    nomad stop discovery
-    nomad stop broker
-    nomad stop receiver
-    nomad stop authorizer
     echo "db.dropDatabase()" | mongo ${indatabase_name}
   	echo "db.dropDatabase()" | mongo ${outdatabase_name}
   	rm -rf processed
@@ -43,12 +37,6 @@ Cleanup() {
 
 }
 
-nomad run nginx.nmd
-nomad run discovery.nmd
-nomad run broker.nmd
-nomad run receiver_tcp.nmd
-nomad run authorizer.nmd
-
 mkdir -p $receiver_folder
 
 mkdir processed
diff --git a/examples/pipeline/in_to_out_python/check_windows.bat b/examples/pipeline/in_to_out_python/check_windows.bat
index ff761ad8262930e138399b75e106c77b25c0e89a..44d24a150d7af85f80ed349772f287b5821a1cb3 100644
--- a/examples/pipeline/in_to_out_python/check_windows.bat
+++ b/examples/pipeline/in_to_out_python/check_windows.bat
@@ -20,8 +20,6 @@ SET timeout=2
 SET timeout_producer=25
 SET nthreads=4
 
-call start_services.bat
-
 for /l %%x in (1, 1, 3) do echo db.data_default.insert({"_id":%%x,"size":6,"name":"processed\\file%%x","timestamp":1,"source":"none","buf_id":0,"dataset_substream":0,"meta":{"test":10}}) | %mongo_exe% %indatabase_name%  || goto :error
 
 mkdir %receiver_folder%
@@ -53,7 +51,6 @@ call :clean
 exit /b 1
 
 :clean
-call stop_services.bat
 echo db.dropDatabase() | %mongo_exe% %indatabase_name%
 echo db.dropDatabase() | %mongo_exe% %outdatabase_name%
 rmdir /S /Q %receiver_root_folder%
diff --git a/tests/automatic/bug_fixes/error-sending-data-using-callback-method/check_windows.bat b/tests/automatic/bug_fixes/error-sending-data-using-callback-method/check_windows.bat
index 99fff14fb7c41bd6e8c9affba9d90af8638e0cb5..c0fd0a1287af8ac39c2fa19660556a09db72655d 100644
--- a/tests/automatic/bug_fixes/error-sending-data-using-callback-method/check_windows.bat
+++ b/tests/automatic/bug_fixes/error-sending-data-using-callback-method/check_windows.bat
@@ -8,8 +8,6 @@ SET dbname = %beamtime_id%_%data_source%
 
 echo db.%dbname%.insert({dummy:1})" | %mongo_exe% %dbname%
 
-call start_services.bat
-
 mkdir %receiver_folder%
 
 echo test > file1
@@ -29,7 +27,6 @@ call :clean
 exit /b 1
 
 :clean
-call stop_services.bat
 rmdir /S /Q %receiver_root_folder%
 echo db.dropDatabase() | %mongo_exe% %dbname%
 
diff --git a/tests/automatic/consumer/next_multithread_broker/check_windows.bat b/tests/automatic/consumer/next_multithread_broker/check_windows.bat
index d995d7cec883a1b6a71059035d6b52d094fe682e..8649820ffe5e4f85b36ad0c9daebf83a7f4dd187 100644
--- a/tests/automatic/consumer/next_multithread_broker/check_windows.bat
+++ b/tests/automatic/consumer/next_multithread_broker/check_windows.bat
@@ -2,8 +2,6 @@ SET database_name=test_run_detector
 SET mongo_exe="c:\Program Files\MongoDB\Server\4.2\bin\mongo.exe"
 set token_test_run=%BT_TEST_RUN_TOKEN%
 
-call start_services.bat
-
 for /l %%x in (1, 1, 10) do echo db.data_default.insert({"_id":%%x,"size":100,"name":"%%x","timestamp":0,"source":"none","buf_id":0,"dataset_substream":0,"meta":{"test":10}}) | %mongo_exe% %database_name%  || goto :error
 
 
@@ -16,6 +14,5 @@ call :clean
 exit /b 1
 
 :clean
-call stop_services.bat
 
 echo db.dropDatabase() | %mongo_exe% %database_name%
diff --git a/tests/automatic/high_avail/broker_mongo_restart/CMakeLists.txt b/tests/automatic/high_avail/broker_mongo_restart/CMakeLists.txt
index 22840923a66a40c54efad8d3258ac3c986cdc8b4..9c50d188705d726e4850d41d8fb352d8bc2b5010 100644
--- a/tests/automatic/high_avail/broker_mongo_restart/CMakeLists.txt
+++ b/tests/automatic/high_avail/broker_mongo_restart/CMakeLists.txt
@@ -3,5 +3,5 @@ set(TARGET_NAME broker_mongo_restart)
 ################################
 # Testing
 ################################
-configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/settings/admin_token.key admin_token.key COPYONLY)
+prepare_asapo()
 add_script_test("${TARGET_NAME}-tcp" "$<TARGET_FILE:dummy-data-producer> $<TARGET_FILE:getnext> $<TARGET_PROPERTY:asapo,EXENAME> tcp" nomem)
diff --git a/tests/automatic/producer_receiver/CMakeLists.txt b/tests/automatic/producer_receiver/CMakeLists.txt
index e70ec3340028482ff5f6fb0da4dadf4939e2580b..fe492ed045288c807437cf76afb50225f44c06a9 100644
--- a/tests/automatic/producer_receiver/CMakeLists.txt
+++ b/tests/automatic/producer_receiver/CMakeLists.txt
@@ -2,6 +2,6 @@ add_subdirectory(transfer_single_file)
 add_subdirectory(transfer_single_file_bypass_buffer)
 add_subdirectory(transfer_datasets)
 
-if (UNIX)
-    add_subdirectory(check_monitoring)
-endif()
\ No newline at end of file
+#if (UNIX) #removed since monitoring willbe refactored anyway
+#    add_subdirectory(check_monitoring)
+#endif()
\ No newline at end of file
diff --git a/tests/automatic/producer_receiver/check_monitoring/CMakeLists.txt b/tests/automatic/producer_receiver/check_monitoring/CMakeLists.txt
index 80b82ae8e85c275dbd132c72e2838c1cbc7f8545..6ebdc0c1fdde998ce153744c95c17bb2f90578ff 100644
--- a/tests/automatic/producer_receiver/check_monitoring/CMakeLists.txt
+++ b/tests/automatic/producer_receiver/check_monitoring/CMakeLists.txt
@@ -3,6 +3,4 @@ set(TARGET_NAME receiver)
 ################################
 # Testing
 ################################
-prepare_asapo()
-
 add_script_test("${TARGET_NAME}-monitoring" "$<TARGET_FILE:dummy-data-producer>" nomem)
diff --git a/tests/automatic/producer_receiver/check_monitoring/check_linux.sh b/tests/automatic/producer_receiver/check_monitoring/check_linux.sh
index f1579684745cfe43871ab0fb4aafd32e0e16491c..cf0863c9b152382e380a7f0c2d0ef1dc7a0d072a 100644
--- a/tests/automatic/producer_receiver/check_monitoring/check_linux.sh
+++ b/tests/automatic/producer_receiver/check_monitoring/check_linux.sh
@@ -15,24 +15,12 @@ trap Cleanup EXIT
 Cleanup() {
 	echo cleanup
 	influx -execute "drop database ${database_name}"
-    nomad stop receiver
-    nomad stop discovery
-    nomad stop authorizer
-    nomad stop nginx
-    nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
     echo "db.dropDatabase()" | mongo ${beamtime_id}_detector
     rm -rf ${receiver_root_folder}
 }
 
 mkdir -p ${receiver_folder}
 
-nomad run authorizer.nmd
-nomad run receiver_tcp.nmd
-nomad run discovery.nmd
-nomad run nginx.nmd
-
-sleep 1
-
 $1 localhost:8400 ${beamtime_id} 100 112 4  0 100
 
 sleep 2
diff --git a/tests/automatic/producer_receiver/transfer_datasets/CMakeLists.txt b/tests/automatic/producer_receiver/transfer_datasets/CMakeLists.txt
index b29b867f1725f0f4b58f613105a3ceab059e5201..cdc5cb2b46b7a660f900309c0adfaace2db4f76a 100644
--- a/tests/automatic/producer_receiver/transfer_datasets/CMakeLists.txt
+++ b/tests/automatic/producer_receiver/transfer_datasets/CMakeLists.txt
@@ -3,5 +3,4 @@ set(TARGET_NAME transfer-datasets)
 ################################
 # Testing
 ################################
-prepare_asapo()
 add_script_test("${TARGET_NAME}" "$<TARGET_FILE:dummy-data-producer>" nomem)
diff --git a/tests/automatic/producer_receiver/transfer_datasets/check_linux.sh b/tests/automatic/producer_receiver/transfer_datasets/check_linux.sh
index 0847e13fe075c3aa005dfc4ac4902671efd16d06..f1e6b662d50ec06383485610a8fc563f7135a704 100644
--- a/tests/automatic/producer_receiver/transfer_datasets/check_linux.sh
+++ b/tests/automatic/producer_receiver/transfer_datasets/check_linux.sh
@@ -16,11 +16,6 @@ receiver_folder=${receiver_root_folder}/${facility}/gpfs/${beamline}/${year}/dat
 Cleanup() {
 	echo cleanup
 	rm -rf ${receiver_root_folder}
-    nomad stop receiver
-    nomad stop discovery
-    nomad stop authorizer
-    nomad stop nginx
-    nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
     echo "db.dropDatabase()" | mongo ${beamtime_id}_detector
     influx -execute "drop database ${database_name}"
 }
@@ -31,11 +26,6 @@ echo "db.dropDatabase()" | mongo ${beamtime_id}_detector
 # create db before consumer starts reading it. todo: git rid of it
 echo "db.${beamtime_id}_detector.insert({dummy:1})" | mongo ${beamtime_id}_detector
 
-nomad run authorizer.nmd
-nomad run nginx.nmd
-nomad run receiver_tcp.nmd
-nomad run discovery.nmd
-
 mkdir -p ${receiver_folder}
 
 $1 localhost:8400 ${beamtime_id} 100 1 1 0 30 3
diff --git a/tests/automatic/producer_receiver/transfer_datasets/check_windows.bat b/tests/automatic/producer_receiver/transfer_datasets/check_windows.bat
index 71219ec2eb4868eacbda8b0ca9c0121a6178f16f..0caa38f21a0ec805b85e30d5a3776268be9c97e1 100644
--- a/tests/automatic/producer_receiver/transfer_datasets/check_windows.bat
+++ b/tests/automatic/producer_receiver/transfer_datasets/check_windows.bat
@@ -7,8 +7,6 @@ SET receiver_folder="%receiver_root_folder%\test_facility\gpfs\%beamline%\2019\d
 
 echo db.%beamtime_id%_detector.insert({dummy:1})" | %mongo_exe% %beamtime_id%_detector
 
-call start_services.bat
-
 mkdir %receiver_folder%
 
 "%1" 127.0.0.1:8400 %beamtime_id% 100 1 1 0 30 3
@@ -36,7 +34,6 @@ call :clean
 exit /b 1
 
 :clean
-call stop_services.bat
 rmdir /S /Q %receiver_root_folder%
 echo db.dropDatabase() | %mongo_exe% %beamtime_id%_detector
 
diff --git a/tests/automatic/producer_receiver/transfer_single_file/CMakeLists.txt b/tests/automatic/producer_receiver/transfer_single_file/CMakeLists.txt
index 7b299ca60c8ad5d3df328007c44f62a58069de24..79a432652dab319da286d20998bb5d0bc80f96e5 100644
--- a/tests/automatic/producer_receiver/transfer_single_file/CMakeLists.txt
+++ b/tests/automatic/producer_receiver/transfer_single_file/CMakeLists.txt
@@ -3,5 +3,4 @@ set(TARGET_NAME transfer-single-file)
 ################################
 # Testing
 ################################
-prepare_asapo()
 add_script_test("${TARGET_NAME}" "$<TARGET_FILE:dummy-data-producer>" nomem)
diff --git a/tests/automatic/producer_receiver/transfer_single_file/check_linux.sh b/tests/automatic/producer_receiver/transfer_single_file/check_linux.sh
index c0d3435cec2d3be4b9a1ba1b9d72f11c3db5c37a..a07e7355de1baa7833fbb829c4f4e230319eba98 100644
--- a/tests/automatic/producer_receiver/transfer_single_file/check_linux.sh
+++ b/tests/automatic/producer_receiver/transfer_single_file/check_linux.sh
@@ -16,27 +16,15 @@ receiver_folder=${receiver_root_folder}/${facility}/gpfs/${beamline}/${year}/dat
 Cleanup() {
 	echo cleanup
 	rm -rf ${receiver_root_folder}
-    nomad stop receiver
-    nomad stop discovery
-    nomad stop authorizer
-    nomad stop nginx
-    nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
-    echo "db.dropDatabase()" | mongo ${beamtime_id}_detector
-    influx -execute "drop database ${database_name}"
+  echo "db.dropDatabase()" | mongo ${beamtime_id}_detector
+  influx -execute "drop database ${database_name}"
 }
 
 # create db before consumer starts reading it. todo: git rid of it
 echo "db.${beamtime_id}_detector.insert({dummy:1})" | mongo ${beamtime_id}_detector
 
-nomad run authorizer.nmd
-nomad run nginx.nmd
-nomad run receiver_tcp.nmd
-nomad run discovery.nmd
-
 mkdir -p ${receiver_folder}
 
-sleep 1
-
 $1 localhost:8400 ${beamtime_id} 100 1 1  0 30
 
 ls -ln ${receiver_folder}/processed/1 | awk '{ print $5 }'| grep 100000
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 ce3967d729f3737647b4302c4e9d07994c80e9ea..3eb1cc0b08027b7148b8a9aae0ea8a98cb2b82b8 100644
--- a/tests/automatic/producer_receiver/transfer_single_file/check_windows.bat
+++ b/tests/automatic/producer_receiver/transfer_single_file/check_windows.bat
@@ -4,11 +4,8 @@ SET beamline=test
 SET receiver_root_folder=c:\tmp\asapo\receiver\files
 SET receiver_folder="%receiver_root_folder%\test_facility\gpfs\%beamline%\2019\data\%beamtime_id%"
 
-
 echo db.%beamtime_id%_detector.insert({dummy:1})" | %mongo_exe% %beamtime_id%_detector
 
-call start_services.bat
-
 mkdir %receiver_folder%
 
 "%1" 127.0.0.1:8400 %beamtime_id% 100 1 1 0 30
@@ -27,7 +24,6 @@ call :clean
 exit /b 1
 
 :clean
-call stop_services.bat
 rmdir /S /Q %receiver_root_folder%
 echo db.dropDatabase() | %mongo_exe% %beamtime_id%_detector
 
diff --git a/tests/automatic/producer_receiver/transfer_single_file_bypass_buffer/CMakeLists.txt b/tests/automatic/producer_receiver/transfer_single_file_bypass_buffer/CMakeLists.txt
index c203baaa6123e8923e19c175f0d8ab1637d0578f..46f9fe9a400c98dfd5d51551f0a95e8184d37e00 100644
--- a/tests/automatic/producer_receiver/transfer_single_file_bypass_buffer/CMakeLists.txt
+++ b/tests/automatic/producer_receiver/transfer_single_file_bypass_buffer/CMakeLists.txt
@@ -3,5 +3,4 @@ set(TARGET_NAME transfer-single-file_bypass)
 ################################
 # Testing
 ################################
-prepare_asapo()
 add_script_test("${TARGET_NAME}" "$<TARGET_FILE:dummy-data-producer>" nomem)
diff --git a/tests/automatic/producer_receiver/transfer_single_file_bypass_buffer/check_linux.sh b/tests/automatic/producer_receiver/transfer_single_file_bypass_buffer/check_linux.sh
index bcd84032b22efe63f53adda3e6cf2259f8be9507..1635d54f1e1c7129aba3f8b38c1b8145cc2ce41f 100644
--- a/tests/automatic/producer_receiver/transfer_single_file_bypass_buffer/check_linux.sh
+++ b/tests/automatic/producer_receiver/transfer_single_file_bypass_buffer/check_linux.sh
@@ -17,11 +17,6 @@ Cleanup() {
 
 	echo cleanup
 	rm -rf ${receiver_root_folder}
-    nomad stop receiver
-    nomad stop discovery
-    nomad stop authorizer
-    nomad stop nginx
-    nomad run nginx_kill.nmd  && nomad stop -yes -purge nginx_kill
     echo "db.dropDatabase()" | mongo ${beamtime_id}_detector
     influx -execute "drop database ${database_name}"
 }
@@ -29,15 +24,8 @@ Cleanup() {
 # create db before consumer starts reading it. todo: git rid of it
 echo "db.${beamtime_id}_detector.insert({dummy:1})" | mongo ${beamtime_id}_detector
 
-nomad run authorizer.nmd
-nomad run nginx.nmd
-nomad run receiver_tcp.nmd
-nomad run discovery.nmd
-
 mkdir -p ${receiver_folder}
 
-sleep 1
-
 $1 localhost:8400 ${beamtime_id} 60000 1 1  0 30
 
 echo "db.data_default.find({"_id":1})" | mongo ${beamtime_id}_detector  > out
diff --git a/tests/automatic/producer_receiver/transfer_single_file_bypass_buffer/check_windows.bat b/tests/automatic/producer_receiver/transfer_single_file_bypass_buffer/check_windows.bat
index 7ddac5f47c1166e58d6ae55645a2cbea9ed1c07b..edef2db16b27994e328bb2a1a92ffc143b7d6057 100644
--- a/tests/automatic/producer_receiver/transfer_single_file_bypass_buffer/check_windows.bat
+++ b/tests/automatic/producer_receiver/transfer_single_file_bypass_buffer/check_windows.bat
@@ -7,8 +7,6 @@ SET receiver_folder="%receiver_root_folder%\test_facility\gpfs\%beamline%\2019\d
 
 echo db.%beamtime_id%_detector.insert({dummy:1})" | %mongo_exe% %beamtime_id%_detector
 
-call start_services.bat
-
 mkdir %receiver_folder%
 
 "%1" 127.0.0.1:8400 %beamtime_id% 60000 1 1 0 30
@@ -30,7 +28,6 @@ call :clean
 exit /b 1
 
 :clean
-call stop_services.bat
 rmdir /S /Q %receiver_root_folder%
 echo db.dropDatabase() | %mongo_exe% %beamtime_id%_detector