diff --git a/tests/automatic/consumer/consumer_api/consumer_api.cpp b/tests/automatic/consumer/consumer_api/consumer_api.cpp
index c1b0269ad30e0ced18a2eacb22a004a49af345c2..26230c93279759c59ca9505b5796e5ac2390edd9 100644
--- a/tests/automatic/consumer/consumer_api/consumer_api.cpp
+++ b/tests/automatic/consumer/consumer_api/consumer_api.cpp
@@ -327,7 +327,7 @@ void TestAll(const Args& args) {
         exit(EXIT_FAILURE);
     }
 
-    consumer->SetTimeout(100);
+    consumer->SetTimeout(1000);
     auto group_id = consumer->GenerateNewGroupId(&err);
 
     if (args.datasets == "single") {
diff --git a/tests/automatic/full_chain/simple_chain/check_linux.sh b/tests/automatic/full_chain/simple_chain/check_linux.sh
index 396e7ae32fc72ce522df7b25d43c81a48e990ffd..0ef800e40b72cc79b4b5afc22d6125d3d7894ad5 100755
--- a/tests/automatic/full_chain/simple_chain/check_linux.sh
+++ b/tests/automatic/full_chain/simple_chain/check_linux.sh
@@ -41,4 +41,3 @@ $producer_bin localhost:8400 ${beamtime_id} 100 1000 4 0 100
 echo "Start consumer in metadata only mode"
 $consumer_bin ${proxy_address} ${receiver_folder} ${beamtime_id} 2 $token 2000 1 | tee out
 grep "Processed 1000 file(s)" out
-grep -i "Using connection type: No connection" out
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 48b6d86d3d585211c3d5906f427cf3b2f63a73b7..b6c57df2037f72ea97556223f1b36914144971c2 100644
--- a/tests/automatic/full_chain/simple_chain_dataset/check_linux.sh
+++ b/tests/automatic/full_chain/simple_chain_dataset/check_linux.sh
@@ -41,5 +41,4 @@ echo "Start consumer in metadata only mode"
 $consumer_bin ${proxy_address} ${receiver_folder} ${beamtime_id} 2 $token 5000 1 1 | tee out
 grep "Processed 100 dataset(s)" out
 grep "with 500 file(s)" out
-grep -i "Using connection type: No connection" out
 
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 bac120a9a42a3f3345af646cbd94ea2cf16ef764..25bbf6f200c33211b0876d5cf01e0726325d4cca 100644
--- a/tests/automatic/full_chain/simple_chain_filegen/check_linux.sh
+++ b/tests/automatic/full_chain/simple_chain_filegen/check_linux.sh
@@ -51,7 +51,6 @@ echo hello > /tmp/asapo/test_in/processed/test2/file1
 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
-grep -i "Using connection type: No connection" out
 
 test ! -f /tmp/asapo/test_in/processed/test1/file1
 test ! -f /tmp/asapo/test_in/processed/test1/file2
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 bd9fae0ac61f46ad063cab90c3eb3b335bbe5ecc..08389b5992f05f0c85fcacd017e1c8e10faadc0e 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
@@ -54,7 +54,6 @@ echo "Start consumer in metadata only mode"
 $consumer_bin ${proxy_address} ${receiver_folder} ${beamtime_id} 2 $token 2000 1 1 | tee out
 grep "Processed 1 dataset(s)" out
 grep "with 3 file(s)" out
-grep -i "Using connection type: No connection" out
 
 test -f /tmp/asapo/test_in/processed/test1/file1
 test -f /tmp/asapo/test_in/processed/test1/file2
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 e75e3b5bcb599432310c8fecda0187dbc89996fa..ad6c963d362aba5671c96a93d02ba5b845c4c10f 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
@@ -61,4 +61,3 @@ echo "Start consumer in metadata only mode"
 $consumer_bin ${proxy_address} $network_type ${receiver_folder} ${beamtime_id} 2 $token 2000 1 1 | tee out
 grep "Processed 2 dataset(s)" out
 grep "with 4 file(s)" out
-grep -i "Using connection type: No connection" out
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 f545926676753dde81c19ce33e55c986dad2553d..732a90fa6a0a0f516f6fde2eb2e756249d0ecc68 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
@@ -42,7 +42,6 @@ REM consumer
 type out.txt
 findstr /i /l /c:"Processed 2 dataset(s)" out.txt || goto :error
 findstr /i /l /c:"with 4 file(s)" out.txt || goto :error
-findstr /i /l /c:"Using connection type: No connection" out.txt || goto :error
 
 goto :clean
 
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 e02147fd621836aaf0ba2bfaa7339a37bf0b3915..abcf4feac9867b35ffbab4250d106dea6b41f08a 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
@@ -56,5 +56,4 @@ grep "Processed 3 file(s)" out.txt
 grep "hello1" out.txt
 grep "hello2" out.txt
 grep "hello3" out.txt
-grep -i "Using connection type: No connection" out.txt
 
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 4ce03a1a75a3b02357e5397ac57c667ef6cdb781..bfe1901291312e5e88a181e5a7c826893c3a3dee 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
@@ -40,7 +40,6 @@ findstr /i /l /c:"Processed 3 file(s)" out.txt || goto :error
 findstr /i /l /c:"hello1" out.txt || goto :error
 findstr /i /l /c:"hello2" out.txt || goto :error
 findstr /i /l /c:"hello3" out.txt || goto :error
-findstr /i /l /c:"Using connection type: No connection" out.txt || goto :error
 
 
 goto :clean
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 5142eeae87612ffd82a124c6fdcfd87aedaa7372..abb9995dbb425a9244b090079cee89d3c9f039de 100644
--- a/tests/automatic/full_chain/simple_chain_metadata/check_linux.sh
+++ b/tests/automatic/full_chain/simple_chain_metadata/check_linux.sh
@@ -40,4 +40,3 @@ $producer_bin localhost:8400 ${beamtime_id} 100 0 1 0 1000
 echo "Start consumer in metadata only mode"
 $consumer_bin ${proxy_address} ${receiver_folder} ${beamtime_id} 2 $token 1000 1 | tee out
 grep "dummy_meta" out
-grep -i "Using connection type: No connection" out
diff --git a/tests/automatic/full_chain/two_beamlines/CMakeLists.txt b/tests/automatic/full_chain/two_beamlines/CMakeLists.txt
index c2f6d237e2902a2c17a748ccb1b99f6492ca10ef..71ec8879ddee42e89de716a7af16a6e7d10a9444 100644
--- a/tests/automatic/full_chain/two_beamlines/CMakeLists.txt
+++ b/tests/automatic/full_chain/two_beamlines/CMakeLists.txt
@@ -3,12 +3,11 @@ set(TARGET_NAME full_chain_two_beamlines)
 ################################
 # Testing
 ################################
-add_script_test("${TARGET_NAME}-tcp" "$<TARGET_FILE:dummy-data-producer> $<TARGET_FILE:getnext> $<TARGET_PROPERTY:asapo,EXENAME> tcp" nomem)
 prepare_asapo()
 
+add_script_test("${TARGET_NAME}-tcp" "$<TARGET_FILE:dummy-data-producer> $<TARGET_FILE:getnext> $<TARGET_PROPERTY:asapo,EXENAME> tcp" nomem)
 if (ENABLE_LIBFABRIC)
     if (ENABLE_LIBFABRIC_LOCALHOST)
-        configure_file(${CMAKE_SOURCE_DIR}/tests/automatic/settings/receiver_fabric.json.tpl.lin.in receiver_fabric.json.tpl @ONLY)
         add_script_test("${TARGET_NAME}-fabric" "$<TARGET_FILE:dummy-data-producer> $<TARGET_FILE:getnext> $<TARGET_PROPERTY:asapo,EXENAME> fabric" nomem)
     else ()
         message(WARNING "Disabled automated LibFabric of '${TARGET_NAME}-fabric' test because 'ENABLE_LIBFABRIC_LOCALHOST' is not enabled.")