diff --git a/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingCharginos.sh b/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingCharginos.sh
index c288f9bfd3e73d26b1dfbcb6bda888bf4f87b32b..5d33a1aade64b0c0bf50e8601a84d771728bca5d 100755
--- a/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingCharginos.sh
+++ b/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingCharginos.sh
@@ -3,6 +3,8 @@
 # art-description: MC16-style simulation of decaying Charginos using FullG4 (tests Charginos and Gauginos packages)
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
+# art-include: 22.0/Athena
+# art-include: 22.0/AthSimulation
 # art-include: master/Athena
 # art-include: master/AthSimulation
 # art-output: *.root
@@ -38,7 +40,7 @@ Sim_tf.py \
     --truthStrategy 'MC15aPlusLLP' \
     --simulator 'FullG4MT' \
     --postInclude 'default:PyJobTransforms/UseFrontier.py' \
-    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions.DebugAMSB.py' \
+    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions/preInclude.DebugAMSB.py' \
     --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
     --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/mc15_13TeV.448307.MGPy8EG_A14N23LO_mAMSB_C1C1_5000_208000_LL4p0_MET60.evgen.EVNT.e6962.EVNT.15631425._000001.pool.root.1" \
     --outputHITSFile "CA.HITS.pool.root" \
@@ -51,7 +53,7 @@ Sim_tf.py \
     --truthStrategy 'MC15aPlusLLP' \
     --simulator 'FullG4MT' \
     --postInclude 'default:PyJobTransforms/UseFrontier.py' \
-    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions.DebugAMSB.py' \
+    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions/preInclude.DebugAMSB.py' \
     --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
     --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/mc15_13TeV.448307.MGPy8EG_A14N23LO_mAMSB_C1C1_5000_208000_LL4p0_MET60.evgen.EVNT.e6962.EVNT.15631425._000001.pool.root.1" \
     --outputHITSFile "CG.HITS.pool.root" \
diff --git a/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingCharginos_busy.sh b/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingCharginos_busy.sh
index 509c3b982001d0724927fa9894633ab8dfa86e12..f6039c4b263702aeff7135bd7597366c05868342 100755
--- a/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingCharginos_busy.sh
+++ b/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingCharginos_busy.sh
@@ -3,6 +3,8 @@
 # art-description: MC16-style simulation of decaying Charginos (busy events) using FullG4 (tests Charginos and Gauginos packages)
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
+# art-include: 22.0/Athena
+# art-include: 22.0/AthSimulation
 # art-include: master/Athena
 # art-include: master/AthSimulation
 # art-output: *.root
@@ -38,7 +40,7 @@ Sim_tf.py \
     --truthStrategy 'MC15aPlusLLP' \
     --simulator 'FullG4MT' \
     --postInclude 'default:PyJobTransforms/UseFrontier.py' \
-    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions.DebugAMSB.py' \
+    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions/preInclude.DebugAMSB.py' \
     --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
     --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/mc15_13TeV.448300.MGPy8EG_A14N23LO_GG_mixedC1LLP_0p2_1400_1200.evgen.EVNT.e7183.EVNT.16706750._000001.pool.root.1" \
     --outputHITSFile "CA.HITS.pool.root" \
@@ -52,7 +54,7 @@ Sim_tf.py \
     --truthStrategy 'MC15aPlusLLP' \
     --simulator 'FullG4MT' \
     --postInclude 'default:PyJobTransforms/UseFrontier.py' \
-    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions.DebugAMSB.py' \
+    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions/preInclude.DebugAMSB.py' \
     --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
     --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/mc15_13TeV.448300.MGPy8EG_A14N23LO_GG_mixedC1LLP_0p2_1400_1200.evgen.EVNT.e7183.EVNT.16706750._000001.pool.root.1" \
     --outputHITSFile "CG.HITS.pool.root" \
diff --git a/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingLightSleptons.sh b/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingLightSleptons.sh
index 38b53bfe72df640afc7f9e4aac6b3789636ca1b2..f3b2a9e8821626f71be9fe4d6dbed26f5b277737 100755
--- a/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingLightSleptons.sh
+++ b/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingLightSleptons.sh
@@ -3,6 +3,8 @@
 # art-description: MC16-style simulation of decaying light sleptons using FullG4 (tests Sleptons + Gauginos)
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
+# art-include: 22.0/Athena
+# art-include: 22.0/AthSimulation
 # art-include: master/Athena
 # art-include: master/AthSimulation
 # art-output: *.root
