diff --git a/macro/mcbm/CMakeLists.txt b/macro/mcbm/CMakeLists.txt
index dec4dc7a9973b8963e7f585cfa5e875d079991c0..fb2a727069e32df7ffb7fcf5495f2e60acb2cfe9 100644
--- a/macro/mcbm/CMakeLists.txt
+++ b/macro/mcbm/CMakeLists.txt
@@ -37,66 +37,91 @@ Else()
 #  List(APPEND cbm_setup mcbm_beam_2022_02 mcbm_beam_2022_04 mcbm_beam_2022_05) # Non-default current/future setups, missing parameters
 EndIf()
 
+# =====   Cleanup the data directory   =======================================
+add_test(mcbm_cleanup ${CMAKE_COMMAND}
+        -P ${CMAKE_SOURCE_DIR}/cmake/scripts/cleanmacrodir.cmake)
+set_tests_properties(mcbm_cleanup PROPERTIES
+        TIMEOUT 10
+        FIXTURES_SETUP mcbm_cleanup
+)
+# ============================================================================
+
+
 ForEach(setup IN LISTS cbm_setup)
   Message( STATUS "Adding test for simulation chain of mCBM setup ${setup}" )
 
   Set(testname mcbm_transport_${setup})
+  Set(fixture_mcbm_transport fixture_${testname})
   Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/mcbm/mcbm_transport.sh ${NumEvents} \"${setup}\" \"data/${setup}_test\")
-  Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "600")
-  Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
-  Set(fixture_transport fixture_transport_${setup})
-  set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_transport})
+  Set_Tests_Properties(${testname} PROPERTIES
+          TIMEOUT "600"
+          PASS_REGULAR_EXPRESSION "Test Passed;All ok"
+          FIXTURES_REQUIRED mcbm_cleanup
+          FIXTURES_SETUP ${fixture_mcbm_transport}
+  )
 
 
   Set(testname mcbm_digi_event_${setup})
+  Set(fixture_mcbm_digi_event fixture_${testname})
   Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/mcbm/mcbm_digi.sh ${NumEvents} \"data/${setup}_test\" 0. 0. 1)
-  Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "300")
-  Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
-  set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_transport})
-  Set(fixture_digi_event fixture_digi_event_${setup})
-  set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_digi_event})
+  Set_Tests_Properties(${testname} PROPERTIES
+          TIMEOUT "300"
+          PASS_REGULAR_EXPRESSION "Test Passed;All ok"
+          FIXTURES_REQUIRED ${fixture_mcbm_transport}
+          FIXTURES_SETUP ${fixture_mcbm_digi_event}
+  )
 
   Set(testname mcbm_reco_event_${setup})
+  Set(fixture_mcbm_reco_event fixture_${testname})
   Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/mcbm/mcbm_reco_event.sh ${NumEvents} \"data/${setup}_test\" \"${setup}\")
-  Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "300")
-  Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
-  set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_digi_event})
-  Set(fixture_reco_event fixture_reco_event_${setup})
-  set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_reco_event})
+  Set_Tests_Properties(${testname} PROPERTIES
+          TIMEOUT "300"
+          PASS_REGULAR_EXPRESSION "Test Passed;All ok"
+          FIXTURES_REQUIRED ${fixture_mcbm_digi_event}
+          FIXTURES_SETUP ${fixture_mcbm_reco_event}
+  )
 
   Set(testname mcbm_match_check_${setup})
+  Set(fixture_mcbm_match_check fixture_${testname})
   Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/mcbm/mcbm_match_check.sh ${NumEvents} \"${setup}\" \"data/${setup}_test\")
-  Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "300")
-  Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
-  set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_reco_event})
-  Set(fixture_match_check fixture_match_check_${setup})
-  set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_match_check})
+  Set_Tests_Properties(${testname} PROPERTIES
+          TIMEOUT "300"
+          PASS_REGULAR_EXPRESSION "Test Passed;All ok"
+          FIXTURES_REQUIRED ${fixture_mcbm_reco_event}
+          FIXTURES_SETUP ${fixture_mcbm_match_check}
+  )
 
   Set(testname mcbm_hadron_analysis_${setup})
