diff --git a/Control/CalypsoExample/NeutrinoHits/CMakeLists.txt b/Control/CalypsoExample/NeutrinoHits/CMakeLists.txt
index 299a9213811b1c6e6b94d44f4d6d70c661f1533a..4296cf1384d448c34aeb55076dd4d6225730c709 100644
--- a/Control/CalypsoExample/NeutrinoHits/CMakeLists.txt
+++ b/Control/CalypsoExample/NeutrinoHits/CMakeLists.txt
@@ -10,5 +10,6 @@ atlas_install_scripts( scripts/*.sh scripts/*.py )
 
 atlas_add_test( ProdNeutrinoHits
     SCRIPT scripts/faser_dumpnu.py ${CMAKE_CURRENT_SOURCE_DIR}/../rawdata/FaserMC-MC22_PG_muon_fasernu_100GeV-100012-00000-HITS.root
-    PROPERTIES TIMEOUT 300 )
+    PROPERTIES TIMEOUT 300
+    POST_EXEC_SCRIPT nopost.sh)
 
diff --git a/Control/CalypsoExample/Reconstruction/CMakeLists.txt b/Control/CalypsoExample/Reconstruction/CMakeLists.txt
index 23af9627f673516d4e78d17a75596770ca6e3b4b..a69e9811dea42210680ec8c8573d894fff27078c 100644
--- a/Control/CalypsoExample/Reconstruction/CMakeLists.txt
+++ b/Control/CalypsoExample/Reconstruction/CMakeLists.txt
@@ -19,22 +19,32 @@ atlas_install_scripts( scripts/*.sh scripts/*.py )
 
 atlas_add_test( ProdRecoTI12
     SCRIPT scripts/faser_reco.py --geom=TI12Data ${CMAKE_CURRENT_SOURCE_DIR}/../rawdata/Faser-Physics-001920-filtered.raw 
-    PROPERTIES TIMEOUT 300 )
+    PROPERTIES TIMEOUT 300
+    POST_EXEC_SCRIPT nopost.sh
+  )
 
 atlas_add_test( ProdRecoTestBeam
     SCRIPT scripts/faser_reco.py --geom=TestBeamData ${CMAKE_CURRENT_SOURCE_DIR}/../RAWDATA/Faser-Physics-003613-filtered.raw 
-    PROPERTIES TIMEOUT 300 )
+    PROPERTIES TIMEOUT 300
+    POST_EXEC_SCRIPT nopost.sh
+  )
 
 atlas_add_test( ProdRecoPilotTracks
     SCRIPT scripts/faser_reco.py --geom=TI12Data ${CMAKE_CURRENT_SOURCE_DIR}/../RAWDATA/Faser-Physics-pilot_tracks-filtered.raw
-    PROPERTIES TIMEOUT 300 )
+    PROPERTIES TIMEOUT 300
+    POST_EXEC_SCRIPT nopost.sh
+  )
 
 # Test of TI12Data02 geometry (should auto-select from run number)
 atlas_add_test( ProdRecoTI12-02-2022
     SCRIPT scripts/faser_reco.py ${CMAKE_CURRENT_SOURCE_DIR}/../rawdata/Faser-Physics-006525-filtered.raw
-    PROPERTIES TIMEOUT 300 )
+    PROPERTIES TIMEOUT 300
+    POST_EXEC_SCRIPT nopost.sh
+  )
 
 # Test of TI12Data03 geometry (should auto-select from run number)
 atlas_add_test( ProdRecoTI12-03-2022
     SCRIPT scripts/faser_reco.py ${CMAKE_CURRENT_SOURCE_DIR}/../rawdata/Faser-Physics-007833-00003-TrigMask08.raw
-    PROPERTIES TIMEOUT 300 )
+    PROPERTIES TIMEOUT 300
+    POST_EXEC_SCRIPT nopost.sh
+  )
diff --git a/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py b/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py
index c5fc6d5f21c6645bdd5e6d55f2ff482e7c037121..3c990f39bdb1014c58ff079a82998e9810645b90 100755
--- a/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py
+++ b/Control/CalypsoExample/Reconstruction/scripts/faser_reco.py
@@ -112,18 +112,8 @@ if args.isMC:
 else:
     configFlags.IOVDb.DatabaseInstance = "CONDBR3" # Use data conditions
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 configFlags.Input.ProjectName = "data20"
 #configFlags.GeoModel.Align.Dynamic    = False
-=======
-ConfigFlags.Input.ProjectName = "data20"
-#ConfigFlags.GeoModel.Align.Dynamic    = False
->>>>>>> 05a628fdc98 (GeometryTest runs successfully)
-=======
-configFlags.Input.ProjectName = "data20"
-#configFlags.GeoModel.Align.Dynamic    = False
->>>>>>> 6e1b4d4be8e (Configuration fixes)
 
 configFlags.Exec.SkipEvents = args.skip
 
diff --git a/Control/CalypsoExample/TrackerDataAccessExample/CMakeLists.txt b/Control/CalypsoExample/TrackerDataAccessExample/CMakeLists.txt
index 81fea4e212bfe5b9e03aa2725a8f9ac68a678412..299b5b2e41164184c5ccffb707b982f213f48e9f 100644
--- a/Control/CalypsoExample/TrackerDataAccessExample/CMakeLists.txt
+++ b/Control/CalypsoExample/TrackerDataAccessExample/CMakeLists.txt
@@ -15,6 +15,8 @@ atlas_install_python_modules( python/*.py )
 # Test(s) in the package:
 atlas_add_test( TrackerDataAccessTest
    SCRIPT python/TrackerDataAccessExampleConfig.py ${CMAKE_CURRENT_SOURCE_DIR}
-   PROPERTIES TIMEOUT 300 )
+   PROPERTIES TIMEOUT 300
+   POST_EXEC_SCRIPT nopost.sh
+ )
 
 
diff --git a/Control/CalypsoExample/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py b/Control/CalypsoExample/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py
index 9b2df67dac89b5056aa5ac8401f3409eda9c39d4..bd5a972555eb2f640e1e70d6fc35bba836f4804d 100755
--- a/Control/CalypsoExample/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py
+++ b/Control/CalypsoExample/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py
@@ -38,7 +38,7 @@ if __name__ == "__main__":
     configFlags = initConfigFlags()
     configFlags.Input.isMC = False                               # Needed to bypass autoconfig
     configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"             # Always needed; must match FaserVersion
-    configFlags.IOVDb.DatabaseInstance = "CONDBR3"               # Use MC conditions for now
+    configFlags.IOVDb.DatabaseInstance = "CONDBR3"
     configFlags.GeoModel.FaserVersion     = "FASER-01"           # FASER geometry
     configFlags.Input.ProjectName = "data20"                     # Needed to bypass autoconfig
     #configFlags.GeoModel.Align.Dynamic    = False
diff --git a/Control/CalypsoExample/TriggerDataAccessExample/CMakeLists.txt b/Control/CalypsoExample/TriggerDataAccessExample/CMakeLists.txt
index 7d0275a8985377f72a4b120f652b98c32110ec4c..526937c97d88ade74b189b7a997c7b6115dd614a 100644
--- a/Control/CalypsoExample/TriggerDataAccessExample/CMakeLists.txt
+++ b/Control/CalypsoExample/TriggerDataAccessExample/CMakeLists.txt
@@ -15,5 +15,7 @@ atlas_install_python_modules( python/*.py )
 # Test(s) in the package:
 atlas_add_test( TriggerDataAccessTest
    SCRIPT python/TriggerDataAccessExampleConfig.py ${CMAKE_CURRENT_SOURCE_DIR}
-   PROPERTIES TIMEOUT 300 )
+   PROPERTIES TIMEOUT 300
+   POST_EXEC_SCRIPT nopost.sh
+   )
 
diff --git a/Control/CalypsoExample/TriggerDataAccessExample/python/TriggerDataAccessExampleConfig.py b/Control/CalypsoExample/TriggerDataAccessExample/python/TriggerDataAccessExampleConfig.py
index a4c2d3fad3b787adc96ca884a5b4495963c91aaa..08057518a5855b8e771b737462e955232198e918 100755
--- a/Control/CalypsoExample/TriggerDataAccessExample/python/TriggerDataAccessExampleConfig.py
+++ b/Control/CalypsoExample/TriggerDataAccessExample/python/TriggerDataAccessExampleConfig.py
@@ -37,29 +37,29 @@ if __name__ == "__main__":
     configFlags = initConfigFlags()
     configFlags.Input.isMC = False                               # Needed to bypass autoconfig
     configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"             # Always needed; must match FaserVersion
-    configFlags.IOVDb.DatabaseInstance = "OFLP200"               # Use MC conditions for now
+    configFlags.IOVDb.DatabaseInstance = "CONDBR3"
     configFlags.GeoModel.FaserVersion     = "FASER-01"           # Default FASER geometry
     configFlags.Input.ProjectName = "data20"
     #configFlags.GeoModel.Align.Dynamic    = False
     configFlags.Input.Files = [f"{Cmake_working_dir}/../rawdata/Faser-Physics-001920-filtered.raw"] #path is set to test data for ctest
-    configFlags.Output.RDOFileName = "trigger.RDO.pool.root"
+    #configFlags.Output.RDOFileName = "trigger.RDO.pool.root"
     configFlags.lock()
 
 # Configure components
     from CalypsoConfiguration.MainServicesConfig import MainServicesCfg
-    from AthenaPoolCnvSvc.PoolWriteConfig import PoolWriteCfg
+    #from AthenaPoolCnvSvc.PoolWriteConfig import PoolWriteCfg
     
     acc = MainServicesCfg(configFlags)
-    acc.merge(PoolWriteCfg(configFlags))
+    #acc.merge(PoolWriteCfg(configFlags))
 
 # Configure output
-    from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
-    itemList = [ "xAOD::EventInfo#*",
-                 "xAOD::EventAuxInfo#*",
-                 "xAOD::FaserTriggerData#*",
-                 "xAOD::FaserTriggerDataAux#*" ]
-    acc.merge(OutputStreamCfg(configFlags, "RDO", itemList))
-    ostream = acc.getEventAlgo("OutputStreamRDO")
+    #from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
+    #itemList = [ "xAOD::EventInfo#*",
+    #             "xAOD::EventAuxInfo#*",
+    #             "xAOD::FaserTriggerData#*",
+    #             "xAOD::FaserTriggerDataAux#*" ]
+    #acc.merge(OutputStreamCfg(configFlags, "RDO", itemList))
+    #ostream = acc.getEventAlgo("OutputStreamRDO")
 
 # Set up algorithm
     acc.merge(TriggerDataAccessExampleCfg(configFlags))
diff --git a/Control/CalypsoExample/WaveformDataAccessExample/CMakeLists.txt b/Control/CalypsoExample/WaveformDataAccessExample/CMakeLists.txt
index 703ced096e170c92949af056d37cad12057b81cf..7a0843f28a716fabad16ff06a25c05c943b0e935 100644
--- a/Control/CalypsoExample/WaveformDataAccessExample/CMakeLists.txt
+++ b/Control/CalypsoExample/WaveformDataAccessExample/CMakeLists.txt
@@ -15,5 +15,7 @@ atlas_install_python_modules( python/*.py )
 # Test(s) in the package:
 atlas_add_test( WaveformDataAccessTest
    SCRIPT python/WaveformDataAccessExampleConfig.py ${CMAKE_CURRENT_SOURCE_DIR}
-   PROPERTIES TIMEOUT 300 )
+   PROPERTIES TIMEOUT 300
+   POST_EXEC_SCRIPT nopost.sh   
+ )
 
diff --git a/Control/CalypsoExample/WaveformDataAccessExample/python/WaveformDataAccessExampleConfig.py b/Control/CalypsoExample/WaveformDataAccessExample/python/WaveformDataAccessExampleConfig.py
index cdabb3d753f0ef266448db441a99f29dc0a55062..82fa0eb934bc4d8f9435023f7bf6eb20386f01cb 100755
--- a/Control/CalypsoExample/WaveformDataAccessExample/python/WaveformDataAccessExampleConfig.py
+++ b/Control/CalypsoExample/WaveformDataAccessExample/python/WaveformDataAccessExampleConfig.py
@@ -39,12 +39,12 @@ if __name__ == "__main__":
     configFlags.Input.isMC = False                               # Needed to bypass autoconfig
     # configFlags.Input.Format = Format.BS
     configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"             # Always needed; must match FaserVersion
-    configFlags.IOVDb.DatabaseInstance = "CONDBR3"               # Use MC conditions for now
+    configFlags.IOVDb.DatabaseInstance = "CONDBR3"
     configFlags.GeoModel.FaserVersion     = "FASER-01"           # Default FASER geometry
     configFlags.Input.ProjectName = "data20"
     #configFlags.GeoModel.Align.Dynamic    = False
     configFlags.Input.Files = [f"{Cmake_working_dir}/../rawdata/Faser-Physics-001920-filtered.raw"] #path is set to test data for ctest
-    configFlags.Output.RDOFileName = "waveform.RDO.pool.root"
+    #configFlags.Output.RDOFileName = "waveform.RDO.pool.root"
     configFlags.lock()
 
 # Configure components
@@ -52,15 +52,15 @@ if __name__ == "__main__":
     from AthenaPoolCnvSvc.PoolWriteConfig import PoolWriteCfg
     
     acc = MainServicesCfg(configFlags)
-    acc.merge(PoolWriteCfg(configFlags))
+    #acc.merge(PoolWriteCfg(configFlags))
 
 # Configure output
-    from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
-    itemList = [ "xAOD::EventInfo#*",
-                 "xAOD::EventAuxInfo#*",
-                 "RawWaveformContainer#*"
-               ]
-    acc.merge(OutputStreamCfg(configFlags, "RDO", itemList))
+    #from OutputStreamAthenaPool.OutputStreamConfig import OutputStreamCfg
+    #itemList = [ "xAOD::EventInfo#*",
+    #             "xAOD::EventAuxInfo#*",
+    #             "RawWaveformContainer#*"
+    #           ]
+    #acc.merge(OutputStreamCfg(configFlags, "RDO", itemList))
     # ostream = acc.getEventAlgo("OutputStreamRDO")
 
 # Set up algorithm
diff --git a/DetectorDescription/GeoModel/FaserGeoModel/CMakeLists.txt b/DetectorDescription/GeoModel/FaserGeoModel/CMakeLists.txt
index 38a8976dafe047cce2da022e6e1cee2267ef2aad..8dcb464af6e07b6a1b4b873da88ea490354399b2 100644
--- a/DetectorDescription/GeoModel/FaserGeoModel/CMakeLists.txt
+++ b/DetectorDescription/GeoModel/FaserGeoModel/CMakeLists.txt
@@ -32,4 +32,5 @@ atlas_install_scripts( test/*.py )
 atlas_add_test( EVNT_InputGeo_test
                 SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/FaserGeometryConfig_EVNT_test.py
                 PROPERTIES TIMEOUT 300 
-                PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR} )
+                PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+		POST_EXEC_SCRIPT nopost.sh)
diff --git a/DetectorDescription/GeoModel/GeoModelFaserUtilities/CMakeLists.txt b/DetectorDescription/GeoModel/GeoModelFaserUtilities/CMakeLists.txt
index f4b076f7c11d2de5b08dba9f031b86de04c2f77e..0d0ac607b26d7d9603c4d4f685e9f8c1d3111230 100644
--- a/DetectorDescription/GeoModel/GeoModelFaserUtilities/CMakeLists.txt
+++ b/DetectorDescription/GeoModel/GeoModelFaserUtilities/CMakeLists.txt
@@ -20,11 +20,13 @@ atlas_add_library( GeoModelFaserUtilities
 
 atlas_add_test( GeoGetIds_test
   SOURCES test/GeoGetIds_test.cxx
-  LINK_LIBRARIES GeoModelFaserUtilities )
+  LINK_LIBRARIES GeoModelFaserUtilities
+  POST_EXEC_SCRIPT noerror.sh)
 
 atlas_add_test( GeoVisitVolumes_test
   SOURCES test/GeoVisitVolumes_test.cxx
-  LINK_LIBRARIES GeoModelFaserUtilities )
+  LINK_LIBRARIES GeoModelFaserUtilities
+  POST_EXEC_SCRIPT noerror.sh)
 
 endif()
 if(BUILDVP1LIGHT)
diff --git a/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py b/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py
index f079b5a72b8fcf4edd768d21fccfa59edf2fd65b..0a9bf76a6c5d1df5f2943376e4ca9c047197c9cb 100644
--- a/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py
+++ b/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py
@@ -109,7 +109,7 @@ if __name__=="__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
 
     configFlags = initConfigFlags()
-    configFlags.Input.Files = defaultTestFiles.RAW
+    configFlags.Input.Files = []
     configFlags.Input.isMC = False
     configFlags.lock()
 
diff --git a/Neutrino/NeutrinoDetDescr/EmulsionGeoModel/CMakeLists.txt b/Neutrino/NeutrinoDetDescr/EmulsionGeoModel/CMakeLists.txt
index 71d3ffbd687e98865e625840fefcd786cbc45353..33ff27765dd289fb8907050e302a917a63746832 100644
--- a/Neutrino/NeutrinoDetDescr/EmulsionGeoModel/CMakeLists.txt
+++ b/Neutrino/NeutrinoDetDescr/EmulsionGeoModel/CMakeLists.txt
@@ -21,7 +21,8 @@ atlas_add_component( EmulsionGeoModel
 atlas_add_test( EmulsionGMConfig_test
                 SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/EmulsionGMConfig_test.py
                 PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-                PROPERTIES TIMEOUT 300 )
+                PROPERTIES TIMEOUT 300
+		POST_EXEC_SCRIPT nopost.sh)
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
diff --git a/Neutrino/NeutrinoDetDescr/EmulsionGeoModel/test/EmulsionGMConfig_test.py b/Neutrino/NeutrinoDetDescr/EmulsionGeoModel/test/EmulsionGMConfig_test.py
index a9573925c8191748ae6f7ca960ff16f6223a17bb..4d79e5bbdba10b602944302e55246dc936a4349d 100644
--- a/Neutrino/NeutrinoDetDescr/EmulsionGeoModel/test/EmulsionGMConfig_test.py
+++ b/Neutrino/NeutrinoDetDescr/EmulsionGeoModel/test/EmulsionGMConfig_test.py
@@ -10,7 +10,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
 
     configFlags = initConfigFlags()
-    configFlags.Input.Files = defaultTestFiles.HITS
+    configFlags.Input.Files = []
     configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"             # Always needed; must match FaserVersion
     #configFlags.GeoModel.Align.Dynamic    = False
     configFlags.lock()
diff --git a/Scintillator/ScintDetDescr/PreshowerGeoModel/CMakeLists.txt b/Scintillator/ScintDetDescr/PreshowerGeoModel/CMakeLists.txt
index a58ffa956f2faec599513f8d98de9f819d67fe33..7e89c7d6c664b572dd3992a354d62639a64f65ef 100644
--- a/Scintillator/ScintDetDescr/PreshowerGeoModel/CMakeLists.txt
+++ b/Scintillator/ScintDetDescr/PreshowerGeoModel/CMakeLists.txt
@@ -21,7 +21,8 @@ atlas_add_component( PreshowerGeoModel
 atlas_add_test( PreshowerGMConfig_test
                 SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/PreshowerGMConfig_test.py
                 PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-                PROPERTIES TIMEOUT 300 )
+                PROPERTIES TIMEOUT 300
+		POST_EXEC_SCRIPT noerror.sh)
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
diff --git a/Scintillator/ScintDetDescr/PreshowerGeoModel/test/PreshowerGMConfig_test.py b/Scintillator/ScintDetDescr/PreshowerGeoModel/test/PreshowerGMConfig_test.py
index 3727679b62ba323f0c59009eb211c1741f12c13c..78e7f72a21988a5138b9f4a2a232343bf118d89d 100644
--- a/Scintillator/ScintDetDescr/PreshowerGeoModel/test/PreshowerGMConfig_test.py
+++ b/Scintillator/ScintDetDescr/PreshowerGeoModel/test/PreshowerGMConfig_test.py
@@ -10,7 +10,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
 
     configFlags = initConfigFlags()
-    configFlags.Input.Files = defaultTestFiles.HITS
+    configFlags.Input.Files = []
     configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"             # Always needed; must match FaserVersion
     #configFlags.GeoModel.Align.Dynamic    = False
     configFlags.lock()
diff --git a/Scintillator/ScintDetDescr/TriggerGeoModel/CMakeLists.txt b/Scintillator/ScintDetDescr/TriggerGeoModel/CMakeLists.txt
index 38946b29ec662bbce9dc07c62ae4b4309915ded2..72122c0a5e437a6545e16046e38be6abc356cf17 100644
--- a/Scintillator/ScintDetDescr/TriggerGeoModel/CMakeLists.txt
+++ b/Scintillator/ScintDetDescr/TriggerGeoModel/CMakeLists.txt
@@ -21,7 +21,8 @@ atlas_add_component( TriggerGeoModel
 atlas_add_test( TriggerGMConfig_test
                 SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/TriggerGMConfig_test.py
                 PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-                PROPERTIES TIMEOUT 300 )
+                PROPERTIES TIMEOUT 300
+		POST_EXEC_SCRIPT noerror.sh)
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
diff --git a/Scintillator/ScintDetDescr/TriggerGeoModel/test/TriggerGMConfig_test.py b/Scintillator/ScintDetDescr/TriggerGeoModel/test/TriggerGMConfig_test.py
index 46633f98fe63af28ad88a923015a534390484ca3..bb9ae95cc184a8014c7323bccc6c1572d13eb0e8 100644
--- a/Scintillator/ScintDetDescr/TriggerGeoModel/test/TriggerGMConfig_test.py
+++ b/Scintillator/ScintDetDescr/TriggerGeoModel/test/TriggerGMConfig_test.py
@@ -10,7 +10,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
 
     configFlags = initConfigFlags()
-    configFlags.Input.Files = defaultTestFiles.HITS
+    configFlags.Input.Files = []
     configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"             # Always needed; must match FaserVersion
     #configFlags.GeoModel.Align.Dynamic    = False
     configFlags.lock()
diff --git a/Scintillator/ScintDetDescr/VetoGeoModel/CMakeLists.txt b/Scintillator/ScintDetDescr/VetoGeoModel/CMakeLists.txt
index d5c979d4080b6fa2eaacbabc243a122fc50864ab..8ff47a09ab00dffa14a1a4a854d442e2527dde9e 100644
--- a/Scintillator/ScintDetDescr/VetoGeoModel/CMakeLists.txt
+++ b/Scintillator/ScintDetDescr/VetoGeoModel/CMakeLists.txt
@@ -21,7 +21,8 @@ atlas_add_component( VetoGeoModel
 atlas_add_test( VetoGMConfig_test
                 SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/VetoGMConfig_test.py
                 PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-                PROPERTIES TIMEOUT 300 )
+                PROPERTIES TIMEOUT 300
+		POST_EXEC_SCRIPT noerror.sh)
 
 
 # Install files from the package:
diff --git a/Scintillator/ScintDetDescr/VetoGeoModel/test/VetoGMConfig_test.py b/Scintillator/ScintDetDescr/VetoGeoModel/test/VetoGMConfig_test.py
index a1f7a79e117412b71e073556c7f93a7c7cdec2d4..de26103e7828aed1375e0de69fb1226ac78dcc59 100644
--- a/Scintillator/ScintDetDescr/VetoGeoModel/test/VetoGMConfig_test.py
+++ b/Scintillator/ScintDetDescr/VetoGeoModel/test/VetoGMConfig_test.py
@@ -10,7 +10,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
 
     configFlags = initConfigFlags()
-    configFlags.Input.Files = defaultTestFiles.HITS
+    configFlags.Input.Files = []
     configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"             # Always needed; must match FaserVersion
     #configFlags.GeoModel.Align.Dynamic    = False
     configFlags.lock()
diff --git a/Scintillator/ScintDetDescr/VetoNuGeoModel/CMakeLists.txt b/Scintillator/ScintDetDescr/VetoNuGeoModel/CMakeLists.txt
index 404a64a14c4deecf4fd9f51908c5800e0129cd28..1db3dca18d919845e83eed50c280ae9c92cecbc4 100644
--- a/Scintillator/ScintDetDescr/VetoNuGeoModel/CMakeLists.txt
+++ b/Scintillator/ScintDetDescr/VetoNuGeoModel/CMakeLists.txt
@@ -21,7 +21,8 @@ atlas_add_component( VetoNuGeoModel
 atlas_add_test( VetoNuGMConfig_test
                 SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/VetoNuGMConfig_test.py
                 PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-                PROPERTIES TIMEOUT 300 )
+                PROPERTIES TIMEOUT 300
+		POST_EXEC_SCRIPT noerror.sh)
 
 
 # Install files from the package:
diff --git a/Scintillator/ScintDetDescr/VetoNuGeoModel/test/VetoNuGMConfig_test.py b/Scintillator/ScintDetDescr/VetoNuGeoModel/test/VetoNuGMConfig_test.py
index 99d97bb1c649fbf46882d5a265cb2c05aa53315d..81ae3f94d154e216b38dea349844a76a5f7293e4 100644
--- a/Scintillator/ScintDetDescr/VetoNuGeoModel/test/VetoNuGMConfig_test.py
+++ b/Scintillator/ScintDetDescr/VetoNuGeoModel/test/VetoNuGMConfig_test.py
@@ -10,7 +10,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
 
     configFlags = initConfigFlags()
-    configFlags.Input.Files = defaultTestFiles.HITS
+    configFlags.Input.Files = []
     configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-01"             # Always needed; must match FaserVersion
     #configFlags.GeoModel.Align.Dynamic    = False
     configFlags.lock()
diff --git a/Simulation/G4Faser/G4FaserAlg/CMakeLists.txt b/Simulation/G4Faser/G4FaserAlg/CMakeLists.txt
index 0bb8f41442be5091de3617cccb11e69c5c2aa1b8..54d26dc21693e025c72959c7c0b87d4e0c06f240 100644
--- a/Simulation/G4Faser/G4FaserAlg/CMakeLists.txt
+++ b/Simulation/G4Faser/G4FaserAlg/CMakeLists.txt
@@ -32,32 +32,38 @@ atlas_add_library(   G4FaserAlg
 atlas_add_test( G4FaserAlgConfig_TestFaser
                 SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/G4FaserAlgConfig_Test.py GeoModel.FaserVersion="'FASER-01'" IOVDb.GlobalTag="'OFLCOND-FASER-01'" Output.HITSFileName='faser.HITS.pool.root'
                 PROPERTIES TIMEOUT 300 
-                PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+                PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+		POST_EXEC_SCRIPT nopost.sh)
 
 atlas_add_test( G4FaserAlgConfig_TestFaserNu03
                 SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/G4FaserAlgConfig_Test.py GeoModel.FaserVersion="'FASERNU-03'" IOVDb.GlobalTag="'OFLCOND-FASER-02'" Output.HITSFileName='faserNu03.HITS.pool.root'
                 PROPERTIES TIMEOUT 300 
-                PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+                PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+		POST_EXEC_SCRIPT nopost.sh)
 
 atlas_add_test( G4FaserAlgConfig_TestFaserNu03_NewField
                 SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/G4FaserAlgConfig_Test.py GeoModel.FaserVersion="'FASERNU-03'" IOVDb.GlobalTag="'OFLCOND-FASER-03'" Output.HITSFileName='faserNu03_NewField.HITS.pool.root'
                 PROPERTIES TIMEOUT 300 
-                PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+                PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+		POST_EXEC_SCRIPT nopost.sh)
 
 atlas_add_test( G4FaserAlgConfig_TestFaserNu04
                 SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/G4FaserAlgConfig_Test.py GeoModel.FaserVersion="'FASERNU-04'" IOVDb.GlobalTag="'OFLCOND-FASER-03'" Output.HITSFileName='faserNu04.HITS.pool.root'
                 PROPERTIES TIMEOUT 300 
-                PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+                PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+		POST_EXEC_SCRIPT nopost.sh)
 
 atlas_add_test( G4FaserAlgConfig_TestTestbeam00
                 SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/G4FaserAlgConfig_Test.py GeoModel.FaserVersion="'FASER-TB00'" IOVDb.GlobalTag="'OFLCOND-FASER-TB00'" Output.HITSFileName='tb00.HITS.pool.root'
                 PROPERTIES TIMEOUT 300 
-                PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+                PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+		POST_EXEC_SCRIPT nopost.sh)
 
 atlas_add_test( G4FaserAlgConfig_TestTestbeam01
                 SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/G4FaserAlgConfig_Test.py GeoModel.FaserVersion="'FASER-TB01'" IOVDb.GlobalTag="'OFLCOND-FASER-TB00'" Output.HITSFileName='tb01.HITS.pool.root'
                 PROPERTIES TIMEOUT 300 
-                PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+                PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+		POST_EXEC_SCRIPT nopost.sh)
 
 
 # Install files from the package:
diff --git a/Simulation/G4Faser/G4FaserAlg/test/G4FaserAlgConfig_Test.py b/Simulation/G4Faser/G4FaserAlg/test/G4FaserAlgConfig_Test.py
index 48cb260542772d09584439f51466e19c995dceb9..52b464a5782d3ed92ec41f82870a17906a0ac049 100755
--- a/Simulation/G4Faser/G4FaserAlg/test/G4FaserAlgConfig_Test.py
+++ b/Simulation/G4Faser/G4FaserAlg/test/G4FaserAlgConfig_Test.py
@@ -57,7 +57,7 @@ if __name__ == '__main__':
     configFlags.addFlag("Sim.Beam.yshift", 0)        
 
     configFlags.GeoModel.FaserVersion = "FASERNU-04"             # Geometry set-up
-    configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-03"             # Conditions set-up
+    configFlags.IOVDb.GlobalTag = "OFLCOND-FASER-04"             # Conditions set-up
     configFlags.addFlag("Input.InitialTimeStamp", 0)             # To avoid autoconfig 
     #configFlags.GeoModel.Align.Dynamic = False
 #
@@ -242,5 +242,5 @@ if __name__ == '__main__':
 #
 # Success should be 0
 #
-    sys.exit(not sc.isSuccess())
+    sys.exit(sc.isSuccess())
 
diff --git a/Tracker/TrackerDetDescr/DipoleGeoModel/CMakeLists.txt b/Tracker/TrackerDetDescr/DipoleGeoModel/CMakeLists.txt
index 66d08f6cf22b8a6b6c0d8b55381524ace835e06c..46a1148581bbc946dcdec8c46f54609a605763f2 100644
--- a/Tracker/TrackerDetDescr/DipoleGeoModel/CMakeLists.txt
+++ b/Tracker/TrackerDetDescr/DipoleGeoModel/CMakeLists.txt
@@ -21,7 +21,8 @@ atlas_add_component( DipoleGeoModel
 atlas_add_test( DipoleGMConfig_test
                 SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/DipoleGMConfig_test.py
                 PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-                PROPERTIES TIMEOUT 300 )
+                PROPERTIES TIMEOUT 300
+		POST_EXEC_SCRIPT noerror.sh)
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/CMakeLists.txt b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/CMakeLists.txt
index 0e660cf5b312e99f4281267236dda3cc5506cd48..9593f5e533057dd109b2e4f33aa15b771f784337 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/CMakeLists.txt
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/CMakeLists.txt
@@ -21,7 +21,8 @@ atlas_add_component( FaserSCT_GeoModel
 atlas_add_test( FaserSCT_GMConfig_test
                 SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/FaserSCT_GMConfig_test.py
                 PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-                PROPERTIES TIMEOUT 300 )
+                PROPERTIES TIMEOUT 300
+		POST_EXEC_SCRIPT noerror.sh)
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py )
diff --git a/Tracking/Acts/FaserActsGeometry/CMakeLists.txt b/Tracking/Acts/FaserActsGeometry/CMakeLists.txt
index a98e94027bc5473f8124f2ee1ad7a029b8bba600..20567a27c6c9a4c45e2b00865bdb1d5747dce6ee 100755
--- a/Tracking/Acts/FaserActsGeometry/CMakeLists.txt
+++ b/Tracking/Acts/FaserActsGeometry/CMakeLists.txt
@@ -89,4 +89,5 @@ atlas_install_scripts( test/*.py )
 atlas_add_test( FaserActsGeometryBoundary_test
                 SCRIPT python ${CMAKE_CURRENT_SOURCE_DIR}/test/FaserActsGeometryBoundary_test.py
                 PROPERTIES WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-                PROPERTIES TIMEOUT 300 )
+                PROPERTIES TIMEOUT 300
+		POST_EXEC_SCRIPT nopost.sh)