@@ -40,7 +42,7 @@ Sim_tf.py \
     --truthStrategy 'MC15aPlusLLP' \
     --simulator 'FullG4MT' \
     --postInclude 'default:PyJobTransforms/UseFrontier.py' \
-    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions.DebugSleptonsLLP.py' \
+    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions/preInclude.DebugSleptonsLLP.py' \
     --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
     --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/mc15_13TeV.399030.MGPy8EG_A14NNPDF23LO_SlepSlep_directLLP_100_0_0p01ns.evgen.EVNT.e7067.EVNT.16242732._000001.pool.root.1" \
     --outputHITSFile "CA.HITS.pool.root" \
@@ -53,7 +55,7 @@ Sim_tf.py \
     --truthStrategy 'MC15aPlusLLP' \
     --simulator 'FullG4MT' \
     --postInclude 'default:PyJobTransforms/UseFrontier.py' \
-    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions.DebugSleptonsLLP.py' \
+    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions/preInclude.DebugSleptonsLLP.py' \
     --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
     --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/mc15_13TeV.399030.MGPy8EG_A14NNPDF23LO_SlepSlep_directLLP_100_0_0p01ns.evgen.EVNT.e7067.EVNT.16242732._000001.pool.root.1" \
     --outputHITSFile "CG.HITS.pool.root" \
diff --git a/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingNeutralinos.sh b/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingNeutralinos.sh
index 54e0ea2398f77d71a6ee9e4bdb44f90cf798e92a..5750cd5372f26b4a9010b2462a0820318cdbf7ce 100755
--- a/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingNeutralinos.sh
+++ b/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingNeutralinos.sh
@@ -3,6 +3,8 @@
 # art-description: MC16-style simulation of decaying Neutralinos using FullG4 (tests sim response to many displaced “primary” particles)
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
+# art-include: 22.0/Athena
+# art-include: 22.0/AthSimulation
 # art-include: master/Athena
 # art-include: master/AthSimulation
 # art-output: *.root
diff --git a/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingStaus.sh b/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingStaus.sh
index f635d84c69a4462b0bc09e945ea40b20595323f4..1324e29a67e520788071604315c0a23152733171 100755
--- a/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingStaus.sh
+++ b/Simulation/Tests/SimExoticsTests/test/test_FullG4_DecayingStaus.sh
@@ -3,6 +3,8 @@
 # art-description: MC16-style simulation of decaying staus using FullG4 (tests the Sleptons + Gauginos packages)
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
+# art-include: 22.0/Athena
+# art-include: 22.0/AthSimulation
 # art-include: master/Athena
 # art-include: master/AthSimulation
 # art-output: *.root
@@ -38,7 +40,7 @@ Sim_tf.py \
     --truthStrategy 'MC15aPlusLLP' \
     --simulator 'FullG4MT' \
     --postInclude 'default:PyJobTransforms/UseFrontier.py' \