+  Set(fixture_mcbm_hadron_analysis fixture_${testname})
   Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/mcbm/mcbm_hadron_analysis.sh ${NumEvents} \"${setup}\" \"data/${setup}_test\")
-  Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "300")
-  Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
-  set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_match_check})
-  Set(fixture_hadron_analysis fixture_hadron_analysis_${setup})
-  set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_hadron_analysis})
+  Set_Tests_Properties(${testname} PROPERTIES
+          TIMEOUT "300"
+          PASS_REGULAR_EXPRESSION "Test Passed;All ok"
+          FIXTURES_REQUIRED ${fixture_mcbm_match_check}
+          FIXTURES_SETUP ${fixture_mcbm_hadron_analysis}
+  )
 
   Set(testname mcbm_digi_${setup})
+  Set(fixture_mcbm_digi_tb fixture_${testname})
   Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/mcbm/mcbm_digi.sh ${NumEvents} \"data/${setup}_test\")
-  Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "300")
-  Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
-  set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_hadron_analysis})
-  Set(fixture_digi_tb fixture_digi_tb_${setup})
-  set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_digi_tb})
+  Set_Tests_Properties(${testname} PROPERTIES
+          TIMEOUT "300"
+          PASS_REGULAR_EXPRESSION "Test Passed;All ok"
+          FIXTURES_REQUIRED ${fixture_mcbm_hadron_analysis}
+          FIXTURES_SETUP ${fixture_mcbm_digi_tb}
+  )
 
   Set(testname mcbm_qa_event_mc_${setup})
+  Set(fixture_mcbm_qa_event_mc fixture_${testname})
   Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/mcbm/mcbm_qa.sh ${NumEvents} \"data/${setup}_test\" \"${setup}\")
-  Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "300")
-  Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
-  Set_Tests_Properties(${testname} PROPERTIES FAIL_REGULAR_EXPRESSION "ERROR")
-  Set_Tests_Properties(${testname} PROPERTIES FAIL_REGULAR_EXPRESSION "FATAL")
-  Set_Tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_digi_tb})
-  Set(fixture_qa_event_mc fixture_qa_event_mc_${setup})
-  set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_qa_event_mc})
+  Set_Tests_Properties(${testname} PROPERTIES
+          TIMEOUT "300"
+          PASS_REGULAR_EXPRESSION "Test Passed;All ok"
+          FAIL_REGULAR_EXPRESSION "ERROR"
+          FAIL_REGULAR_EXPRESSION "FATAL"
+          FIXTURES_REQUIRED ${fixture_mcbm_digi_tb}
+          FIXTURES_SETUP ${fixture_mcbm_qa_event_mc}
+  )
 
   #Set(testname mcbm_reco_${setup})
   #Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/mcbm/mcbm_reco.sh ${NumEvents} ${BeamAngle} \"${setup}\")
@@ -107,19 +132,23 @@ ForEach(setup IN LISTS cbm_setup)
   #Set_Tests_Properties(${testname} PROPERTIES REQUIRED_FILES ${_FileName_Dependency})
 
   Set(testname mcbm_overlap_${setup})
+  Set(fixture_mcbm_overlap fixture_${testname})
   Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/mcbm/mcbm_check_overlaps.sh \"data/${setup}_test\")
-  Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "600")
-  Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
-  set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_qa_event_mc})
-  Set(fixture_overlap fixture_overlap_${setup})
-  set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP ${fixture_overlap})
+  Set_Tests_Properties(${testname} PROPERTIES
+          TIMEOUT "600"
+          PASS_REGULAR_EXPRESSION "Test Passed;All ok"
+          FIXTURES_REQUIRED ${fixture_mcbm_qa_event_mc}
+          FIXTURES_SETUP ${fixture_mcbm_overlap}
+  )
 
   If(NOT ${CBM_TEST_MODEL} MATCHES Experimental)
     Set(testname mcbm_check_media_${setup})
     Add_Test(${testname} ${CBMROOT_BINARY_DIR}/macro/mcbm/check_media.sh \"data/${setup}_test\")
-    Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "60")
-    Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
-    set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED ${fixture_overlap})
+    Set_Tests_Properties(${testname} PROPERTIES
+            TIMEOUT "60"
+            PASS_REGULAR_EXPRESSION "Test Passed;All ok"
+            FIXTURES_REQUIRED ${fixture_mcbm_overlap}
+    )
   EndIf()
 
 EndForEach(setup IN LISTS cbm_setup)
