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 b3d1a1a8dee7596f76b81619cf751626ba973a2d..05c5efefe503450f47731c93625ea36a332bcc15 100644
--- a/tests/automatic/full_chain/simple_chain_filegen/check_windows.bat
+++ b/tests/automatic/full_chain/simple_chain_filegen/check_windows.bat
@@ -1,3 +1,5 @@
+
+
 SET mongo_exe="c:\Program Files\MongoDB\Server\3.6\bin\mongo.exe"
 SET beamtime_id=asapo_test
 SET beamline=test
@@ -23,16 +25,18 @@ c:\opt\consul\nomad run nginx.nmd
 ping 1.0.0.0 -n 10 -w 100 > nul
 
 REM producer
+mkdir %receiver_folder%
 mkdir  c:\tmp\asapo\test_in\test1
 mkdir  c:\tmp\asapo\test_in\test2
 start /B "" "%1" test.json
-ping 1.0.0.0 -n 1 -w 100 > nul
+
+ping 1.0.0.0 -n 3 -w 100 > nul
 
 echo hello > c:\tmp\asapo\test_in\test1\file1
 echo hello > c:\tmp\asapo\test_in\test1\file2
 echo hello > c:\tmp\asapo\test_in\test2\file2
 
-ping 1.0.0.0 -n 1 -w 100 > nul
+ping 1.0.0.0 -n 10 -w 100 > nul
 
 
 REM worker
diff --git a/tests/manual/tests_via_nomad/asapo-test.nomad b/tests/manual/tests_via_nomad/asapo-test_dummy_producer.nomad
similarity index 100%
rename from tests/manual/tests_via_nomad/asapo-test.nomad
rename to tests/manual/tests_via_nomad/asapo-test_dummy_producer.nomad
diff --git a/tests/manual/tests_via_nomad/asapo-test_filegen.nomad b/tests/manual/tests_via_nomad/asapo-test_filegen_only.nomad
similarity index 100%
rename from tests/manual/tests_via_nomad/asapo-test_filegen.nomad
rename to tests/manual/tests_via_nomad/asapo-test_filegen_only.nomad
diff --git a/tests/manual/tests_via_nomad/asapo-test_produceronly.nomad b/tests/manual/tests_via_nomad/asapo-test_filemon_producer_tolocal.nomad
similarity index 100%
rename from tests/manual/tests_via_nomad/asapo-test_produceronly.nomad
rename to tests/manual/tests_via_nomad/asapo-test_filemon_producer_tolocal.nomad
diff --git a/tests/manual/tests_via_nomad/asapo-test_filemon_producer.nomad b/tests/manual/tests_via_nomad/asapo-test_filemon_producer_toreceiver.nomad
similarity index 99%
rename from tests/manual/tests_via_nomad/asapo-test_filemon_producer.nomad
rename to tests/manual/tests_via_nomad/asapo-test_filemon_producer_toreceiver.nomad
index b10e845fba8d967613210c7c26177960e295d693..99bb0952c2286d056b62528d06c538c2aa5a20f9 100644
--- a/tests/manual/tests_via_nomad/asapo-test_filemon_producer.nomad
+++ b/tests/manual/tests_via_nomad/asapo-test_filemon_producer_toreceiver.nomad
@@ -89,7 +89,7 @@ job "asapo-produceronly" {
  "AsapoEndpoint":"psana002:8400",
  "Tag":"test_tag",
  "BeamtimeID":"asapo_test2",
- "Mode":"filesystem",
+ "Mode":"tcp",
  "NThreads":1,
  "LogLevel":"debug",
  "RootMonitoredFolder":"/tmp/asapo/test_in",