diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_ATLFASTIIF_minbias.sh b/Simulation/ISF/ISF_Validation/test/test_Sim_ATLFASTIIF_minbias.sh
index 0fe184383a95e3286369c3819994972dd3ee977f..cbcd0e63dc63f9b78629910b55156aedb7222b66 100755
--- a/Simulation/ISF/ISF_Validation/test/test_Sim_ATLFASTIIF_minbias.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_Sim_ATLFASTIIF_minbias.sh
@@ -9,7 +9,18 @@
 # art-output: test.HITS.pool.root
 # art-output: truth.root
 
-Sim_tf.py --conditionsTag 'default:OFLCOND-RUN12-SDR-19' --physicsList 'FTFP_BERT' --truthStrategy 'MC15aPlus' --simulator 'ATLFASTIIF' --postInclude 'default:PyJobTransforms/UseFrontier.py' 'G4AtlasTests/postInclude.DCubeTest.py' --DataRunNumber '222525' --geometryVersion 'default:ATLAS-R2-2015-03-01-00' --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.119994.Pythia8_A2MSTW2008LO_minbias_inelastic.evgen.EVNT.e3099.01517253._000001.pool.root.1" --outputHITSFile "test.HITS.pool.root" --maxEvents 2000 --imf False
+Sim_tf.py \
+--conditionsTag 'default:OFLCOND-RUN12-SDR-19' \
+--physicsList 'FTFP_BERT' \
+--truthStrategy 'MC15aPlus' \
+--simulator 'ATLFASTIIF' \
+--postInclude 'default:PyJobTransforms/UseFrontier.py' 'G4AtlasTests/postInclude.DCubeTest.py' \
+--DataRunNumber '222525' \
+--geometryVersion 'default:ATLAS-R2-2015-03-01-00' \
+--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.119994.Pythia8_A2MSTW2008LO_minbias_inelastic.evgen.EVNT.e3099.01517253._000001.pool.root.1" \
+--outputHITSFile "test.HITS.pool.root" \
+--maxEvents 2000 \
+--imf False
 
 echo  "art-result: $? simulation"
 
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_ATLFASTIIF_ttbar.sh b/Simulation/ISF/ISF_Validation/test/test_Sim_ATLFASTIIF_ttbar.sh
index 0c6b6eb9f17b3054ec8201f4a8e7a5f8944bdc04..9970bea38571e2b37feba8a0ba496115e4270eda 100755
--- a/Simulation/ISF/ISF_Validation/test/test_Sim_ATLFASTIIF_ttbar.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_Sim_ATLFASTIIF_ttbar.sh
@@ -9,7 +9,18 @@
 # art-output: test.HITS.pool.root
 # art-output: truth.root
 
-Sim_tf.py --conditionsTag 'default:OFLCOND-RUN12-SDR-19' --physicsList 'FTFP_BERT' --truthStrategy 'MC15aPlus' --simulator 'ATLFASTIIF' --postInclude 'default:PyJobTransforms/UseFrontier.py' 'G4AtlasTests/postInclude.DCubeTest.py' --DataRunNumber '222525' --geometryVersion 'default:ATLAS-R2-2015-03-01-00' --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.110401.PowhegPythia_P2012_ttbar_nonallhad.evgen.EVNT.e3099.01517252._000001.pool.root.1" --outputHITSFile "test.HITS.pool.root" --maxEvents 2000 --imf False
+Sim_tf.py \
+--conditionsTag 'default:OFLCOND-RUN12-SDR-19' \
+--physicsList 'FTFP_BERT' \
+--truthStrategy 'MC15aPlus' \
+--simulator 'ATLFASTIIF' \
+--postInclude 'default:PyJobTransforms/UseFrontier.py' 'G4AtlasTests/postInclude.DCubeTest.py' \
+--DataRunNumber '222525' \
+--geometryVersion 'default:ATLAS-R2-2015-03-01-00' \
+--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.110401.PowhegPythia_P2012_ttbar_nonallhad.evgen.EVNT.e3099.01517252._000001.pool.root.1" \
+--outputHITSFile "test.HITS.pool.root" \
+--maxEvents 2000 \
+--imf False
 
 echo  "art-result: $? simulation"
 
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_ATLFASTII_ttbar.sh b/Simulation/ISF/ISF_Validation/test/test_Sim_ATLFASTII_ttbar.sh
index a88ac0a67a1a669e42acd11899bd5c4a5dcf2afe..abeea1be5b3124c21c98b7e7ce3dd5677ca87903 100755
--- a/Simulation/ISF/ISF_Validation/test/test_Sim_ATLFASTII_ttbar.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_Sim_ATLFASTII_ttbar.sh
@@ -9,7 +9,19 @@
 # art-output: test.HITS.pool.root
 # art-output: truth.root
 
-Sim_tf.py --conditionsTag 'default:OFLCOND-RUN12-SDR-19' --physicsList 'FTFP_BERT' --truthStrategy 'MC15aPlus' --simulator 'ATLFASTII' --postInclude 'default:PyJobTransforms/UseFrontier.py' 'G4AtlasTests/postInclude.DCubeTest.py' --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' --DataRunNumber '222525' --geometryVersion 'default:ATLAS-R2-2015-03-01-00' --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.110401.PowhegPythia_P2012_ttbar_nonallhad.evgen.EVNT.e3099.01517252._000001.pool.root.1" --outputHITSFile "test.HITS.pool.root" --maxEvents 250 --imf False
+Sim_tf.py \
+--conditionsTag 'default:OFLCOND-RUN12-SDR-19' \
+--physicsList 'FTFP_BERT' \
+--truthStrategy 'MC15aPlus' \
+--simulator 'ATLFASTII' \
+--postInclude 'default:PyJobTransforms/UseFrontier.py' 'G4AtlasTests/postInclude.DCubeTest.py' \
+--preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \
+--DataRunNumber '222525' \
+--geometryVersion 'default:ATLAS-R2-2015-03-01-00' \
+--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.110401.PowhegPythia_P2012_ttbar_nonallhad.evgen.EVNT.e3099.01517252._000001.pool.root.1" \
+--outputHITSFile "test.HITS.pool.root" \
+--maxEvents 250 \
+--imf False
 
 echo  "art-result: $? simulation"
 
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CalibrationHits_pions.sh b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CalibrationHits_pions.sh
index 9ade2f103c80cde2efa229f024fe090b5cd5432d..0928324ad1a72d78d841e05a1a4d36129ca49d6d 100755
--- a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CalibrationHits_pions.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CalibrationHits_pions.sh
@@ -11,7 +11,20 @@
 # art-output: comparison.root
 # art-output: comparison.ps
 
-Sim_tf.py --conditionsTag 'default:OFLCOND-RUN12-SDR-19' --physicsList 'FTFP_BERT' --truthStrategy 'MC15aPlus' --simulator 'FullG4'  --postInclude 'G4AtlasTests/postInclude.DCubeTest_CaloCalibHits.py' --preExec 'simFlags.ReleaseGeoModel=False;' --preInclude 'SimulationJobOptions/preInclude.CalHits.py,SimulationJobOptions/preInclude.ParticleID.py' --DataRunNumber '222525' --geometryVersion 'default:ATLAS-R2-2015-03-01-00' --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/pi_E50_eta0-60.evgen.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '10' --imf False
+Sim_tf.py \
+--conditionsTag 'default:OFLCOND-RUN12-SDR-19' \
+--physicsList 'FTFP_BERT' \
+--truthStrategy 'MC15aPlus' \
+--simulator 'FullG4'  \
+--postInclude 'G4AtlasTests/postInclude.DCubeTest_CaloCalibHits.py' \
+--preExec 'simFlags.ReleaseGeoModel=False;' \
+--preInclude 'SimulationJobOptions/preInclude.CalHits.py,SimulationJobOptions/preInclude.ParticleID.py' \
+--DataRunNumber '222525' \
+--geometryVersion 'default:ATLAS-R2-2015-03-01-00' \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/pi_E50_eta0-60.evgen.pool.root' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents '10' \
+--imf False
 
 echo  "art-result: $? simulation"
 
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CosmicSim.sh b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CosmicSim.sh
index 24ebbcd1971247f463273f1d7af21f9cedb7972d..f69c77feeb75d2d7e3908acd64fd510066b376b5 100755
--- a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CosmicSim.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CosmicSim.sh
@@ -9,7 +9,23 @@
 # art-output: test.HITS.pool.root
 # art-output: test.TR.pool.root
 
