diff --git a/CMakeModules/prepare_asapo.cmake b/CMakeModules/prepare_asapo.cmake
index 7ef66d96fc259d1a812691f43e245a7d2205164f..66c7e52517e3af216024fe3c1b3896d0ce37ddac 100644
--- a/CMakeModules/prepare_asapo.cmake
+++ b/CMakeModules/prepare_asapo.cmake
@@ -27,6 +27,8 @@ function(prepare_asapo)
         configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/settings/authorizer_settings.json.tpl.win authorizer.json.tpl COPYONLY)
         configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/common_scripts/start_services.bat start_services.bat COPYONLY)
         configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/common_scripts/stop_services.bat stop_services.bat COPYONLY)
+        configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/common_scripts/start_authorizer.bat start_authorizer.bat COPYONLY)
+        configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/common_scripts/stop_authorizer.bat stop_authorizer.bat COPYONLY)
 
         configure_file(${CMAKE_SOURCE_DIR}/config/nomad/receiver_tcp.nmd.in  receiver_tcp.nmd @ONLY)
         configure_file(${CMAKE_SOURCE_DIR}/config/nomad/nginx_kill_win.nmd nginx_kill.nmd @ONLY)
diff --git a/producer/api/cpp/unittests/test_producer_impl.cpp b/producer/api/cpp/unittests/test_producer_impl.cpp
index 17d038597992c201a9cba0e9b9281b747bfca28b..13cafa963dfbde3e1fb2e9121e1ee19b938c034a 100644
--- a/producer/api/cpp/unittests/test_producer_impl.cpp
+++ b/producer/api/cpp/unittests/test_producer_impl.cpp
@@ -59,7 +59,6 @@ TEST(ProducerImpl, Constructor) {
     ASSERT_THAT(dynamic_cast<asapo::AbstractLogger*>(producer.log__), Ne(nullptr));
     ASSERT_THAT(dynamic_cast<asapo::RequestPool*>(producer.request_pool__.get()), Ne(nullptr));
     ASSERT_THAT(dynamic_cast<const asapo::HttpClient*>(producer.httpclient__.get()), Ne(nullptr));
-
 }
 
 class ProducerImplTests : public testing::Test {
@@ -68,7 +67,7 @@ class ProducerImplTests : public testing::Test {
   asapo::ProducerRequestHandlerFactory factory{&service};
   testing::NiceMock<asapo::MockLogger> mock_logger;
   testing::NiceMock<MockRequestPull> mock_pull{&factory, &mock_logger};
-  std::string expected_server_uri = "test:8400";
+  std::string expected_server_uri = "localhost:9400";
   asapo::ProducerImpl producer{expected_server_uri, 1, 3600000, asapo::RequestHandlerType::kTcp};
   uint64_t expected_size = 100;
   uint64_t expected_id = 10;
diff --git a/tests/automatic/asapo_fabric/parallel_data_transfer.cpp b/tests/automatic/asapo_fabric/parallel_data_transfer.cpp
index cf5e490000ce38ef122ca30396ba2a81cc680b1a..ec68b712b4b25f0a8c3bd653d5784cfd0a2cd423 100644
--- a/tests/automatic/asapo_fabric/parallel_data_transfer.cpp
+++ b/tests/automatic/asapo_fabric/parallel_data_transfer.cpp
@@ -18,7 +18,7 @@ std::future<void> serverIsDoneFuture = serverIsDone.get_future();
 
 constexpr size_t kRdmaSize = 5 * 1024 * 1024;
 constexpr int kServerThreads = 2;
-constexpr int kEachInstanceRuns = 10;
+constexpr int kEachInstanceRuns = 3;
 constexpr int kClientThreads = 4;
 
 void ServerChildThread(FabricServer* server, std::atomic<int>* serverTotalRequests, char* expectedRdmaBuffer) {
diff --git a/tests/automatic/asapo_fabric/simple_data_transfer.cpp b/tests/automatic/asapo_fabric/simple_data_transfer.cpp
index 28a2b9ce6316fe3d429618494c742bd6c9ee403d..86054cb9b2f263a3cd70b62dd55090c897e8a0c6 100644
--- a/tests/automatic/asapo_fabric/simple_data_transfer.cpp
+++ b/tests/automatic/asapo_fabric/simple_data_transfer.cpp
@@ -17,7 +17,7 @@ std::promise<void> serverIsDone;
 std::future<void> serverIsDoneFuture = serverIsDone.get_future();
 
 constexpr int kTotalRuns = 3;
-constexpr int kEachInstanceRuns = 5;
+constexpr int kEachInstanceRuns = 2;
 constexpr size_t kRdmaSize = 5 * 1024 * 1024;
 
 void ServerMasterThread(const std::string& hostname, uint16_t port, char* expectedRdmaBuffer) {
diff --git a/tests/automatic/broker/get_last/check_windows.bat b/tests/automatic/broker/get_last/check_windows.bat
index 6ffe451b5789577ee2de913cf9ca6fbb56d28d0a..0de73dda41882495abd00f018a2f24ca87aaf9cc 100644
--- a/tests/automatic/broker/get_last/check_windows.bat
+++ b/tests/automatic/broker/get_last/check_windows.bat
@@ -7,10 +7,7 @@ echo db.data_default.insert({"_id":2}) | %mongo_exe% %database_name%  || goto :e
 set full_name="%1"
 set short_name="%~nx1"
 
-c:\opt\consul\nomad run authorizer.nmd
-c:\opt\consul\nomad run nginx.nmd
-
-ping 192.0.2.1 -n 1 -w 2000 > nul
+call start_authorizer.bat
 
 
 start /B "" "%full_name%" -config settings.json
@@ -53,6 +50,4 @@ exit /b 1
 Taskkill /IM "%short_name%" /F
 echo db.dropDatabase() | %mongo_exe% %database_name%
 del /f groupid
-c:\opt\consul\nomad stop authorizer
-c:\opt\consul\nomad stop nginx
-c:\opt\consul\nomad run nginx_kill.nmd  && c:\opt\consul\nomad stop -yes -purge nginx_kill
+call stop_authorizer.bat
diff --git a/tests/automatic/broker/get_meta/check_windows.bat b/tests/automatic/broker/get_meta/check_windows.bat
index c5dab94bb7b03fb541d4e14e44d360a8171f3327..9e1e9e8d929aea59bf9183230cf6e3bc63acc993 100644
--- a/tests/automatic/broker/get_meta/check_windows.bat
+++ b/tests/automatic/broker/get_meta/check_windows.bat
@@ -6,10 +6,7 @@ echo db.meta.insert({"_id":0}) | %mongo_exe% %database_name%  || goto :error
 set full_name="%1"
 set short_name="%~nx1"
 
-c:\opt\consul\nomad run authorizer.nmd
-c:\opt\consul\nomad run nginx.nmd
-
-ping 192.0.2.1 -n 1 -w 2000 > nul
+call start_authorizer.bat
 
 start /B "" "%full_name%" -config settings.json
 
@@ -32,6 +29,4 @@ exit /b 1
 Taskkill /IM "%short_name%" /F
 echo db.dropDatabase() | %mongo_exe% %database_name%
 del /f groupid
-c:\opt\consul\nomad stop authorizer
-c:\opt\consul\nomad stop nginx
-c:\opt\consul\nomad run nginx_kill.nmd  && c:\opt\consul\nomad stop -yes -purge nginx_kill
+call stop_authorizer.bat
diff --git a/tests/automatic/broker/get_next/check_windows.bat b/tests/automatic/broker/get_next/check_windows.bat
index 81330cd76affe7defc6a0a30e6ae57cdf1b03976..b32059d4fa1877cb5da876a37f3d6231f00c345b 100644
--- a/tests/automatic/broker/get_next/check_windows.bat
+++ b/tests/automatic/broker/get_next/check_windows.bat
@@ -9,10 +9,7 @@ set short_name="%~nx1"
 
 set token=%BT_DATA_TOKEN%
 
-c:\opt\consul\nomad run authorizer.nmd
-c:\opt\consul\nomad run nginx.nmd
-
-ping 192.0.2.1 -n 1 -w 2000 > nul
+call start_authorizer.bat
 
 start /B "" "%full_name%" -config settings.json
 
@@ -39,6 +36,4 @@ Taskkill /IM "%short_name%" /F
 echo db.dropDatabase() | %mongo_exe% %database_name%
 del /f token
 del /f groupid
-c:\opt\consul\nomad stop authorizer
-c:\opt\consul\nomad stop nginx
-c:\opt\consul\nomad run nginx_kill.nmd  && c:\opt\consul\nomad stop -yes -purge nginx_kill
+call stop_authorizer.bat
diff --git a/tests/automatic/common_scripts/start_authorizer.bat b/tests/automatic/common_scripts/start_authorizer.bat
new file mode 100644
index 0000000000000000000000000000000000000000..de5ada62fd36bcc868e23b0831c2883fc0eb40c2
--- /dev/null
+++ b/tests/automatic/common_scripts/start_authorizer.bat
@@ -0,0 +1,24 @@
+c:\opt\consul\nomad run authorizer.nmd
+c:\opt\consul\nomad run nginx.nmd
+
+ping 192.0.2.1 -n 1 -w 3000 > nul
+
+set i=0
+:repeat
+set /a i=%i%+1
+echo %i%
+if %i% EQU 20 (
+    goto :error
+)
+ping 192.0.2.1 -n 1 -w 1000 >nul
+curl --silent --data "" 127.0.0.1:8400/asapo-authorizer/authorize --stderr -  | findstr /c:"Bad Request" || goto :repeat
+echo asapo services ready
+
+goto :clean
+
+:error
+echo error starting  asapo services
+call :clean
+exit /b 1
+
+:clean
diff --git a/tests/automatic/common_scripts/start_services.bat b/tests/automatic/common_scripts/start_services.bat
index cbe15b437378469b298ce4355f6bd4ffa592ef4b..452c5937b596e59ef8c4802d4ba8defb5eb4a495 100644
--- a/tests/automatic/common_scripts/start_services.bat
+++ b/tests/automatic/common_scripts/start_services.bat
@@ -20,3 +20,11 @@ curl --silent --fail 127.0.0.1:8400/asapo-discovery/v0.1/asapo-receiver?protocol
 curl --silent --fail 127.0.0.1:8400/asapo-discovery/v0.1/asapo-broker?protocol=v0.1 --stderr - | findstr 127.0.0.1 || goto :repeat
 curl --silent --fail 127.0.0.1:8400/asapo-discovery/v0.1/asapo-file-transfer?protocol=v0.1 --stderr -  | findstr 127.0.0.1 || goto :repeat
 echo discovery ready
+
+goto :clean
+
+:error
+echo error starting  asapo services
+exit /b 1
+
+:clean
diff --git a/tests/automatic/common_scripts/stop_authorizer.bat b/tests/automatic/common_scripts/stop_authorizer.bat
new file mode 100644
index 0000000000000000000000000000000000000000..27b0b30b9ed382e7baee3527e78d392cddea5c1e
--- /dev/null
+++ b/tests/automatic/common_scripts/stop_authorizer.bat
@@ -0,0 +1,3 @@
+c:\opt\consul\nomad stop authorizer
+c:\opt\consul\nomad stop nginx
+c:\opt\consul\nomad run nginx_kill.nmd  && c:\opt\consul\nomad stop -yes -purge nginx_kill
diff --git a/tests/automatic/file_transfer_service/rest_api/check_windows.bat b/tests/automatic/file_transfer_service/rest_api/check_windows.bat
index f34c5ac4ad95bb05b5d802d95b331ae5985db9c9..9ff35c7a84548387e451e1addf8d73a3741ca1c4 100644
--- a/tests/automatic/file_transfer_service/rest_api/check_windows.bat
+++ b/tests/automatic/file_transfer_service/rest_api/check_windows.bat
@@ -7,7 +7,7 @@ set file_transfer_folder=%file_transfer_folder:\=\\%
 c:\opt\consul\nomad run authorizer.nmd
 c:\opt\consul\nomad run file_transfer.nmd
 
-ping 192.0.2.1 -n 1 -w 1000 > nul
+ping 192.0.2.1 -n 1 -w 5000 > nul
 
 set token=%BT_AAA_TOKEN%
 
diff --git a/tests/automatic/full_chain/simple_chain/check_linux.sh b/tests/automatic/full_chain/simple_chain/check_linux.sh
index 0baea68ff6ff629c0b1ab4881e1440edba4e9782..95a64c6f9305995a47cf602e240e3844cec33ebc 100755
--- a/tests/automatic/full_chain/simple_chain/check_linux.sh
+++ b/tests/automatic/full_chain/simple_chain/check_linux.sh
@@ -46,7 +46,7 @@ nomad run receiver_tcp.nmd # Only use TCP because the consumer will only use met
 nomad run discovery.nmd
 nomad run broker.nmd
 
-sleep 1
+sleep 5
 
 token=`$asapo_tool_bin token -endpoint http://localhost:8400/asapo-authorizer -secret admin_token.key -types read $beamtime_id`
 
diff --git a/tests/automatic/full_chain/simple_chain_dataset/check_linux.sh b/tests/automatic/full_chain/simple_chain_dataset/check_linux.sh
index 93f9960a88f635916d0717f2ee42c27112dd4706..077e620d4adc24ad6b8d7cd03aaee4557129b51e 100644
--- a/tests/automatic/full_chain/simple_chain_dataset/check_linux.sh
+++ b/tests/automatic/full_chain/simple_chain_dataset/check_linux.sh
@@ -43,7 +43,7 @@ nomad run receiver_${network_type}.nmd
 nomad run discovery.nmd
 nomad run broker.nmd
 
-sleep 1
+sleep 5
 
 token=`$asapo_tool_bin token -endpoint http://localhost:8400/asapo-authorizer -secret admin_token.key -types read $beamtime_id`
 
diff --git a/tests/automatic/full_chain/simple_chain_filegen/check_linux.sh b/tests/automatic/full_chain/simple_chain_filegen/check_linux.sh
index 0bd69ff985116b9f46df3ace65571196af175243..58d3eef2061b56fb15a553694bed85d3e28b3229 100644
--- a/tests/automatic/full_chain/simple_chain_filegen/check_linux.sh
+++ b/tests/automatic/full_chain/simple_chain_filegen/check_linux.sh
@@ -44,7 +44,7 @@ nomad run receiver_${network_type}.nmd
 nomad run discovery.nmd
 nomad run broker.nmd
 
-sleep 1
+sleep 5
 
 token=`$asapo_tool_bin token -endpoint http://localhost:8400/asapo-authorizer -secret admin_token.key -types read $beamtime_id`
 
@@ -63,6 +63,8 @@ echo hello > /tmp/asapo/test_in/processed/test1/file1
 echo hello > /tmp/asapo/test_in/processed/test1/file2
 echo hello > /tmp/asapo/test_in/processed/test2/file1
 
+sleep 1
+
 echo "Start consumer in metadata only mode"
 $consumer_bin ${proxy_address} ${receiver_folder} ${beamtime_id} 2 $token 1000 1 | tee /dev/stderr out
 grep "Processed 3 file(s)" out
diff --git a/tests/automatic/full_chain/simple_chain_filegen_batches/check_linux.sh b/tests/automatic/full_chain/simple_chain_filegen_batches/check_linux.sh
index 553a3b90c33b12c4cbaf3e3d6750596b4f5e8db3..f8deeae836a5198f4ef0275539a4d83811939821 100644
--- a/tests/automatic/full_chain/simple_chain_filegen_batches/check_linux.sh
+++ b/tests/automatic/full_chain/simple_chain_filegen_batches/check_linux.sh
@@ -47,14 +47,10 @@ nomad run receiver_tcp.nmd
 nomad run discovery.nmd
 nomad run broker.nmd
 
-sleep 1
+sleep 5
 
 token=`$asapo_tool_bin token -endpoint http://localhost:8400/asapo-authorizer -secret admin_token.key -types read $beamtime_id`
 
-
-mkdir  /tmp/asapo/test_in/processed/test1
-mkdir  /tmp/asapo/test_in/processed/test2
-
 #producer
 echo "Start producer"
 mkdir -p ${receiver_folder}
@@ -63,6 +59,10 @@ producerid=`echo $!`
 
 sleep 1
 
+mkdir  /tmp/asapo/test_in/processed/test1
+mkdir  /tmp/asapo/test_in/processed/test2
+
+
 echo hello > /tmp/asapo/test_in/processed/test1/file1
 echo hello > /tmp/asapo/test_in/processed/test1/file2
 echo hello > /tmp/asapo/test_in/processed/test2/file1
diff --git a/tests/automatic/full_chain/simple_chain_filegen_multisource/check_linux.sh b/tests/automatic/full_chain/simple_chain_filegen_multisource/check_linux.sh
index 9619e32b3ceb6c42a966fc7a501fa623f1b6b576..f66cacbaba7e5ca6ce6169969a8630103d6f98dc 100644
--- a/tests/automatic/full_chain/simple_chain_filegen_multisource/check_linux.sh
+++ b/tests/automatic/full_chain/simple_chain_filegen_multisource/check_linux.sh
@@ -45,7 +45,7 @@ nomad run receiver_tcp.nmd
 nomad run discovery.nmd
 nomad run broker.nmd
 
-sleep 1
+sleep 5
 
 token=`$asapo_tool_bin token -endpoint http://localhost:8400/asapo-authorizer -secret admin_token.key -types read $beamtime_id`
 
diff --git a/tests/automatic/full_chain/simple_chain_filegen_readdata_cache/check_linux.sh b/tests/automatic/full_chain/simple_chain_filegen_readdata_cache/check_linux.sh
index 0e12523a64c39ebd2f6f34be348d791804f4b395..55d4b353fdb114af2148034668fed7e677f5e93b 100644
--- a/tests/automatic/full_chain/simple_chain_filegen_readdata_cache/check_linux.sh
+++ b/tests/automatic/full_chain/simple_chain_filegen_readdata_cache/check_linux.sh
@@ -47,7 +47,7 @@ nomad run receiver_${network_type}.nmd
 nomad run discovery.nmd
 nomad run broker.nmd
 
-sleep 1
+sleep 5
 
 token=`$3 token -endpoint http://localhost:8400/asapo-authorizer -secret admin_token.key -types read $beamtime_id`
 
@@ -60,6 +60,8 @@ sleep 1
 mkdir  /tmp/asapo/test_in/processed/test1
 mkdir  /tmp/asapo/test_in/processed/test2
 
+sleep 1
+
 echo -n hello1 > /tmp/asapo/test_in/processed/test1/file1
 echo -n hello2 > /tmp/asapo/test_in/processed/test1/file2
 echo -n hello3 > /tmp/asapo/test_in/processed/test2/file1
@@ -71,7 +73,3 @@ grep "hello1" out.txt
 grep "hello2" out.txt
 grep "hello3" out.txt
 grep -i "Using connection type: $network_type" out.txt
-
-sleep 12
-
-influx -execute "select sum(n_requests) from statistics where receiver_ds_tag !=''" -database=${monitor_database_name} -format=json  | jq .results[0].series[0].values[0][1] | tee /dev/stderr | grep 3
diff --git a/tests/automatic/full_chain/simple_chain_filegen_readdata_file/check_linux.sh b/tests/automatic/full_chain/simple_chain_filegen_readdata_file/check_linux.sh
index 748986058523fcfb329688bf4c3eda99234a61d0..8cfcc248787193c79fb3b65b462dde5693d762bd 100644
--- a/tests/automatic/full_chain/simple_chain_filegen_readdata_file/check_linux.sh
+++ b/tests/automatic/full_chain/simple_chain_filegen_readdata_file/check_linux.sh
@@ -47,7 +47,7 @@ nomad run receiver_${network_type}.nmd
 nomad run discovery.nmd
 nomad run broker.nmd
 
-sleep 1
+sleep 5
 
 token=`$asapo_tool_bin token -endpoint http://localhost:8400/asapo-authorizer -secret admin_token.key -types read $beamtime_id`
 
diff --git a/tests/automatic/full_chain/simple_chain_metadata/check_linux.sh b/tests/automatic/full_chain/simple_chain_metadata/check_linux.sh
index 70fc2dfe2b509b1e783076f89c2cf9403d295766..6735603d72c39e13cdc2d59d6abb21d3eedd58c8 100644
--- a/tests/automatic/full_chain/simple_chain_metadata/check_linux.sh
+++ b/tests/automatic/full_chain/simple_chain_metadata/check_linux.sh
@@ -42,7 +42,7 @@ nomad run receiver_tcp.nmd # Only use TCP because the consumer will only use met
 nomad run discovery.nmd
 nomad run broker.nmd
 
-sleep 1
+sleep 5
 
 token=`$asapo_tool_bin token -endpoint http://localhost:8400/asapo-authorizer -secret admin_token.key -types read $beamtime_id`
 
diff --git a/tests/automatic/full_chain/simple_chain_raw/check_linux.sh b/tests/automatic/full_chain/simple_chain_raw/check_linux.sh
index 176da746d3e600097f498ed8084b5a1bdc4e8bc8..5ec50d63e024ad3c92c42d345a5c078d3f5a1ba7 100644
--- a/tests/automatic/full_chain/simple_chain_raw/check_linux.sh
+++ b/tests/automatic/full_chain/simple_chain_raw/check_linux.sh
@@ -37,7 +37,7 @@ nomad run receiver_tcp.nmd
 nomad run discovery.nmd
 nomad run broker.nmd
 
-sleep 1
+sleep 5
 
 token=`$3 token -endpoint http://localhost:8400/asapo-authorizer -secret admin_token.key -types read $beamtime_id`
 
diff --git a/tests/automatic/full_chain/simple_chain_raw/check_windows.bat b/tests/automatic/full_chain/simple_chain_raw/check_windows.bat
index c60ca7696ac0ddd01837f8cbf94d9c468e50a83a..8df2f77f3984614954a85585921fd6370b773c6d 100644
--- a/tests/automatic/full_chain/simple_chain_raw/check_windows.bat
+++ b/tests/automatic/full_chain/simple_chain_raw/check_windows.bat
@@ -16,9 +16,8 @@ set /P token=< token
 
 
 REM producer
-mkdir %receiver_folder%
 start /B "" "%1" %proxy_address% %beamtime_id% 100 10 4 100 100
-ping 192.0.2.1 -n 1 -w 1000 > nul
+ping 192.0.2.1 -n 1 -w 3000 > nul
 
 REM consumer
 "%2" %proxy_address% "_" %beamtime_id% 2 %token% 5000  1 > out.txt
diff --git a/tests/automatic/full_chain/simple_chain_usermeta_python/check_linux.sh b/tests/automatic/full_chain/simple_chain_usermeta_python/check_linux.sh
index 129b8298c423c022e4c5887a7ff8119a98b02474..edbb9a24d7804afa8ce7c358db16e70ee6723640 100644
--- a/tests/automatic/full_chain/simple_chain_usermeta_python/check_linux.sh
+++ b/tests/automatic/full_chain/simple_chain_usermeta_python/check_linux.sh
@@ -41,7 +41,7 @@ nomad run receiver_tcp.nmd # Only use TCP because the consumer will only use met
 nomad run discovery.nmd
 nomad run broker.nmd
 
-sleep 2
+sleep 5
 
 token=`$asapo_tool_bin token -endpoint http://localhost:8400/asapo-authorizer -secret admin_token.key -types read $beamtime_id`
 
diff --git a/tests/automatic/full_chain/two_beamlines/check_linux.sh b/tests/automatic/full_chain/two_beamlines/check_linux.sh
index f43ddad7bb44e55d68bae73b56c271f082c1aabb..70577f6c619a5ae7a966090d212f431bba87d35e 100644
--- a/tests/automatic/full_chain/two_beamlines/check_linux.sh
+++ b/tests/automatic/full_chain/two_beamlines/check_linux.sh
@@ -52,7 +52,7 @@ nomad run receiver_${network_type}.nmd
 nomad run discovery.nmd
 nomad run broker.nmd
 
-sleep 3
+sleep 5
 
 token1=`$asapo_tool_bin token -endpoint http://localhost:8400/asapo-authorizer -secret admin_token.key -types read $beamtime_id1`
 token2=`$asapo_tool_bin token -endpoint http://localhost:8400/asapo-authorizer -secret admin_token.key -types read $beamtime_id2`
diff --git a/tests/automatic/full_chain/two_streams/check_linux.sh b/tests/automatic/full_chain/two_streams/check_linux.sh
index 835de3037b542248963514aaf3cba5db493d8d34..0e70b549b04dddf234a3f9ee3aaf7556228dce0b 100644
--- a/tests/automatic/full_chain/two_streams/check_linux.sh
+++ b/tests/automatic/full_chain/two_streams/check_linux.sh
@@ -46,7 +46,7 @@ nomad run receiver_tcp.nmd
 nomad run discovery.nmd
 nomad run broker.nmd
 
-sleep 3
+sleep 5
 
 token=`$asapo_tool_bin token -endpoint http://localhost:8400/asapo-authorizer -secret admin_token.key -types read $beamtime_id`
 
diff --git a/tests/automatic/high_avail/receiver_mongo_restart/check_linux.sh b/tests/automatic/high_avail/receiver_mongo_restart/check_linux.sh
index 11199a46a2c3cb343df16f8a9eab4274ce7531ef..d56abbb21fba5d8773db7d5cbf903742ef037bc1 100644
--- a/tests/automatic/high_avail/receiver_mongo_restart/check_linux.sh
+++ b/tests/automatic/high_avail/receiver_mongo_restart/check_linux.sh
@@ -83,7 +83,7 @@ start_mongo
 
 wait
 
-echo "db.data_default.validate(true)" | mongo --port 27016 ${beamtime_id}_detector
+echo "db.data_default.validate({full: true})" | mongo --port 27016 ${beamtime_id}_detector
 
 echo processed files:
 echo "db.data_default.count()" | mongo --port 27016 ${beamtime_id}_detector
diff --git a/tests/automatic/system_io/read_subdirectories/CMakeLists.txt b/tests/automatic/system_io/read_subdirectories/CMakeLists.txt
index f73702922ef62fc6970dcdb1d8860af15e5a0f36..6b24dd256c0df56f1fafef382d2828af3a4941c4 100644
--- a/tests/automatic/system_io/read_subdirectories/CMakeLists.txt
+++ b/tests/automatic/system_io/read_subdirectories/CMakeLists.txt
@@ -23,7 +23,7 @@ add_test_setup_cleanup(${TARGET_NAME})
 IF(WIN32)
     add_integration_test(${TARGET_NAME} list_folders "test test\\subtest1test\\subtest1\\subtest2test\\subtest3test\\subtest3\\subtest4")
 ELSE()
-    add_integration_test(${TARGET_NAME} list_folders "test test/subtest3test/subtest3/subtest4test/subtest1test/subtest1/subtest2")
+    add_integration_test(${TARGET_NAME} list_folders "test test/subtest1test/subtest1/subtest2")
 ENDIF(WIN32)
 
 
diff --git a/tests/automatic/system_io/read_subdirectories/setup_linux.sh b/tests/automatic/system_io/read_subdirectories/setup_linux.sh
index bd288c5178bd4e1c7554978d6627b463cd458643..0f4baaccc8b9d4b30def396e9c4acfe48b359f67 100644
--- a/tests/automatic/system_io/read_subdirectories/setup_linux.sh
+++ b/tests/automatic/system_io/read_subdirectories/setup_linux.sh
@@ -2,8 +2,6 @@
 
 mkdir -p test/subtest1/subtest2
 sleep 0.1
-mkdir -p test/subtest3/subtest4/
-sleep 0.1
 
 mkdir test_noaccess1
 chmod -rx test_noaccess1
diff --git a/tests/valgrind.suppressions b/tests/valgrind.suppressions
index 2c21d104a09bbf2e4a911e3f38cdbda5e5e16516..5df24de1c40daa0ee06de0720e6b1f4580b66377 100644
--- a/tests/valgrind.suppressions
+++ b/tests/valgrind.suppressions
@@ -95,7 +95,6 @@
    Memcheck:Param
    socketcall.sendto(msg)
    fun:send
-   fun:ofi_send_socket
 }
 {
    asapo_fabric__sockets__leak