diff --git a/macro/much/CMakeLists.txt b/macro/much/CMakeLists.txt
index 6635ca7e7b46a02ff21b40a63eda9966955cdcd3..33b8f7d6d73a8be54f210986fe1457a09fc97b3b 100644
--- a/macro/much/CMakeLists.txt
+++ b/macro/much/CMakeLists.txt
@@ -11,35 +11,53 @@ File(COPY ${CBMROOT_SOURCE_DIR}/macro/include/.rootrc DESTINATION ${CBMROOT_BINA
 
 Set(NumEvents 3)
 
+# =====   Cleanup the data directory   =======================================
+add_test(much_cleanup ${CMAKE_COMMAND}
+        -P ${CMAKE_SOURCE_DIR}/cmake/scripts/cleanmacrodir.cmake)
+set_tests_properties(much_cleanup PROPERTIES
+        TIMEOUT 10
+        FIXTURES_SETUP much_cleanup
+)
+
+
 # --- Transport of UrQMD events
 Set(testname much_transport)
-add_test(${testname} ${MACRO_DIR}/run_transport.sh ${NumEvents} \"sis100_muon_lmvm_APR21\" \"muons\")
-SET_TESTS_PROPERTIES(${testname} PROPERTIES TIMEOUT "1200")
-SET_TESTS_PROPERTIES(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "TestPassed;All ok")
-set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP fixture_much_digi)
+add_test(${testname} ${MACRO_DIR}/run_transport.sh ${NumEvents} \"sis100_muon_lmvm_APR21\" \"data/muons\")
+SET_TESTS_PROPERTIES(${testname} PROPERTIES
+          TIMEOUT "1200"
+          PASS_REGULAR_EXPRESSION "TestPassed;All ok"
+          FIXTURES_SETUP fixture_much_digi
+          FIXTURES_REQUIRED much_cleanup
+)
 
 # --- Digitisation, event-by-event
 Set(testname much_digi)
-Add_Test(${testname} ${MACRO_DIR}/run_digi.sh \"muons\" ${NumEvents} \"muons.event\" -1.)
-Set_Tests_Properties(${testname} PROPERTIES TIMEOUT "1200")
-Set_Tests_Properties(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "Macro finished successfully")
-set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED fixture_much_digi)
-set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP fixture_much_reco)
+Add_Test(${testname} ${MACRO_DIR}/run_digi.sh \"data/muons\" ${NumEvents} \"data/muons.event\" -1.)
+Set_Tests_Properties(${testname} PROPERTIES
+          TIMEOUT "1200"
+          PASS_REGULAR_EXPRESSION "Macro finished successfully"
+          FIXTURES_REQUIRED fixture_much_digi
+          FIXTURES_SETUP fixture_much_reco
+)
 
 # --- Reconstruction, event-by-event
 Set(testname much_reco_event)
-add_test(${testname} ${MACRO_DIR}/run_reco_event.sh ${NumEvents} \"muons\" \"sis100_muon_lmvm_APR21\" 1 1)
-SET_TESTS_PROPERTIES(${testname} PROPERTIES TIMEOUT "1200")
-SET_TESTS_PROPERTIES(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "TestPassed;All ok")
-set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED fixture_much_reco)
-set_tests_properties(${testname} PROPERTIES FIXTURES_SETUP fixture_much_ana)
+add_test(${testname} ${MACRO_DIR}/run_reco_event.sh ${NumEvents} \"data/muons\" \"sis100_muon_lmvm_APR21\" 1 1)
+SET_TESTS_PROPERTIES(${testname} PROPERTIES
+          TIMEOUT "1200"
+          PASS_REGULAR_EXPRESSION "TestPassed;All ok"
+          FIXTURES_REQUIRED fixture_much_reco
+          FIXTURES_SETUP fixture_much_ana
+)
 
 # --- Analysis, event-by-event
 Set(testname much_analysis)
-add_test(${testname} ${MACRO_DIR}/run_ana.sh ${NumEvents} \"muons\" \"sis100_muon_lmvm\" 1 \"\" -1)
-SET_TESTS_PROPERTIES(${testname} PROPERTIES TIMEOUT "1200")
-SET_TESTS_PROPERTIES(${testname} PROPERTIES PASS_REGULAR_EXPRESSION "TestPassed;All ok")
-set_tests_properties(${testname} PROPERTIES FIXTURES_REQUIRED fixture_much_ana)
+add_test(${testname} ${MACRO_DIR}/run_ana.sh ${NumEvents} \"data/muons\" \"sis100_muon_lmvm\" 1 \"\" -1)
+SET_TESTS_PROPERTIES(${testname} PROPERTIES
+          TIMEOUT "1200"
+          PASS_REGULAR_EXPRESSION "TestPassed;All ok"
+          FIXTURES_REQUIRED fixture_much_ana
+)
 
 
 Install(FILES .rootrc run_transport.C run_ana.C
diff --git a/macro/mvd/qa/CMakeLists.txt b/macro/mvd/qa/CMakeLists.txt
index 2a3465ca33bcc318b5a53bcf9376cd0b255aaee6..6e8da83d242834525dfa0abd25ac50c1c442cde8 100644
--- a/macro/mvd/qa/CMakeLists.txt
+++ b/macro/mvd/qa/CMakeLists.txt
@@ -2,31 +2,49 @@
 # Otherwise the rootalias file is not loaded
 File(COPY ${CBMROOT_SOURCE_DIR}/macro/include/.rootrc DESTINATION ${CBMROOT_BINARY_DIR}/macro/mvd/qa)
 
+# =====   Cleanup the data directory   =======================================
+add_test(mvd_cleanup ${CMAKE_COMMAND}
+        -P ${CMAKE_SOURCE_DIR}/cmake/scripts/cleanmacrodir.cmake)
+set_tests_properties(mvd_cleanup PROPERTIES
+        TIMEOUT 10
+        FIXTURES_SETUP mvd_cleanup
+)
+
+
 GENERATE_ROOT_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/macro/mvd/qa/mvd_qa1_transUrqmd.C)
 add_test(mvd_qa1_transUrqmd ${CBMROOT_BINARY_DIR}/macro/mvd/qa/mvd_qa1_transUrqmd.sh)
-SET_TESTS_PROPERTIES(mvd_qa1_transUrqmd PROPERTIES TIMEOUT "300")
-SET_TESTS_PROPERTIES(mvd_qa1_transUrqmd PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
-set_tests_properties(mvd_qa1_transUrqmd PROPERTIES FIXTURES_SETUP fixture_mvd_qa3_digitize)
+SET_TESTS_PROPERTIES(mvd_qa1_transUrqmd PROPERTIES
+        TIMEOUT "300"
+        PASS_REGULAR_EXPRESSION "Test Passed;All ok"
+        FIXTURES_SETUP fixture_mvd_qa3_digitize
+        FIXTURES_REQUIRED mvd_cleanup
+)
 
 GENERATE_ROOT_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/macro/mvd/qa/mvd_qa2_transDelta.C)
 add_test(mvd_qa2_transDelta ${CBMROOT_BINARY_DIR}/macro/mvd/qa/mvd_qa2_transDelta.sh)
-SET_TESTS_PROPERTIES(mvd_qa2_transDelta PROPERTIES TIMEOUT "500")
-SET_TESTS_PROPERTIES(mvd_qa2_transDelta PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
-#set_tests_properties(mvd_qa2_transDelta PROPERTIES FIXTURES_REQUIRED fixture_mvd_qa2_transDelta)
-set_tests_properties(mvd_qa2_transDelta PROPERTIES FIXTURES_SETUP fixture_mvd_qa3_digitize)
+SET_TESTS_PROPERTIES(mvd_qa2_transDelta PROPERTIES
+        TIMEOUT "500"
+        PASS_REGULAR_EXPRESSION "Test Passed;All ok"
+        FIXTURES_REQUIRED mvd_cleanup
+        FIXTURES_SETUP fixture_mvd_qa3_digitize
+)
 
 GENERATE_ROOT_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/macro/mvd/qa/mvd_qa3_digitize.C)
 add_test(mvd_qa3_digitize ${CBMROOT_BINARY_DIR}/macro/mvd/qa/mvd_qa3_digitize.sh)
-SET_TESTS_PROPERTIES(mvd_qa3_digitize PROPERTIES TIMEOUT "300")
-SET_TESTS_PROPERTIES(mvd_qa3_digitize PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
-set_tests_properties(mvd_qa3_digitize PROPERTIES FIXTURES_REQUIRED fixture_mvd_qa3_digitize)
-set_tests_properties(mvd_qa3_digitize PROPERTIES FIXTURES_SETUP fixture_mvd_qa4_reco)
+SET_TESTS_PROPERTIES(mvd_qa3_digitize PROPERTIES
+        TIMEOUT "300"
+        PASS_REGULAR_EXPRESSION "Test Passed;All ok"
+        FIXTURES_REQUIRED fixture_mvd_qa3_digitize
+        FIXTURES_SETUP fixture_mvd_qa4_reco
+)
 
 GENERATE_ROOT_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/macro/mvd/qa/mvd_qa4_reco.C)
 add_test(mvd_qa4_reco ${CBMROOT_BINARY_DIR}/macro/mvd/qa/mvd_qa4_reco.sh)
-SET_TESTS_PROPERTIES(mvd_qa4_reco PROPERTIES TIMEOUT "300")
-SET_TESTS_PROPERTIES(mvd_qa4_reco PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
-set_tests_properties(mvd_qa4_reco PROPERTIES FIXTURES_REQUIRED fixture_mvd_qa4_reco)
+SET_TESTS_PROPERTIES(mvd_qa4_reco PROPERTIES
+        TIMEOUT "300"
+        PASS_REGULAR_EXPRESSION "Test Passed;All ok"
+        FIXTURES_REQUIRED fixture_mvd_qa4_reco
+)
 
 Install(FILES mvd_qa1_transUrqmd.C mvd_qa2_transDelta.C mvd_qa3_digitize.C mvd_qa4_reco.C
         DESTINATION share/cbmroot/macro/mvd
diff --git a/macro/run/CMakeLists.txt b/macro/run/CMakeLists.txt
index c5eaf7de3c89048c774beadd280517fb9d3019f9..11b20e79fa8bdf812fa7037d9ac4094e47c401a5 100644
--- a/macro/run/CMakeLists.txt
+++ b/macro/run/CMakeLists.txt
@@ -36,12 +36,12 @@ math(EXPR nBeam "${nEvents} * 3")
 
 # =====   Define the different setups to be tested with   ====================
 if(NOT ${CBM_TEST_MODEL} MATCHES Experimental )
-  List(APPEND cbm_setup 
-	sis100_hadron_APR21 sis100_electron_APR21 
-	sis100_muon_lmvm_APR21 sis100_muon_jpsi_APR21 
+  List(APPEND cbm_setup
+	sis100_hadron_APR21 sis100_electron_APR21
+	sis100_muon_lmvm_APR21 sis100_muon_jpsi_APR21
 	sis300_electron
 	sis100_hadron sis100_electron
-	sis100_hadron_DEC21 sis100_electron_DEC21  
+	sis100_hadron_DEC21 sis100_electron_DEC21
 	)
 else()
   List(APPEND cbm_setup sis100_electron_APR21 sis100_muon_jpsi_APR21)
@@ -79,8 +79,9 @@ foreach(setup IN LISTS cbm_setup)
 
   # --- Test run_transport_json_config
   # --- Transport run using run_transport_json_config.C
+  set(json_config_file ${CBMROOT_SOURCE_DIR}/macro/run/config_ci.json)
   set(testname run_transport_json_config)
-  add_test(${testname} ${MACRO_DIR}/run_transport_json_config.sh \"\" 2 ${randomSeed})
+  add_test(${testname} ${MACRO_DIR}/run_transport_json_config.sh \"${json_config_file}\" 2 ${randomSeed})
   set_tests_properties(${testname} PROPERTIES
   	TIMEOUT ${timeOutTime}
   	PASS_REGULAR_EXPRESSION "Macro finished successfully"
@@ -92,7 +93,7 @@ foreach(setup IN LISTS cbm_setup)
   # --- Test run_digi_json_config
   # --- Digitization run with using run_digi_json_config.C
   set(testname run_digi_json_config)
-  add_test(${testname} ${MACRO_DIR}/run_digi_json_config.sh)
+  add_test(${testname} ${MACRO_DIR}/run_digi_json_config.sh \"${json_config_file}\")
   set_tests_properties(${testname} PROPERTIES
   	TIMEOUT ${timeOutTime}
   	PASS_REGULAR_EXPRESSION "Macro finished successfully"
@@ -110,7 +111,7 @@ foreach(setup IN LISTS cbm_setup)
   set_tests_properties(${testname} PROPERTIES
   	TIMEOUT ${timeOutTime}
   	PASS_REGULAR_EXPRESSION "Macro finished successfully"
-  	FIXTURES_REQUIRED cleanup
+  	FIXTURES_REQUIRED run_cleanup
   	FIXTURES_SETUP fixt_tra_coll_${setup}
   	RESOURCE_LOCK collParDb_${setup}
   )
@@ -236,8 +237,8 @@ foreach(setup IN LISTS cbm_setup)
   # --- Real raw event builder
   set(testname run_${sname}_qa)
   add_test(${testname} ${MACRODIR}/run_qa.sh
-  	\"data/${sname}_coll\" \"data/${sname}_ts\"  \"data/${sname}_ts_eb_real\" 
-	\"data/${sname}_coll\" \"data/${sname}_qa\" \"${setup}\" -1 
+  	\"data/${sname}_coll\" \"data/${sname}_ts\"  \"data/${sname}_ts_eb_real\"
+	\"data/${sname}_coll\" \"data/${sname}_qa\" \"${setup}\" -1
 	\"data/${sname}_sign\" \"data/${sname}_beam\" )
   set_tests_properties(${testname} PROPERTIES
   	TIMEOUT ${timeOutTime}
@@ -261,29 +262,29 @@ foreach(setup IN LISTS cbm_setup)
  	RESOURCE_LOCK collParDb_${setup}
   )
 
-  # --- Test run_transport_json_config
-  # --- Transport run using run_transport_json_config.C
-  set(testname run_transport_json_config)
-  add_test(${testname} ${MACRO_DIR}/run_transport_json_config.sh \"\" 2 ${randomSeed})
-  set_tests_properties(${testname} PROPERTIES
-  	TIMEOUT ${timeOutTime}
-  	PASS_REGULAR_EXPRESSION "Macro finished successfully"
-  	FIXTURES_REQUIRED cleanup
-  	FIXTURES_SETUP fixt_tra_json_config
-  	RESOURCE_LOCK json_config_ParDb
-  )
-
-  # --- Test run_digi_json_config
-  # --- Digitization run with using run_digi_json_config.C
-  set(testname run_digi_json_config)
-  add_test(${testname} ${MACRO_DIR}/run_digi_json_config.sh)
-  set_tests_properties(${testname} PROPERTIES
-  	TIMEOUT ${timeOutTime}
-  	PASS_REGULAR_EXPRESSION "Macro finished successfully"
-  	FIXTURES_REQUIRED fixt_tra_json_config
-  	FIXTURES_SETUP fixt_digi_json_config
-  	RESOURCE_LOCK json_config_ParDb
-  )
+#  # --- Test run_transport_json_config
+#  # --- Transport run using run_transport_json_config.C
+#  set(testname run_transport_json_config)
+#  add_test(${testname} ${MACRO_DIR}/run_transport_json_config.sh \"\" 2 ${randomSeed})
+#  set_tests_properties(${testname} PROPERTIES
+#  	TIMEOUT ${timeOutTime}
+#  	PASS_REGULAR_EXPRESSION "Macro finished successfully"
+#  	FIXTURES_REQUIRED cleanup
+#  	FIXTURES_SETUP fixt_tra_json_config
+#  	RESOURCE_LOCK json_config_ParDb
+#  )
+
+#  # --- Test run_digi_json_config
+#  # --- Digitization run with using run_digi_json_config.C
+#  set(testname run_digi_json_config)
+#  add_test(${testname} ${MACRO_DIR}/run_digi_json_config.sh)
+#  set_tests_properties(${testname} PROPERTIES
+#  	TIMEOUT ${timeOutTime}
+#  	PASS_REGULAR_EXPRESSION "Macro finished successfully"
+#  	FIXTURES_REQUIRED fixt_tra_json_config
+#  	FIXTURES_SETUP fixt_digi_json_config
+#  	RESOURCE_LOCK json_config_ParDb
+#  )
 
 
 endforeach(setup IN LISTS cbm_setup)
diff --git a/macro/run/config_ci.json b/macro/run/config_ci.json
new file mode 100644
index 0000000000000000000000000000000000000000..1fb5f86d9dfa1c38bb70ef540b9ad149fca30b76
--- /dev/null
+++ b/macro/run/config_ci.json
@@ -0,0 +1,117 @@
+{
+  "logScreenLevel": "INFO",
+  "logVerbosityLevel": "LOW",
+  "transport": {
+    "input": [
+      {"generator": "unigen",
+       "file": "${VMCWORKDIR}/input/urqmd.auau.10gev.centr.root"},
+      {"generator": "pluto",
+       "file": "${VMCWORKDIR}/input/pluto.auau.8gev.omega.mpmm.0001.root",
+       "plutoPdg": 0},
+      {"generator": "beam",
+       "beamA": 197,
+       "beamZ": 79,
+       "beamQ": 79,
+       "beamP": 12.0,
+       "beamStartZ": -1.0}
+    ],
+    "output": {
+      "path": "data/test",
+      "overwrite": false
+    },
+    "target": {
+      "material": "Gold",
+      "thickness": 0.025,
+      "diameter": 2.5,
+      "position": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+      },
+      "rotation.y": 0.0
+    },
+    "beam": {
+      "position": {
+        "x": 0.0,
+        "y": 0.0,
+        "zFocus": 0.0,
+        "sigmaX": 0.1,
+        "sigmaY": 0.1
+      },
+      "angle": {
+        "x": 0.0,
+        "y": 0.0,
+        "sigmaX": 0.001,
+        "sigmaY": 0.001
+      }
+    },
+    "randomRP": true,
+    "geantVersion": 4,
+    "geant4vmcSettings": {
+      "physicsLists": "QGSP_BERT_EMV+optical",
+      "specialProcesses": "stepLimiter",
+      "maxNsteps": 10000000,
+      "geant4commands": [""]
+    },
+    "geometry": {
+      "baseSetup": "sis100_electron",
+      "magneticField": {
+        "tag": "v18a",
+        "scale": 1.0,
+        "position": {
+          "x": 0.0,
+          "y": 0.0,
+          "z": 0.0
+        }
+      },
+      "subsystems": {
+        "magnet":   "v21a",
+        "pipe":     "v16e_1e",
+        "mvd":      "v20c_tr",
+        "sts":      "v20a",
+        "rich":     "v21a",
+        "trd":      "v20c_1e",
+        "tof":      "v20c_1e",
+        "psd":      "v20c",
+        "platform": "v13a"
+      }
+    },
+    "stackFilter": {
+      "storeAllPrimaries": true,
+      "storeAllMothers": true,
+      "storeAllDecays": true
+    }
+  },
+  
+  "digitization": {
+    "generateRunInfo": false,
+    "eventMode": false,
+    "timeSliceLength": -1.0,
+    "storeAllTimeSlices": false,
+    "startTime": 1000,
+    "produceNoise": true,
+    "input": [
+      {"id": 0,
+       "path": "data/test",
+       "rate": "1.e7",
+       "treeAccessMode": "regular",
+       "parameterSource": true},
+      {"id": -1,
+       "path": "test_emb",
+       "embedToId": 0,
+       "treeAccessMode": "regular"},
+      {"id": -1,
+       "path": "test_beam",
+       "rate": "1.e9",
+       "treeAccessMode": "regular"}
+    ],
+    "output": {
+      "path": "data/test_json",
+      "overwrite": false
+    },
+    "geometry": {
+      "deactivate": ["", ""],
+      "#deactivateAllBut": ""
+    }
+  } 
+}