-Sim_tf.py --conditionsTag 'OFLCOND-RUN12-SDR-19' --physicsList 'QGSP_BERT' --truthStrategy 'MC15aPlus' --simulator 'FullG4' --outputEVNT_TRFile 'test.TR.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '1500' --randomSeed '1234' --DataRunNumber '10' --CosmicFilterVolume 'Calo' --CosmicFilterVolume2 'NONE' --preInclude 'SimulationJobOptions/preInclude.Cosmics.py' --geometryVersion 'ATLAS-R2-2015-03-01-00' --CosmicPtSlice 'NONE' --beamType 'cosmics' --imf False
+Sim_tf.py \
+--conditionsTag 'OFLCOND-RUN12-SDR-19' \
+--physicsList 'QGSP_BERT' \
+--truthStrategy 'MC15aPlus' \
+--simulator 'FullG4' \
+--outputEVNT_TRFile 'test.TR.pool.root' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents '1500' \
+--randomSeed '1234' \
+--DataRunNumber '10' \
+--CosmicFilterVolume 'Calo' \
+--CosmicFilterVolume2 'NONE' \
+--preInclude 'SimulationJobOptions/preInclude.Cosmics.py' \
+--geometryVersion 'ATLAS-R2-2015-03-01-00' \
+--CosmicPtSlice 'NONE' \
+--beamType 'cosmics' \
+--imf False
 
 echo  "art-result: $? simulation"
 
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CosmicSimTR.sh b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CosmicSimTR.sh
index 2f409444d799d17c08bceb82d1a9099e2378b792..a7469fc5e79902abe36129007ceb060467ad0629 100755
--- a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CosmicSimTR.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_CosmicSimTR.sh
@@ -8,7 +8,21 @@
 # art-type: grid
 # art-output: test.HITS.pool.root
 
-Sim_tf.py --conditionsTag 'OFLCOND-RUN12-SDR-19'  --physicsList 'QGSP_BERT' --truthStrategy 'MC15aPlus' --simulator 'FullG4' --inputEVNT_TRFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/Cosmics.TR.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents -1 --randomSeed 1234 --DataRunNumber '10' --geometryVersion 'ATLAS-R2-2015-03-01-00' --firstEvent 0 --preInclude 'SimulationJobOptions/preInclude.Cosmics.py' --beamType 'cosmics' --imf False
+Sim_tf.py \
+--conditionsTag 'OFLCOND-RUN12-SDR-19'  \
+--physicsList 'QGSP_BERT' \
+--truthStrategy 'MC15aPlus' \
+--simulator 'FullG4' \
+--inputEVNT_TRFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/Cosmics.TR.pool.root' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents -1 \
+--randomSeed 1234 \
+--DataRunNumber '10' \
+--geometryVersion 'ATLAS-R2-2015-03-01-00' \
+--firstEvent 0 \
+--preInclude 'SimulationJobOptions/preInclude.Cosmics.py' \
+--beamType 'cosmics' \
+--imf False
 
 echo  "art-result: $? simulation"
 
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_ReproducibilityTest.sh b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_ReproducibilityTest.sh
index e557ef51b7d1a10e9326950079ceec18f2522aee..a5af2dfa0a5fc2853479b9ba1d63018db9126e43 100755
--- a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_ReproducibilityTest.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_ReproducibilityTest.sh
@@ -15,17 +15,53 @@
 # art-output: hitsFullMerged.ttbar.pool.root
 
 # Run 10 events normally
-Sim_tf.py --conditionsTag 'default:OFLCOND-RUN12-SDR-19' --physicsList 'FTFP_BERT' --truthStrategy 'MC15aPlus' --simulator 'FullG4' --postInclude 'default:PyJobTransforms/UseFrontier.py' --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' --DataRunNumber '222525' --geometryVersion 'default:ATLAS-R2-2015-03-01-00' --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.110401.PowhegPythia_P2012_ttbar_nonallhad.evgen.EVNT.e3099.01517252._000001.pool.root.1' --outputHITSFile 'hitsFull.ttbar.pool.root' --maxEvents '10' --skipEvents '0'
+Sim_tf.py \
+--conditionsTag 'default:OFLCOND-RUN12-SDR-19' \
+--physicsList 'FTFP_BERT' \
+--truthStrategy 'MC15aPlus' \
+--simulator 'FullG4' \
+--postInclude 'default:PyJobTransforms/UseFrontier.py' \
+--preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \
+--DataRunNumber '222525' \
+--geometryVersion 'default:ATLAS-R2-2015-03-01-00' \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.110401.PowhegPythia_P2012_ttbar_nonallhad.evgen.EVNT.e3099.01517252._000001.pool.root.1' \
+--outputHITSFile 'hitsFull.ttbar.pool.root' \
+--maxEvents '10' \
+--skipEvents '0'
 
 echo "art-result: $? unsplit-sim"
 
 # Run first 5 events
-Sim_tf.py --conditionsTag 'default:OFLCOND-RUN12-SDR-19' --physicsList 'FTFP_BERT' --truthStrategy 'MC15aPlus' --simulator 'FullG4' --postInclude 'default:PyJobTransforms/UseFrontier.py' --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' --DataRunNumber '222525' --geometryVersion 'default:ATLAS-R2-2015-03-01-00' --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.110401.PowhegPythia_P2012_ttbar_nonallhad.evgen.EVNT.e3099.01517252._000001.pool.root.1' --outputHITSFile 'hitsHalf1.ttbar.pool.root' --maxEvents '5' --skipEvents '0'
+Sim_tf.py \
+--conditionsTag 'default:OFLCOND-RUN12-SDR-19' \
+--physicsList 'FTFP_BERT' \
+--truthStrategy 'MC15aPlus' \
+--simulator 'FullG4' \
+--postInclude 'default:PyJobTransforms/UseFrontier.py' \
+--preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \
+--DataRunNumber '222525' \
+--geometryVersion 'default:ATLAS-R2-2015-03-01-00' \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.110401.PowhegPythia_P2012_ttbar_nonallhad.evgen.EVNT.e3099.01517252._000001.pool.root.1' \
+--outputHITSFile 'hitsHalf1.ttbar.pool.root' \
+--maxEvents '5' \
+--skipEvents '0'
 
 echo "art-result: $? split-sim1"
 
 # Run next 5 events
-Sim_tf.py --conditionsTag 'default:OFLCOND-RUN12-SDR-19' --physicsList 'FTFP_BERT' --truthStrategy 'MC15aPlus' --simulator 'FullG4' --postInclude 'default:PyJobTransforms/UseFrontier.py' --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' --DataRunNumber '222525' --geometryVersion 'default:ATLAS-R2-2015-03-01-00' --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.110401.PowhegPythia_P2012_ttbar_nonallhad.evgen.EVNT.e3099.01517252._000001.pool.root.1' --outputHITSFile 'hitsHalf2.ttbar.pool.root' --maxEvents '5' --skipEvents '5'
+Sim_tf.py \
+--conditionsTag 'default:OFLCOND-RUN12-SDR-19' \
+--physicsList 'FTFP_BERT' \
+--truthStrategy 'MC15aPlus' \
+--simulator 'FullG4' \
+--postInclude 'default:PyJobTransforms/UseFrontier.py' \
+--preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \
+--DataRunNumber '222525' \
+--geometryVersion 'default:ATLAS-R2-2015-03-01-00' \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.110401.PowhegPythia_P2012_ttbar_nonallhad.evgen.EVNT.e3099.01517252._000001.pool.root.1' \
+--outputHITSFile 'hitsHalf2.ttbar.pool.root' \
+--maxEvents '5' \
+--skipEvents '5'
 
 echo "art-result: $? split-sim2"
 
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_ZPrime_QuasiStable.sh b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_ZPrime_QuasiStable.sh
index 7e1bb1ac784ac1765a71e810db36dedc717e0a8d..22d9338e08337f1d1f7b943409deae678de81ccf 100755
--- a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_ZPrime_QuasiStable.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_ZPrime_QuasiStable.sh
@@ -9,7 +9,19 @@
 # art-output: test.HITS.pool.root
 # art-output: truth.root
 