-    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions.DebugSleptonsLLP.py' \
+    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions/preInclude.DebugSleptonsLLP.py' \
     --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
     --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/mc15_13TeV.399007.MGPy8EG_A14NNPDF23LO_StauStau_directLLP_100_0_1ns.evgen.EVNT.e7067.EVNT.16137672._000001.pool.root.1" \
     --outputHITSFile "CA.HITS.pool.root" \
@@ -51,7 +53,7 @@ Sim_tf.py \
     --truthStrategy 'MC15aPlusLLP' \
     --simulator 'FullG4MT' \
     --postInclude 'default:PyJobTransforms/UseFrontier.py' \
-    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions.DebugSleptonsLLP.py' \
+    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions/preInclude.DebugSleptonsLLP.py' \
     --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
     --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/mc15_13TeV.399007.MGPy8EG_A14NNPDF23LO_StauStau_directLLP_100_0_1ns.evgen.EVNT.e7067.EVNT.16137672._000001.pool.root.1" \
     --outputHITSFile "CG.HITS.pool.root" \
diff --git a/Simulation/Tests/SimExoticsTests/test/test_FullG4_StableCharginos.sh b/Simulation/Tests/SimExoticsTests/test/test_FullG4_StableCharginos.sh
index bc7aacefb9797b43c279d4ad93751b0626d00176..0e6e1f5f14aae2aba6289b830ed31e3862d7eaaf 100755
--- a/Simulation/Tests/SimExoticsTests/test/test_FullG4_StableCharginos.sh
+++ b/Simulation/Tests/SimExoticsTests/test/test_FullG4_StableCharginos.sh
@@ -3,6 +3,8 @@
 # art-description: MC16-style simulation of stable Charginos using FullG4 (tests the Charginos package alone)
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
+# art-include: 22.0/Athena
+# art-include: 22.0/AthSimulation
 # art-include: master/Athena
 # art-include: master/AthSimulation
 # art-output: *.root
@@ -38,7 +40,7 @@ Sim_tf.py \
     --truthStrategy 'MC15aPlusLLP' \
     --simulator 'FullG4MT' \
     --postInclude 'default:PyJobTransforms/UseFrontier.py' \
-    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions.DebugAMSB.py' \
+    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions/preInclude.DebugAMSB.py' \
     --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
     --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/mc15_13TeV.404460.MGPy8EG_A14N23LO_mAMSB_C1C1_5000_68000_Stable.evgen.EVNT.e5654.EVNT.13360885._000001.pool.root.1" \
     --outputHITSFile "CA.HITS.pool.root" \
@@ -51,7 +53,7 @@ Sim_tf.py \
     --truthStrategy 'MC15aPlusLLP' \
     --simulator 'FullG4MT' \
     --postInclude 'default:PyJobTransforms/UseFrontier.py' \
-    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions.DebugAMSB.py' \
+    --preInclude 'EVNTtoHITS:Campaigns/MC16Simulation.py,SimulationJobOptions/preInclude.DebugAMSB.py' \
     --geometryVersion 'default:ATLAS-R2-2016-01-00-01' \
     --inputEVNTFile "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/SimCoreTests/mc15_13TeV.404460.MGPy8EG_A14N23LO_mAMSB_C1C1_5000_68000_Stable.evgen.EVNT.e5654.EVNT.13360885._000001.pool.root.1" \
     --outputHITSFile "CG.HITS.pool.root" \
diff --git a/Simulation/Tests/SimExoticsTests/test/test_FullG4_StableSleptons.sh b/Simulation/Tests/SimExoticsTests/test/test_FullG4_StableSleptons.sh
index 31a791a25e2777574ae9b95bb4ff8f0138d1da84..dda984b3c4cd5e105fde0755591492ab8f9c85c2 100755
--- a/Simulation/Tests/SimExoticsTests/test/test_FullG4_StableSleptons.sh
+++ b/Simulation/Tests/SimExoticsTests/test/test_FullG4_StableSleptons.sh
@@ -3,6 +3,8 @@
 # art-description: MC16-style simulation of stable Sleptons using FullG4 (tests Sleptons package alone)
 # art-type: grid
 # art-architecture:  '#x86_64-intel'
+# art-include: 22.0/Athena
+# art-include: 22.0/AthSimulation
 # art-include: master/Athena
 # art-include: master/AthSimulation
 # art-output: *.root