diff --git a/Simulation/SimuJobTransforms/python/SimTransformUtils.py b/Simulation/SimuJobTransforms/python/SimTransformUtils.py
index 4580056343c87a21a56020f79f43059f08fa402b..d693795bbab9ac93d0521c4afd46a3a731003fea 100644
--- a/Simulation/SimuJobTransforms/python/SimTransformUtils.py
+++ b/Simulation/SimuJobTransforms/python/SimTransformUtils.py
@@ -112,7 +112,7 @@ def addSimValidationSubstep(executorSet):
 
 def addDigiValidationSubstep(executorSet):
     executorSet.add(athenaExecutor(name = 'DigiValidation',
-                                           skeletonFile = 'DigiuJobTransforms/skeleton.RDOtoHIST_DIGI.py',
+                                           skeletonFile = 'SimuJobTransforms/skeleton.RDOtoHIST_DIGI.py',
                                            inData = ['RDO'], outData = ['HIST_DIGI'],))
 
 ### Append Sub-step Methods
diff --git a/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT.py b/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT.py
index 76d033c2ad2b1d80e99b1929b0e7ff00519b7cd8..a638e3a8b684851d78af0dc6f74dd0ab08e27349 100644
--- a/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT.py
+++ b/Simulation/SimuJobTransforms/share/skeleton.EVGENtoHIT.py
@@ -12,4 +12,6 @@ if hasattr(runArgs, "inputTXT_EVENTIDFile"):
     simFlags.load_atlas_flags()
     if hasattr(simFlags, 'IsEventOverlayInputSim'):
         simFlags.IsEventOverlayInputSim = True
+    if hasattr(runArgs, 'inputVertexPosFile'):
+        simFlags.VertexOverrideFile= runArgs.inputVertexPosFile
 
diff --git a/Simulation/SimuJobTransforms/share/skeleton.RDOtoHIST_DIGI.py b/Simulation/SimuJobTransforms/share/skeleton.RDOtoHIST_DIGI.py
index 593420afc33bb7997ee59e99c76cdf1365d537e5..2eaba2b193321f33cf836a39bea9a59797e3258d 100644
--- a/Simulation/SimuJobTransforms/share/skeleton.RDOtoHIST_DIGI.py
+++ b/Simulation/SimuJobTransforms/share/skeleton.RDOtoHIST_DIGI.py
@@ -55,8 +55,7 @@ if hasattr(runArgs,"preInclude"):
     for fragment in runArgs.preInclude:
         include(fragment)
 
-
-include("RDOAnalysis/RDOAnalysis_topOptions.py")
+include("RDOAnalysis/RDOAnalysis_commonOptions.py")
 
 ## Post-include
 if hasattr(runArgs,"postInclude"):
diff --git a/Simulation/SimuJobTransforms/test/test_G4param b/Simulation/SimuJobTransforms/test/test_G4param
index c109569e010d26211e8781a9cd639b9f2c7c4b8d..f1728e1be2da86d1795a864061cf1db6127b64f8 100755
--- a/Simulation/SimuJobTransforms/test/test_G4param
+++ b/Simulation/SimuJobTransforms/test/test_G4param
@@ -26,6 +26,6 @@ if [[ $? -ne 0 ]]; then
   echo "ERROR: $TRF not found"
   exit 2
 fi
-cmd="$TRF --inputEVNTFile=$INPUTFILE --outputHITSFile=$HITSFILE --maxEvents=5 --skipEvents=0 --randomSeed=5332532 --geometryVersion=$GEOMETRY$SIMVALIDATION --physicsList=$PHYSICSLIST --preInclude=$JOBCONFIG --conditionsTag=$IOVDBGLOBALTAG $@"
+cmd="$TRF --inputEVNTFile=$INPUTFILE --outputHITSFile=$HITSFILE --maxEvents=5 --skipEvents=0 --randomSeed=5332532 --geometryVersion=$GEOMETRY$SIMVALIDATION --physicsList=$PHYSICSLIST --preInclude=$JOBCONFIG --conditionsTag=$IOVDBGLOBALTAG --DataRunNumber $DATARUNNUMBER $@"
 echo $cmd
 $cmd