-Sim_tf.py --conditionsTag 'default:OFLCOND-RUN12-SDR-19' --physicsList 'FTFP_BERT' --truthStrategy 'MC15aPlus' --simulator 'FullG4_LongLived' --postInclude 'default:PyJobTransforms/UseFrontier.py,G4AtlasTests/postInclude.DCubeTest.py' --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py' --DataRunNumber '222525' --geometryVersion 'default:ATLAS-R2-2015-03-01-00' --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/EVNT.04607198._000001.pool.root.1" --outputHITSFile "test.HITS.pool.root" --maxEvents 10 --imf False
+Sim_tf.py \
+--conditionsTag 'default:OFLCOND-RUN12-SDR-19' \
+--physicsList 'FTFP_BERT' \
+--truthStrategy 'MC15aPlus' \
+--simulator 'FullG4_LongLived' \
+--postInclude 'default:PyJobTransforms/UseFrontier.py,G4AtlasTests/postInclude.DCubeTest.py' \
+--preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py' \
+--DataRunNumber '222525' \
+--geometryVersion 'default:ATLAS-R2-2015-03-01-00' \
+--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/EVNT.04607198._000001.pool.root.1" \
+--outputHITSFile "test.HITS.pool.root" \
+--maxEvents 10 \
+--imf False
 
 echo  "art-result: $? simulation"
 
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_minbias.sh b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_minbias.sh
index 0fea439c0d0dcbf272dd3a8d8b07a009cb342b07..3278d7e44a3229f521809b8fec1be1e6d464fbfe 100755
--- a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_minbias.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_minbias.sh
@@ -9,7 +9,19 @@
 # art-output: test.HITS.pool.root
 # art-output: truth.root
 
-Sim_tf.py --conditionsTag 'default:OFLCOND-RUN12-SDR-19' --physicsList 'FTFP_BERT' --truthStrategy 'MC15aPlus' --simulator 'FullG4' --postInclude 'default:PyJobTransforms/UseFrontier.py,G4AtlasTests/postInclude.DCubeTest.py' --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py' --DataRunNumber '222525' --geometryVersion 'default:ATLAS-R2-2015-03-01-00' --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.119994.Pythia8_A2MSTW2008LO_minbias_inelastic.evgen.EVNT.e3099.01517253._000001.pool.root.1" --outputHITSFile "test.HITS.pool.root" --maxEvents 50 --imf False
+Sim_tf.py \
+--conditionsTag 'default:OFLCOND-RUN12-SDR-19' \
+--physicsList 'FTFP_BERT' \
+--truthStrategy 'MC15aPlus' \
+--simulator 'FullG4' \
+--postInclude 'default:PyJobTransforms/UseFrontier.py,G4AtlasTests/postInclude.DCubeTest.py' \
+--preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py,SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py' \
+--DataRunNumber '222525' \
+--geometryVersion 'default:ATLAS-R2-2015-03-01-00' \
+--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.119994.Pythia8_A2MSTW2008LO_minbias_inelastic.evgen.EVNT.e3099.01517253._000001.pool.root.1" \
+--outputHITSFile "test.HITS.pool.root" \
+--maxEvents 50 \
+--imf False
 
 echo  "art-result: $? simulation"
 
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_ttbar.sh b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_ttbar.sh
index 07c397bc42559993856e5d0ce6fb2ddd4a0f99ca..b4f557ff27f03b59ad4eefaeed3bdb2814e93a80 100755
--- a/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_ttbar.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_Sim_FullG4_ttbar.sh
@@ -9,13 +9,25 @@
 # art-output: test.HITS.pool.root
 # art-output: truth.root
 
-Sim_tf.py --conditionsTag 'default:OFLCOND-RUN12-SDR-19' --physicsList 'FTFP_BERT' --truthStrategy 'MC15aPlus' --simulator 'FullG4' --postInclude 'default:PyJobTransforms/UseFrontier.py,G4AtlasTests/postInclude.DCubeTest.py' --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' --DataRunNumber '222525' --geometryVersion 'default:ATLAS-R2-2015-03-01-00' --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.110401.PowhegPythia_P2012_ttbar_nonallhad.evgen.EVNT.e3099.01517252._000001.pool.root.1' --outputHITSFile 'test.HITS.pool.root' --maxEvents '4' --imf False
+Sim_tf.py \
+--conditionsTag 'default:OFLCOND-RUN12-SDR-19' \
+--physicsList 'FTFP_BERT' \
+--truthStrategy 'MC15aPlus' \
+--simulator 'FullG4' \
+--postInclude 'default:PyJobTransforms/UseFrontier.py,G4AtlasTests/postInclude.DCubeTest.py' \
+--preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \
+--DataRunNumber '222525' \
+--geometryVersion 'default:ATLAS-R2-2015-03-01-00' \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.110401.PowhegPythia_P2012_ttbar_nonallhad.evgen.EVNT.e3099.01517252._000001.pool.root.1' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents '4' \
+--imf False
 
 echo  "art-result: $? simulation"
 
 ArtPackage=$1
 ArtJobName=$2
 # TODO This is a regression test I think. We would also need to compare these files to fixed references
-art.py compare grid ${ArtPackage} ${ArtJobName}
+art.py compare grid  --entries 4 ${ArtPackage} ${ArtJobName}
 
 echo  "art-result: $? regression"
diff --git a/Simulation/ISF/ISF_Validation/test/test_Sim_G4FastCalo_ttbar.sh b/Simulation/ISF/ISF_Validation/test/test_Sim_G4FastCalo_ttbar.sh
index 92a5cd438e320025a23565b8bcb72abdc5b86d45..d51f2d6f64db149b4c5bda57ed508132caec5db6 100755
--- a/Simulation/ISF/ISF_Validation/test/test_Sim_G4FastCalo_ttbar.sh
+++ b/Simulation/ISF/ISF_Validation/test/test_Sim_G4FastCalo_ttbar.sh
@@ -9,7 +9,19 @@
 # art-output: test.HITS.pool.root
 # art-output: truth.root
 
-Sim_tf.py --conditionsTag 'default:OFLCOND-RUN12-SDR-19' --physicsList 'FTFP_BERT' --truthStrategy 'MC15aPlus' --simulator 'G4FastCalo' --postInclude 'default:PyJobTransforms/UseFrontier.py' 'G4AtlasTests/postInclude.DCubeTest.py' --preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' --DataRunNumber '222525' --geometryVersion 'default:ATLAS-R2-2015-03-01-00' --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.110401.PowhegPythia_P2012_ttbar_nonallhad.evgen.EVNT.e3099.01517252._000001.pool.root.1" --outputHITSFile "test.HITS.pool.root" --maxEvents 250 --imf False
+Sim_tf.py \
+--conditionsTag 'default:OFLCOND-RUN12-SDR-19' \
+--physicsList 'FTFP_BERT' \
+--truthStrategy 'MC15aPlus' \
+--simulator 'G4FastCalo' \
+--postInclude 'default:PyJobTransforms/UseFrontier.py' 'EVNTtoHITS:G4AtlasTests/postInclude.DCubeTest.py' \
+--preInclude 'EVNTtoHITS:SimulationJobOptions/preInclude.BeamPipeKill.py' \
+--DataRunNumber '222525' \
+--geometryVersion 'default:ATLAS-R2-2015-03-01-00' \
+--inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ISF_Validation/mc12_valid.110401.PowhegPythia_P2012_ttbar_nonallhad.evgen.EVNT.e3099.01517252._000001.pool.root.1" \
+--outputHITSFile "test.HITS.pool.root" \
+--maxEvents 250 \
+--imf False
 
 echo  "art-result: $? simulation"
 
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2010GeomSim.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2010GeomSim.sh
index f2bb9cbb5cec3a254b9f6269aa05eca92be64bd2..8ec1a25c51ba2ae40ef90bd8b29f04682b575e34 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2010GeomSim.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2010GeomSim.sh
@@ -10,7 +10,18 @@
 # art-type: grid
 # art-output: test.HITS.pool.root
 
-AtlasG4_tf.py --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/mu_E200_eta0-25.evgen.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '10' --skipEvents '0' --randomSeed '10' --geometryVersion 'ATLAS-R1-2010-02-00-00' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '155697' --physicsList 'FTFP_BERT' --postInclude 'PyJobTransforms/UseFrontier.py' --imf False
+AtlasG4_tf.py \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/mu_E200_eta0-25.evgen.pool.root' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents '10' \
+--skipEvents '0' \
+--randomSeed '10' \
+--geometryVersion 'ATLAS-R1-2010-02-00-00' \
+--conditionsTag 'OFLCOND-RUN12-SDR-19' \
+--DataRunNumber '155697' \
+--physicsList 'FTFP_BERT' \
+--postInclude 'PyJobTransforms/UseFrontier.py' \
+--imf False
 
 echo  "art-result: $? simulation"
 
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2011GeomSim.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2011GeomSim.sh
index 16f80ef84b86235c0d0ad00d0be17217d8bb14f0..7a8c1ae1e3725e122b315d7e2a8b0bf545fbda95 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2011GeomSim.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2011GeomSim.sh
@@ -10,7 +10,18 @@
 # art-type: grid
 # art-output: test.HITS.pool.root
 
-AtlasG4_tf.py --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/mu_E200_eta0-25.evgen.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '10' --skipEvents '0' --randomSeed '10' --geometryVersion 'ATLAS-R1-2011-02-00-00' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '180164' --physicsList 'FTFP_BERT' --postInclude 'PyJobTransforms/UseFrontier.py' --imf False
+AtlasG4_tf.py \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/mu_E200_eta0-25.evgen.pool.root' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents '10' \
+--skipEvents '0' \
+--randomSeed '10' \
+--geometryVersion 'ATLAS-R1-2011-02-00-00' \
+--conditionsTag 'OFLCOND-RUN12-SDR-19' \
+--DataRunNumber '180164' \
+--physicsList 'FTFP_BERT' \
+--postInclude 'PyJobTransforms/UseFrontier.py' \
+--imf False
 
 echo  "art-result: $? simulation"
 
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2012GeomSim.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2012GeomSim.sh
index b604bce92702e300502466f2b0df6fa2786c1acf..23bba416dea6808329711388257128b375a9363b 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2012GeomSim.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2012GeomSim.sh
@@ -10,7 +10,18 @@
 # art-type: grid
 # art-output: test.HITS.pool.root
 
-AtlasG4_tf.py --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/mu_E200_eta0-25.evgen.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '10' --skipEvents '0' --randomSeed '10' --geometryVersion 'ATLAS-R1-2012-03-00-00' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '212272' --physicsList 'FTFP_BERT' --postInclude 'PyJobTransforms/UseFrontier.py' --imf False
+AtlasG4_tf.py \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/mu_E200_eta0-25.evgen.pool.root' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents '10' \
+--skipEvents '0' \
+--randomSeed '10' \
+--geometryVersion 'ATLAS-R1-2012-03-00-00' \
+--conditionsTag 'OFLCOND-RUN12-SDR-19' \
+--DataRunNumber '212272' \
+--physicsList 'FTFP_BERT' \
+--postInclude 'PyJobTransforms/UseFrontier.py' \
+--imf False
 
 echo  "art-result: $? simulation"
 
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_AFPSimTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_AFPSimTest.sh
index 1a352f41ceb91e867ea69bcdbd27572d2bac73f0..ad3a5e075ce4c8461d65ce35c88746c2b472472b 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_AFPSimTest.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_AFPSimTest.sh
@@ -9,13 +9,24 @@
 # art-output: test.HITS.pool.root
 
 # FIXME need an AFP-specific single particle generator configuration
-AtlasG4_tf.py --preInclude 'G4AtlasTests/preInclude.ALFA_SingleParticle.py' --outputHITSFile 'test.HITS.pool.root' --maxEvents '3' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --AFPOn 'True' --postInclude 'PyJobTransforms/UseFrontier.py' --imf False
+AtlasG4_tf.py \
+--preInclude 'G4AtlasTests/preInclude.ALFA_SingleParticle.py' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents '3' \
+--randomSeed '10' \
+--geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' \
+--conditionsTag 'OFLCOND-RUN12-SDR-19' \
+--DataRunNumber '222525' \
+--physicsList 'FTFP_BERT' \
+--AFPOn 'True' \
+--postInclude 'PyJobTransforms/UseFrontier.py' \
+--imf False
 
 echo  "art-result: $? simulation"
 
 ArtPackage=$1
 ArtJobName=$2
 # TODO This is a regression test I think. We would also need to compare these files to fixed references and run DCube
-art.py compare grid ${ArtPackage} ${ArtJobName}
+art.py compare grid --entries 3 ${ArtPackage} ${ArtJobName}
 
 echo  "art-result: $? regression"
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ALFASimTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ALFASimTest.sh
index a73d2dd8551817db692b657465a3d7773fcbd3da..c1c5ece1a9a80539ce2a75ac0e9a80a166b8a235 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ALFASimTest.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ALFASimTest.sh
@@ -9,13 +9,24 @@
 # art-output: test.HITS.pool.root
 # art-output: truth.root
 
-AtlasG4_tf.py --preInclude 'G4AtlasTests/preInclude.ALFA_SingleParticle.py' --outputHITSFile 'test.HITS.pool.root' --maxEvents '3' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --ALFAOn 'True' --postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:G4AtlasTests/postInclude.ALFA_dcube.py' --imf False
+AtlasG4_tf.py \
+--preInclude 'G4AtlasTests/preInclude.ALFA_SingleParticle.py' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents '3' \
+--randomSeed '10' \
+--geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' \
+--conditionsTag 'OFLCOND-RUN12-SDR-19' \
+--DataRunNumber '222525' \
+--physicsList 'FTFP_BERT' \
+--ALFAOn 'True' \
+--postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:G4AtlasTests/postInclude.ALFA_dcube.py' \
+--imf False
 
 echo  "art-result: $? simulation"
 
 ArtPackage=$1
 ArtJobName=$2
 # TODO This is a regression test I think. We would also need to compare these files to fixed references and add DCube tests
-art.py compare grid ${ArtPackage} ${ArtJobName}
+art.py compare grid --entries 3 ${ArtPackage} ${ArtJobName}
 
 echo  "art-result: $? regression"
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_EVNT2TR.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_EVNT2TR.sh
index 571d6067f2f3aa35d047f726d4942549185f649b..7629e7d2a4e408ebe36ea6f6ae7160dd3946dc2f 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_EVNT2TR.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_EVNT2TR.sh
@@ -10,13 +10,25 @@
 # art-type: grid
 # art-output: test.EVNT.pool.root
 
-AtlasG4_tf.py --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/minbias_Inelastic_low-pythia8-7000.evgen.pool.root' --outputHITSFile 'discard.HITS.pool.root' --outputEVNT_TRFile 'test.EVNT.pool.root' --maxEvents '2' --skipEvents '0' --randomSeed '5678' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'QGSP_BERT_HP' --postInclude 'PyJobTransforms/UseFrontier.py' --imf False
+AtlasG4_tf.py \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/minbias_Inelastic_low-pythia8-7000.evgen.pool.root' \
+--outputHITSFile 'discard.HITS.pool.root' \
+--outputEVNT_TRFile 'test.EVNT.pool.root' \
+--maxEvents '2' \
+--skipEvents '0' \
+--randomSeed '5678' \
+--geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' \
+--conditionsTag 'OFLCOND-RUN12-SDR-19' \
+--DataRunNumber '222525' \
+--physicsList 'QGSP_BERT_HP' \
+--postInclude 'PyJobTransforms/UseFrontier.py' \
+--imf False
 
 echo  "art-result: $? simulation"
 
 ArtPackage=$1
 ArtJobName=$2
 # TODO This is a regression test I think. We would also need to compare these files to fixed references