diff --git a/Simulation/SimuJobTransforms/test/test_digi_mergeHIT b/Simulation/SimuJobTransforms/test/test_digi_mergeHIT
index 58b2f973850246b4f95b3ec1eb28bf47cd99535e..46b151bfa55252c935a16d75e0f23c3436d1f23c 100755
--- a/Simulation/SimuJobTransforms/test/test_digi_mergeHIT
+++ b/Simulation/SimuJobTransforms/test/test_digi_mergeHIT
@@ -29,6 +29,6 @@ if [[ $? -ne 0 ]]; then
   echo "ERROR: $TRF not found"
   exit 2
 fi
-cmd="$TRF --inputHITSFile=$INPUTFILE --outputRDOFile=$RDOFILE --maxEvents=2 --skipEvents=11 --geometryVersion=$GEOMETRY --digiSeedOffset1=$DIGIOFFSET1 --digiSeedOffset2=$DIGIOFFSET2 --conditionsTag=$IOVDBGLOBALTAG $ARGS"
+cmd="$TRF --inputHITSFile=$INPUTFILE --outputRDOFile=$RDOFILE --maxEvents=2 --skipEvents=11 --geometryVersion=$GEOMETRY --digiSeedOffset1=$DIGIOFFSET1 --digiSeedOffset2=$DIGIOFFSET2 --conditionsTag=$IOVDBGLOBALTAG --DataRunNumber $DATARUNNUMBER $ARGS"
 echo $cmd
 $cmd
diff --git a/Simulation/SimuJobTransforms/test/test_digi_mu b/Simulation/SimuJobTransforms/test/test_digi_mu
index 7476879e6da46b62ee37c173fd6cbf6e47baa7c5..a61eecd1708a23f9fa0c20af7cb526f3fc9cc8ff 100755
--- a/Simulation/SimuJobTransforms/test/test_digi_mu
+++ b/Simulation/SimuJobTransforms/test/test_digi_mu
@@ -29,6 +29,6 @@ if [[ $? -ne 0 ]]; then
   echo "ERROR: $TRF not found"
   exit 2
 fi
-cmd="$TRF --inputHITSFile=$INPUTFILE --outputRDOFile=$RDOFILE --maxEvents=5 --skipEvents=0 --geometryVersion=$GEOMETRY --digiSeedOffset1=$DIGIOFFSET1 --digiSeedOffset2=$DIGIOFFSET2 --conditionsTag=$IOVDBGLOBALTAG --triggerConfig=DEFAULT $@"
+cmd="$TRF --inputHITSFile=$INPUTFILE --outputRDOFile=$RDOFILE --maxEvents=5 --skipEvents=0 --geometryVersion=$GEOMETRY --digiSeedOffset1=$DIGIOFFSET1 --digiSeedOffset2=$DIGIOFFSET2 --conditionsTag=$IOVDBGLOBALTAG --DataRunNumber $DATARUNNUMBER $@"
 echo $cmd
 $cmd
diff --git a/Simulation/SimuJobTransforms/test/test_digi_unmergeHIT b/Simulation/SimuJobTransforms/test/test_digi_unmergeHIT
index 13e622fecbd7e55957030cf9ae4764de76f0a65b..63aed65cca7c3dbdb379da07a41f89a784dfd493 100755
--- a/Simulation/SimuJobTransforms/test/test_digi_unmergeHIT
+++ b/Simulation/SimuJobTransforms/test/test_digi_unmergeHIT
@@ -31,6 +31,6 @@ if [[ $? -ne 0 ]]; then
   echo "ERROR: $TRF not found"
   exit 2
 fi
-cmd="$TRF --inputHITSFile=$INPUTLIST --outputRDOFile=$RDOFILE --maxEvents=2 --skipEvents=11 --geometryVersion=$GEOMETRY --digiSeedOffset1=$DIGIOFFSET1 --digiSeedOffset2=$DIGIOFFSET2 --conditionsTag=$IOVDBGLOBALTAG $ARGS"
+cmd="$TRF --inputHITSFile=$INPUTLIST --outputRDOFile=$RDOFILE --maxEvents=2 --skipEvents=11 --geometryVersion=$GEOMETRY --digiSeedOffset1=$DIGIOFFSET1 --digiSeedOffset2=$DIGIOFFSET2 --conditionsTag=$IOVDBGLOBALTAG --DataRunNumber $DATARUNNUMBER $ARGS"
 echo $cmd
 $cmd
diff --git a/Simulation/SimuJobTransforms/test/test_pileup b/Simulation/SimuJobTransforms/test/test_pileup
index f8fcdc17d04e9d04c16d9aaef57b5447bf4fb99e..e299965f29afaa8a9b56d9b6a26a9d01ca639f8c 100755
--- a/Simulation/SimuJobTransforms/test/test_pileup
+++ b/Simulation/SimuJobTransforms/test/test_pileup
@@ -29,6 +29,6 @@ if [[ $? -ne 0 ]]; then
   echo "ERROR: $TRF not found"
   exit 2
 fi
-cmd="$TRF --inputHITSFile $INPUTFILE --outputRDOFile $RDOFILE --maxEvents 10 --skipEvents 0 --geometryVersion $GEOMETRY --digiSeedOffset1 $DIGIOFFSET1 --digiSeedOffset2 $DIGIOFFSET2 --inputLowPtMinbiasHitsFile $MINBIASFILE --inputCavernHitsFile $CAVERNFILE --numberOfCavernBkg 1 --numberOfLowPtMinBias 1.0 --bunchSpacing 450 --pileupInitialBunch -1 --pileupFinalBunch 1 --conditionsTag $IOVDBGLOBALTAG $ARGS"
+cmd="$TRF --inputHITSFile $INPUTFILE --outputRDOFile $RDOFILE --maxEvents 10 --skipEvents 0 --geometryVersion $GEOMETRY --digiSeedOffset1 $DIGIOFFSET1 --digiSeedOffset2 $DIGIOFFSET2 --inputLowPtMinbiasHitsFile $MINBIASFILE --inputCavernHitsFile $CAVERNFILE --numberOfCavernBkg 1 --numberOfLowPtMinBias 1.0 --bunchSpacing 450 --pileupInitialBunch -1 --pileupFinalBunch 1 --conditionsTag $IOVDBGLOBALTAG --DataRunNumber $DATARUNNUMBER $ARGS"
 echo $cmd
 $cmd
diff --git a/Simulation/SimuJobTransforms/test/test_setup b/Simulation/SimuJobTransforms/test/test_setup
index 890c621a6d9aa321902570254a60d6cdb2bb708a..03908c1599d15d334474530bf316a4ab9dc2b3ae 100644
--- a/Simulation/SimuJobTransforms/test/test_setup
+++ b/Simulation/SimuJobTransforms/test/test_setup
@@ -1,9 +1,10 @@
-# MC12 setup
-# ATLAS-GEO-20-00-01 and OFLCOND-MC12-SIM-00
-export TESTDATA=/afs/cern.ch/atlas/offline/ProdData/17.X.0/17.6.0.Y
-export GEOMETRY=ATLAS-GEO-20-00-01
+# MC15 setup
+# ATLAS-R2-2015-03-01-00 and OFLCOND-RUN12-SDR-30
+export TESTDATA=/afs/cern.ch/atlas/offline/ProdData/19.2.X
+export GEOMETRY=ATLAS-R2-2015-03-01-00
 export SIMVALIDATION=_VALIDATION
-export IOVDBGLOBALTAG=OFLCOND-MC12-SIM-00
+export IOVDBGLOBALTAG=OFLCOND-RUN12-SDR-30
 export FSRELEASE=1.0.0
 export DATAPATH=$DATAPATH:/afs/cern.ch/atlas/software/FSreleases/DD0/FSRelease/1.0.0
 export TRF_ECHO=1
+export DATARUNNUMBER=222525
\ No newline at end of file