-art.py compare grid ${ArtPackage} ${ArtJobName}
+art.py compare grid --entries 2 ${ArtPackage} ${ArtJobName}
 
 echo  "art-result: $? regression"
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_TR2HITS.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_TR2HITS.sh
index ece02cbcf4a413897d5ba554e9d0e63acc7613df..95b5a5f773f1924f795e41454d02a714d060a851 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_TR2HITS.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_TR2HITS.sh
@@ -10,13 +10,24 @@
 # art-type: grid
 # art-output: test.HITS.pool.root
 
-AtlasG4_tf.py --inputEVNT_TRFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/cavernbg-pythia8-7000.evgen.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '5' --skipEvents '0' --randomSeed '8765' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'QGSP_BERT_HP' --postInclude 'PyJobTransforms/UseFrontier.py' --imf False
+AtlasG4_tf.py \
+--inputEVNT_TRFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/cavernbg-pythia8-7000.evgen.pool.root' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents '5' \
+--skipEvents '0' \
+--randomSeed '8765' \
+--geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' \
+--conditionsTag 'OFLCOND-RUN12-SDR-19' \
+--DataRunNumber '222525' \
+--physicsList 'QGSP_BERT_HP' \
+--postInclude 'PyJobTransforms/UseFrontier.py' \
+--imf False
 
 echo  "art-result: $? simulation"
 
 ArtPackage=$1
 ArtJobName=$2
 # TODO This is a regression test I think. We would also need to compare these files to fixed references
-art.py compare grid ${ArtPackage} ${ArtJobName}
+art.py compare grid --entries 5 ${ArtPackage} ${ArtJobName}
 
 echo  "art-result: $? regression"
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSim.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSim.sh
index c4fb23049f706500814a989295b2afee0ce109a3..044004e5d9817dcb6904dfbaf241b1be6ba0a723 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSim.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSim.sh
@@ -9,7 +9,21 @@
 # art-output: test.HITS.pool.root
 # art-output: test.TR.pool.root
 
-AtlasG4_tf.py --outputHITSFile 'test.HITS.pool.root' --maxEvents '1500' --randomSeed '1234' --DataRunNumber '222525' --CosmicFilterVolume 'Calo' --CosmicFilterVolume2 'NONE' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --physicsList 'FTFP_BERT' --CosmicPtSlice 'NONE' --outputEVNT_TRFile 'test.TR.pool.root' --beamType 'cosmics' --postInclude 'PyJobTransforms/UseFrontier.py' --imf False
+AtlasG4_tf.py \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents '1500' \
+--randomSeed '1234' \
+--DataRunNumber '222525' \
+--CosmicFilterVolume 'Calo' \
+--CosmicFilterVolume2 'NONE' \
+--geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' \
+--conditionsTag 'OFLCOND-RUN12-SDR-19' \
+--physicsList 'FTFP_BERT' \
+--CosmicPtSlice 'NONE' \
+--outputEVNT_TRFile 'test.TR.pool.root' \
+--beamType 'cosmics' \
+--postInclude 'PyJobTransforms/UseFrontier.py' \
+--imf False
 
 echo  "art-result: $? simulation"
 
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSimTR.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSimTR.sh
index 78adf665ff9ba2c4336b2740f926eeab83dbd269..333d6e082459dc5ebab2e112061588cb6ab973d3 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSimTR.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSimTR.sh
@@ -8,7 +8,19 @@
 # art-type: grid
 # art-output: test.HITS.pool.root
 
-AtlasG4_tf.py --inputEVNT_TRFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/Cosmics.TR.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '-1' --randomSeed '1234' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --physicsList 'FTFP_BERT' --DataRunNumber '222525' --firstEvent '0' --beamType 'cosmics' --postInclude 'PyJobTransforms/UseFrontier.py' --imf False
+AtlasG4_tf.py \
+--inputEVNT_TRFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/Cosmics.TR.pool.root' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents '-1' \
+--randomSeed '1234' \
+--geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' \
+--conditionsTag 'OFLCOND-RUN12-SDR-19' \
+--physicsList 'FTFP_BERT' \
+--DataRunNumber '222525' \
+--firstEvent '0' \
+--beamType 'cosmics' \
+--postInclude 'PyJobTransforms/UseFrontier.py' \
+--imf False
 
 echo  "art-result: $? simulation"
 
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FrozenShowerFCalOnly.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FrozenShowerFCalOnly.sh
index 43ef425b585e33afb629802ce960a84c0c418478..6e215ff79e94055072b0421a5f30157fc3d85fdd 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FrozenShowerFCalOnly.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FrozenShowerFCalOnly.sh
@@ -10,13 +10,25 @@
 # art-type: grid
 # art-output: test.HITS.pool.root
 
-AtlasG4_tf.py --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/e_E50_eta34_49.EVNT.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents 10 --skipEvents 0 --randomSeed 10 --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --preInclude 'SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py' --postInclude 'PyJobTransforms/UseFrontier.py' --imf False
+AtlasG4_tf.py \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/e_E50_eta34_49.EVNT.pool.root' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents 10 \
+--skipEvents 0 \
+--randomSeed 10 \
+--geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' \
+--conditionsTag 'OFLCOND-RUN12-SDR-19' \
+--DataRunNumber '222525' \
+--physicsList 'FTFP_BERT' \
+--preInclude 'SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py' \
+--postInclude 'PyJobTransforms/UseFrontier.py' \
+--imf False
 
 echo  "art-result: $? simulation"
 
 ArtPackage=$1
 ArtJobName=$2
 # TODO This is a regression test I think. We would also need to compare these files to fixed references
-art.py compare grid ${ArtPackage} ${ArtJobName}
+art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName}
 
 echo  "art-result: $? regression"
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FtfpBertAtlTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FtfpBertAtlTest.sh
index 98b2454d1563e82442d61496bee6ec9ce498dc66..ecc42f3ef48fb056baa26283f6ab0eda774dfd29 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FtfpBertAtlTest.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FtfpBertAtlTest.sh
@@ -10,13 +10,24 @@
 # art-type: grid
 # art-output: test.HITS.pool.root
 
-AtlasG4_tf.py --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/J2_jetjet-pythia6-7000.evgen.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '5' --skipEvents '0' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT_ATL' --postInclude 'PyJobTransforms/UseFrontier.py' --imf False
+AtlasG4_tf.py \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/J2_jetjet-pythia6-7000.evgen.pool.root' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents '5' \
+--skipEvents '0' \
+--randomSeed '10' \
+--geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' \
+--conditionsTag 'OFLCOND-RUN12-SDR-19' \
+--DataRunNumber '222525' \
+--physicsList 'FTFP_BERT_ATL' \
+--postInclude 'PyJobTransforms/UseFrontier.py' \
+--imf False
 
 echo  "art-result: $? simulation"
 
 ArtPackage=$1
 ArtJobName=$2
 # TODO This is a regression test I think. We would also need to compare these files to fixed references
-art.py compare grid ${ArtPackage} ${ArtJobName}
+art.py compare grid --entries 5 ${ArtPackage} ${ArtJobName}
 
 echo  "art-result: $? regression"
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_HeavyIonSim.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_HeavyIonSim.sh
index 64de063f20c644da73b29422c22ea7af79d6a89b..d654539be59b59cc3184add4c3553616eca256ed 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_HeavyIonSim.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_HeavyIonSim.sh
@@ -10,13 +10,24 @@
 # art-type: grid
 # art-output: test.HITS.pool.root
 
-AtlasG4_tf.py --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/pbpb_Peripheral-hijing-5500.evgen.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '1' --skipEvents '4' --randomSeed '10' --geometryVersion 'ATLAS-R1-2012-03-00-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '210184' --physicsList 'FTFP_BERT' --postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:SimulationJobOptions/postInclude.HijingPars.py' --imf False
+AtlasG4_tf.py \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/pbpb_Peripheral-hijing-5500.evgen.pool.root' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents '1' \
+--skipEvents '4' \
+--randomSeed '10' \
+--geometryVersion 'ATLAS-R1-2012-03-00-00_VALIDATION' \
+--conditionsTag 'OFLCOND-RUN12-SDR-19' \
+--DataRunNumber '210184' \
+--physicsList 'FTFP_BERT' \
+--postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:SimulationJobOptions/postInclude.HijingPars.py' \
+--imf False
 
 echo  "art-result: $? simulation"
 
 ArtPackage=$1
 ArtJobName=$2
 # TODO This is a regression test I think. We would also need to compare these files to fixed references
-art.py compare grid ${ArtPackage} ${ArtJobName}
+art.py compare grid --entries 1 ${ArtPackage} ${ArtJobName}
 
 echo  "art-result: $? regression"
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_LucidSimTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_LucidSimTest.sh
index f0ee578fb3967cada1a3037c19ded8ab761ba94b..95fb32f6c5e7d76baa4ad67336f82788039290d1 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_LucidSimTest.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_LucidSimTest.sh
@@ -10,13 +10,25 @@
 # art-type: grid
 # art-output: test.HITS.pool.root
 
-AtlasG4_tf.py --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/minbias_Inelastic-pythia8-7000.evgen.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '3' --skipEvents '0' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --LucidOn 'True' --postInclude 'PyJobTransforms/UseFrontier.py' --imf False
+AtlasG4_tf.py \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/minbias_Inelastic-pythia8-7000.evgen.pool.root' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents '3' \
+--skipEvents '0' \
+--randomSeed '10' \
+--geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' \
+--conditionsTag 'OFLCOND-RUN12-SDR-19' \
+--DataRunNumber '222525' \
+--physicsList 'FTFP_BERT' \
+--LucidOn 'True' \
+--postInclude 'PyJobTransforms/UseFrontier.py' \
+--imf False
 
 echo  "art-result: $? simulation"
 
 ArtPackage=$1
 ArtJobName=$2
 # TODO This is a regression test I think. We would also need to compare these files to fixed references and add DCube tests
-art.py compare grid ${ArtPackage} ${ArtJobName}
+art.py compare grid --entries 3 ${ArtPackage} ${ArtJobName}
 
 echo  "art-result: $? regression"
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_NSWSimTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_NSWSimTest.sh
index 0f8285590a1c074a7a1b1071a76680c340c6a8a6..9ad2d65507f3cc364291d8abe60f88d3664f6ed0 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_NSWSimTest.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_NSWSimTest.sh
@@ -8,7 +8,18 @@
 # art-output: test.HITS.pool.root
 # art-output: truth.root
 
-AtlasG4_tf.py --preInclude 'G4AtlasTests/ParticleGun_flatpt_2particle.py' --outputHITSFile 'test.HITS.pool.root' --maxEvents '200' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00' --conditionsTag 'OFLCOND-RUN12-SDR-25' --physicsList 'FTFP_BERT' --DBRelease 'current' --postInclude 'G4AtlasTests/postInclude.DCubeTest.py,G4AtlasTests/postInclude.NSW.config.simu.py' --preExec 'simFlags.ReleaseGeoModel=False;simFlags.SimulateNewSmallWheel=True;' --imf False
+AtlasG4_tf.py \
+--preInclude 'G4AtlasTests/ParticleGun_flatpt_2particle.py' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents '200' \
+--randomSeed '10' \
+--geometryVersion 'ATLAS-R2-2015-03-01-00' \
+--conditionsTag 'OFLCOND-RUN12-SDR-25' \
+--physicsList 'FTFP_BERT' \
+--DBRelease 'current' \
+--postInclude 'G4AtlasTests/postInclude.DCubeTest.py,G4AtlasTests/postInclude.NSW.config.simu.py' \
+--preExec 'simFlags.ReleaseGeoModel=False;simFlags.SimulateNewSmallWheel=True;' \
+--imf False
 
 echo  "art-result: $? simulation"
 
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_NeutronCutTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_NeutronCutTest.sh
index 57820aeaf311fd73032759892909fd3ac5e9df8d..847ba910784d56244c71073fa00c2727b31d8b1b 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_NeutronCutTest.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_NeutronCutTest.sh
@@ -10,13 +10,25 @@
 # art-type: grid
 # art-output: test.HITS.pool.root
 
-AtlasG4_tf.py --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/A3_Ztautau_filter-pythia6-7000.evgen.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '5' --skipEvents '0' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --preInclude 'SimulationJobOptions/preInclude.G4SignalCavern.py' --postInclude 'PyJobTransforms/UseFrontier.py' --imf False
+AtlasG4_tf.py \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/A3_Ztautau_filter-pythia6-7000.evgen.pool.root' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents '5' \
+--skipEvents '0' \
+--randomSeed '10' \
+--geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' \
+--conditionsTag 'OFLCOND-RUN12-SDR-19' \
+--DataRunNumber '222525' \
+--physicsList 'FTFP_BERT' \
+--preInclude 'SimulationJobOptions/preInclude.G4SignalCavern.py' \
+--postInclude 'PyJobTransforms/UseFrontier.py' \
+--imf False
 
 echo  "art-result: $? simulation"
 
 ArtPackage=$1
 ArtJobName=$2
 # TODO This is a regression test I think. We would also need to compare these files to fixed references
-art.py compare grid ${ArtPackage} ${ArtJobName}
+art.py compare grid --entries 5 ${ArtPackage} ${ArtJobName}
 
 echo  "art-result: $? regression"
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_QgsBicTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_QgsBicTest.sh
index a1f2db8b33ae95b0a46a53eed442252b3f9a838c..1e3b83788584661e1be5df26cd54c8ad935c83a7 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_QgsBicTest.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_QgsBicTest.sh
@@ -10,13 +10,24 @@
 # art-type: grid
 # art-output: test.HITS.pool.root
 
-AtlasG4_tf.py --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/susy_SU3-herwigpp-7000.evgen.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '5' --skipEvents '0' --randomSeed '42' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'QGSP_BIC' --postInclude 'PyJobTransforms/UseFrontier.py' --imf False
+AtlasG4_tf.py \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/susy_SU3-herwigpp-7000.evgen.pool.root' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents '5' \
+--skipEvents '0' \
+--randomSeed '42' \
+--geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' \
+--conditionsTag 'OFLCOND-RUN12-SDR-19' \
+--DataRunNumber '222525' \
+--physicsList 'QGSP_BIC' \
+--postInclude 'PyJobTransforms/UseFrontier.py' \
+--imf False
 
 echo  "art-result: $? simulation"
 
 ArtPackage=$1
 ArtJobName=$2
 # TODO This is a regression test I think. We would also need to compare these files to fixed references
-art.py compare grid ${ArtPackage} ${ArtJobName}
+art.py compare grid --entries 5 ${ArtPackage} ${ArtJobName}
 
 echo  "art-result: $? regression"
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ReproducibilityTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ReproducibilityTest.sh
index 59310193b57ba76e3d4ca3ef607590c6af17ce9a..44990195f55f5f4fe212a595d222aea39d836bb1 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ReproducibilityTest.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ReproducibilityTest.sh
@@ -15,17 +15,38 @@
 # art-output: hitsFullMerged.ttbar.pool.root
 
 # Run 10 events normally
-AtlasG4_tf.py --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/ttbar_muplusjets-pythia6-7000.evgen.pool.root' --DataRunNumber '222510' --geometryVersion 'ATLAS-R2-2015-03-01-00' --conditionsTag 'OFLCOND-RUN12-SDR-21' --outputHITSFile 'hitsFull.ttbar.pool.root' --maxEvents '10' --skipEvents '0'
+AtlasG4_tf.py \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/ttbar_muplusjets-pythia6-7000.evgen.pool.root' \
+--DataRunNumber '222510' \
+--geometryVersion 'ATLAS-R2-2015-03-01-00' \
+--conditionsTag 'OFLCOND-RUN12-SDR-21' \
+--outputHITSFile 'hitsFull.ttbar.pool.root' \
+--maxEvents '10' \
+--skipEvents '0'
 
 echo "art-result: $? unsplit-sim"
 
 # Run first 5 events
-AtlasG4_tf.py --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/ttbar_muplusjets-pythia6-7000.evgen.pool.root' --DataRunNumber '222510' --geometryVersion 'ATLAS-R2-2015-03-01-00' --conditionsTag 'OFLCOND-RUN12-SDR-21' --outputHITSFile 'hitsHalf1.ttbar.pool.root' --maxEvents '5' --skipEvents '0'
+AtlasG4_tf.py \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/ttbar_muplusjets-pythia6-7000.evgen.pool.root' \
+--DataRunNumber '222510' \
+--geometryVersion 'ATLAS-R2-2015-03-01-00' \
+--conditionsTag 'OFLCOND-RUN12-SDR-21' \
+--outputHITSFile 'hitsHalf1.ttbar.pool.root' \
+--maxEvents '5' \
+--skipEvents '0'
 
 echo "art-result: $? split-sim1"
 
 # Run next 5 events
-AtlasG4_tf.py --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/ttbar_muplusjets-pythia6-7000.evgen.pool.root' --DataRunNumber '222510' --geometryVersion 'ATLAS-R2-2015-03-01-00' --conditionsTag 'OFLCOND-RUN12-SDR-21' --outputHITSFile 'hitsHalf2.ttbar.pool.root' --maxEvents '5' --skipEvents '5'
+AtlasG4_tf.py \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/ttbar_muplusjets-pythia6-7000.evgen.pool.root' \
+--DataRunNumber '222510' \
+--geometryVersion 'ATLAS-R2-2015-03-01-00' \
+--conditionsTag 'OFLCOND-RUN12-SDR-21' \
+--outputHITSFile 'hitsHalf2.ttbar.pool.root' \
+--maxEvents '5' \
+--skipEvents '5'
 
 echo "art-result: $? split-sim2"
 
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_SkipEventsTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_SkipEventsTest.sh
index 3964b02c163c711bbd15a9165485fe90a6ffb38a..dcf49546967f3290ce8b5436de801e4163e256e3 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_SkipEventsTest.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_SkipEventsTest.sh
@@ -10,7 +10,18 @@
 # art-type: grid
 # art-output: test.HITS.pool.root
 
-AtlasG4_tf.py --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/e_E50_eta0-25.evgen.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '10' --skipEvents '5' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --postInclude 'PyJobTransforms/UseFrontier.py' --imf False
+AtlasG4_tf.py \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/e_E50_eta0-25.evgen.pool.root' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents '10' \
+--skipEvents '5' \
+--randomSeed '10' \
+--geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' \
+--conditionsTag 'OFLCOND-RUN12-SDR-19' \
+--DataRunNumber '222525' \
+--physicsList 'FTFP_BERT' \
+--postInclude 'PyJobTransforms/UseFrontier.py' \
+--imf False
 
 echo  "art-result: $? simulation"
 
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_TTbarSim.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_TTbarSim.sh
index 5ed028bfdd20c52fe20830bb02755df74fe6d601..0409e52e4a5ad5d0a244084b64b6f617eb7766c5 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_TTbarSim.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_TTbarSim.sh
@@ -9,13 +9,25 @@
 # art-output: test.HITS.pool.root
 # art-output: truth.root
 
-AtlasG4_tf.py --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/ttbar_muplusjets-pythia6-7000.evgen.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '4' --skipEvents '0' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:G4AtlasTests/postInclude.DCubeTest.py' --preExec 'AtlasG4Tf:simFlags.ReleaseGeoModel=False;' --imf False
+AtlasG4_tf.py \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/ttbar_muplusjets-pythia6-7000.evgen.pool.root' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents '4' \
+--skipEvents '0' \
+--randomSeed '10' \
+--geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' \
+--conditionsTag 'OFLCOND-RUN12-SDR-19' \
+--DataRunNumber '222525' \
+--physicsList 'FTFP_BERT' \
+--postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:G4AtlasTests/postInclude.DCubeTest.py' \
+--preExec 'AtlasG4Tf:simFlags.ReleaseGeoModel=False;' \
+--imf False
 
 echo  "art-result: $? simulation"
 
 ArtPackage=$1
 ArtJobName=$2
 # TODO This is a regression test I think. We would also need to compare these files to fixed references
-art.py compare grid ${ArtPackage} ${ArtJobName}
+art.py compare grid --entries 4 ${ArtPackage} ${ArtJobName}
 
 echo  "art-result: $? regression"
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_TimingTest_TTbarSim.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_TimingTest_TTbarSim.sh
index 41c96afaec8c98e0860d7020b5436ea36baeeaaf..bd0c00f9a45f38c61b3ca2e9a3fe822856830755 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_TimingTest_TTbarSim.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_TimingTest_TTbarSim.sh
@@ -11,7 +11,19 @@
 # art-output: timing_histos.root
 # art-output: test.HITS.pool.root
 
-AtlasG4_tf.py --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/ttbar_muplusjets-pythia6-7000.evgen.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '10' --skipEvents '0' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --postInclude 'PyJobTransforms/UseFrontier.py' --preInclude 'AtlasG4Tf:LArG4FastSimulation/LArG4FastSimulation_setupTimer_jobOptions.py' --imf False
+AtlasG4_tf.py \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/ttbar_muplusjets-pythia6-7000.evgen.pool.root' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents '10' \
+--skipEvents '0' \
+--randomSeed '10' \
+--geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' \
+--conditionsTag 'OFLCOND-RUN12-SDR-19' \
+--DataRunNumber '222525' \
+--physicsList 'FTFP_BERT' \
+--postInclude 'PyJobTransforms/UseFrontier.py' \
+--preInclude 'AtlasG4Tf:LArG4FastSimulation/LArG4FastSimulation_setupTimer_jobOptions.py' \
+--imf False
 
 echo  "art-result: $? simulation"
 
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_WriteCalHitsTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_WriteCalHitsTest.sh
index ab086bd3abaab184e115cf2d84a6378d19875236..47cb0fd82f0ed88f9d7cd1263463985a358eaf81 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_WriteCalHitsTest.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_WriteCalHitsTest.sh
@@ -9,7 +9,20 @@
 # art-output: test.HITS.pool.root
 # art-output: truth.root
 
-AtlasG4_tf.py --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/pi_E50_eta0-60.evgen.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '10' --skipEvents '0' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --preInclude 'SimulationJobOptions/preInclude.CalHits.py,SimulationJobOptions/preInclude.ParticleID.py' --postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:G4AtlasTests/postInclude.DCubeTest_CaloCalibHits.py' --preExec 'AtlasG4Tf:simFlags.ReleaseGeoModel=False;' --imf False
+AtlasG4_tf.py \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/pi_E50_eta0-60.evgen.pool.root' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents '10' \
+--skipEvents '0' \
+--randomSeed '10' \
+--geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' \
+--conditionsTag 'OFLCOND-RUN12-SDR-19' \
+--DataRunNumber '222525' \
+--physicsList 'FTFP_BERT' \
+--preInclude 'SimulationJobOptions/preInclude.CalHits.py,SimulationJobOptions/preInclude.ParticleID.py' \
+--postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:G4AtlasTests/postInclude.DCubeTest_CaloCalibHits.py' \
+--preExec 'AtlasG4Tf:simFlags.ReleaseGeoModel=False;' \
+--imf False
 
 echo  "art-result: $? simulation"
 
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ZDCSimTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ZDCSimTest.sh
index de78d77ad748d90980816938ad24a4a4b0d22ea2..3abda2c68850c73b3f02c10b2f4dd384da8e3e42 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ZDCSimTest.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ZDCSimTest.sh
@@ -9,13 +9,24 @@
 # art-output: test.HITS.pool.root
 # art-output: truth.root
 
-AtlasG4_tf.py --preInclude 'G4AtlasTests/preInclude.ZDC_SingleParticle.py' --outputHITSFile 'test.HITS.pool.root' --maxEvents 3 --randomSeed 10 --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --ZDCOn 'True' --postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:G4AtlasTests/postInclude.ZDC_dcube.py' --imf False
+AtlasG4_tf.py \
+--preInclude 'G4AtlasTests/preInclude.ZDC_SingleParticle.py' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents 3 \
+--randomSeed 10 \
+--geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' \
+--conditionsTag 'OFLCOND-RUN12-SDR-19' \
+--DataRunNumber '222525' \
+--physicsList 'FTFP_BERT' \
+--ZDCOn 'True' \
+--postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:G4AtlasTests/postInclude.ZDC_dcube.py' \
+--imf False
 
 echo  "art-result: $? simulation"
 
 ArtPackage=$1
 ArtJobName=$2
 # TODO This is a regression test I think. We would also need to compare these files to fixed references and run DCube
-art.py compare grid ${ArtPackage} ${ArtJobName}
+art.py compare grid --entries 3 ${ArtPackage} ${ArtJobName}
 
 echo  "art-result: $? regression"
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_electrons.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_electrons.sh
index da35772ef688f2e36fc5d02ec10eaed5589982d9..411826b73b753f4ae242200cc3e303a3dc48baf9 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_electrons.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_electrons.sh
@@ -9,7 +9,18 @@
 # art-output: test.HITS.pool.root
 # art-output: truth.root
 
-AtlasG4_tf.py --preInclude 'SimulationJobOptions/preInclude.SingleElectronGenerator.py' --outputHITSFile 'test.HITS.pool.root' --maxEvents '1000' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:G4AtlasTests/postInclude.DCubeTest.py' --preExec 'AtlasG4Tf:simFlags.ReleaseGeoModel=False;' --imf False
+AtlasG4_tf.py \
+--preInclude 'SimulationJobOptions/preInclude.SingleElectronGenerator.py' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents '1000' \
+--randomSeed '10' \
+--geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' \
+--conditionsTag 'OFLCOND-RUN12-SDR-19' \
+--DataRunNumber '222525' \
+--physicsList 'FTFP_BERT' \
+--postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:G4AtlasTests/postInclude.DCubeTest.py' \
+--preExec 'AtlasG4Tf:simFlags.ReleaseGeoModel=False;' \
+--imf False
 
 echo  "art-result: $? simulation"
 
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_minbias.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_minbias.sh
index 001b2b1d6137fa71865a992460404acbe59d5d75..64959fca7cddf9cdbe4da4423d6625623b820a28 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_minbias.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_minbias.sh
@@ -9,7 +9,20 @@
 # art-output: test.HITS.pool.root
 # art-output: truth.root
 
-AtlasG4_tf.py --inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/minbias_Inelastic-pythia8-7000.evgen.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '50' --skipEvents '0' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --preInclude 'SimulationJobOptions/preInclude.CaloOffDigitConfig.py,SimulationJobOptions/preInclude.MuonOffDigitConfig.py' --postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:G4AtlasTests/postInclude.DCubeTest.py' --preExec 'AtlasG4Tf:simFlags.ReleaseGeoModel=False;' --imf False
+AtlasG4_tf.py \
+--inputEVNTFile '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/minbias_Inelastic-pythia8-7000.evgen.pool.root' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents '50' \
+--skipEvents '0' \
+--randomSeed '10' \
+--geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' \
+--conditionsTag 'OFLCOND-RUN12-SDR-19' \
+--DataRunNumber '222525' \
+--physicsList 'FTFP_BERT' \
+--preInclude 'SimulationJobOptions/preInclude.CaloOffDigitConfig.py,SimulationJobOptions/preInclude.MuonOffDigitConfig.py' \
+--postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:G4AtlasTests/postInclude.DCubeTest.py' \
+--preExec 'AtlasG4Tf:simFlags.ReleaseGeoModel=False;' \
+--imf False
 # TODO would be good to update preExec syntax to apply beam rotations
 #'simFlags.EventFilter.set_On();simFlags.EventFilter.get_Value()["BeamEffectTransformation"]=True;'
 
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_muons.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_muons.sh
index 91fbc420fa1ab0af60526d94d5bf0b87f1736680..ebec2f324dc761eac73044a2d14b73eeff75e996 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_muons.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_muons.sh
@@ -9,7 +9,18 @@
 # art-output: test.HITS.pool.root
 # art-output: truth.root
 
-AtlasG4_tf.py --preInclude 'SimulationJobOptions/preInclude.SingleMuonGenerator.py' --outputHITSFile 'test.HITS.pool.root' --maxEvents '2000' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:G4AtlasTests/postInclude.DCubeTest.py' --preExec 'AtlasG4Tf:simFlags.ReleaseGeoModel=False;' --imf False
+AtlasG4_tf.py \
+--preInclude 'SimulationJobOptions/preInclude.SingleMuonGenerator.py' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents '2000' \
+--randomSeed '10' \
+--geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' \
+--conditionsTag 'OFLCOND-RUN12-SDR-19' \
+--DataRunNumber '222525' \
+--physicsList 'FTFP_BERT' \
+--postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:G4AtlasTests/postInclude.DCubeTest.py' \
+--preExec 'AtlasG4Tf:simFlags.ReleaseGeoModel=False;' \
+--imf False
 
 echo  "art-result: $? simulation"
 
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_pions.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_pions.sh
index 566af7c2526e4897373275c4c023931599cd7414..71a8b05e49545f04de96bad81df13fa74b35505e 100755
--- a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_pions.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_pions.sh
@@ -9,7 +9,18 @@
 # art-output: test.HITS.pool.root
 # art-output: truth.root
 
-AtlasG4_tf.py --preInclude 'SimulationJobOptions/preInclude.SinglePionGenerator.py' --outputHITSFile 'test.HITS.pool.root' --maxEvents '150' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:G4AtlasTests/postInclude.DCubeTest.py' --preExec 'AtlasG4Tf:simFlags.ReleaseGeoModel=False;' --imf False
+AtlasG4_tf.py \
+--preInclude 'SimulationJobOptions/preInclude.SinglePionGenerator.py' \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents '150' \
+--randomSeed '10' \
+--geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' \
+--conditionsTag 'OFLCOND-RUN12-SDR-19' \
+--DataRunNumber '222525' \
+--physicsList 'FTFP_BERT' \
+--postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:G4AtlasTests/postInclude.DCubeTest.py' \
+--preExec 'AtlasG4Tf:simFlags.ReleaseGeoModel=False;' \
+--imf False
 
 echo  "art-result: $? simulation"
 
diff --git a/Simulation/Tests/SimCoreTests/test/test_TestBeamSim.sh b/Simulation/Tests/SimCoreTests/test/test_TestBeamSim.sh
index 9cd4f5e7cf5b585e431a0be4d9a84a10901308a0..47b0ebf2df68e23ce242812afca4f84edc0e9e57 100755
--- a/Simulation/Tests/SimCoreTests/test/test_TestBeamSim.sh
+++ b/Simulation/Tests/SimCoreTests/test/test_TestBeamSim.sh
@@ -8,7 +8,13 @@
 # art-type: grid
 # art-output: test.HITS.pool.root
 
-TestBeam_tf.py --outputHITSFile 'test.HITS.pool.root' --maxEvents '10' --Eta '0.35' --testBeamConfig 'tbtile' --postInclude 'PyJobTransforms/UseFrontier.py' --imf False
+TestBeam_tf.py \
+--outputHITSFile 'test.HITS.pool.root' \
+--maxEvents '10' \
+--Eta '0.35' \
+--testBeamConfig 'tbtile' \
+--postInclude 'PyJobTransforms/UseFrontier.py' \
+--imf False
 
 echo  "art-result: $? simulation"