diff --git a/Calorimeter/CaloBadChannelTool/python/CaloBadChanToolConfig.py b/Calorimeter/CaloBadChannelTool/python/CaloBadChanToolConfig.py
index d737af838306d2d67a20e7a11e12ada791e8fa6a..451951fc6ad9bf2d930d840666caab030d024524 100644
--- a/Calorimeter/CaloBadChannelTool/python/CaloBadChanToolConfig.py
+++ b/Calorimeter/CaloBadChannelTool/python/CaloBadChanToolConfig.py
@@ -40,7 +40,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
 
     flags.fillFromArgs()
     flags.lock()
diff --git a/Calorimeter/CaloClusterCorrection/test/config_t.py b/Calorimeter/CaloClusterCorrection/test/config_t.py
index 205c1fa330f563ae313bbe9eff7aaab065049055..0ec006266d273fb229273ddf173731adc5937e63 100644
--- a/Calorimeter/CaloClusterCorrection/test/config_t.py
+++ b/Calorimeter/CaloClusterCorrection/test/config_t.py
@@ -1082,7 +1082,7 @@ from AthenaConfiguration.TestDefaults import defaultTestFiles
 
 from AthenaConfiguration.AllConfigFlags import initConfigFlags
 flags = initConfigFlags()
-flags.Input.Files = defaultTestFiles.RAW
+flags.Input.Files = defaultTestFiles.RAW_RUN2
 flags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2017-05"
 
 test1 (flags)
diff --git a/Calorimeter/CaloRec/python/CaloBCIDCoeffsCondAlgConfig.py b/Calorimeter/CaloRec/python/CaloBCIDCoeffsCondAlgConfig.py
index 05b475d9b11067a39a1509c83028de5912b013f6..3b34ae0385cca56f7a828a85d8a94a88f40ea8b8 100644
--- a/Calorimeter/CaloRec/python/CaloBCIDCoeffsCondAlgConfig.py
+++ b/Calorimeter/CaloRec/python/CaloBCIDCoeffsCondAlgConfig.py
@@ -75,7 +75,7 @@ if __name__ == "__main__":
 
     print ('--- data')
     flags1 = initConfigFlags()
-    flags1.Input.Files = defaultTestFiles.RAW
+    flags1.Input.Files = defaultTestFiles.RAW_RUN2
     flags1.lock()
     acc1 = CaloBCIDCoeffsCondAlgCfg (flags1)
     acc1.printConfig(summariseProps=True, onlyComponents=only)
diff --git a/Calorimeter/CaloRec/python/CaloBCIDLumiCondAlgConfig.py b/Calorimeter/CaloRec/python/CaloBCIDLumiCondAlgConfig.py
index 2d09ec5b988b18003e77f99b88b963f98614b9f2..22a46f0440b95be7faf5436afa10f1c6e9851890 100644
--- a/Calorimeter/CaloRec/python/CaloBCIDLumiCondAlgConfig.py
+++ b/Calorimeter/CaloRec/python/CaloBCIDLumiCondAlgConfig.py
@@ -46,7 +46,7 @@ if __name__ == "__main__":
 
     print ('--- data')
     flags1 = initConfigFlags()
-    flags1.Input.Files = defaultTestFiles.RAW
+    flags1.Input.Files = defaultTestFiles.RAW_RUN2
     flags1.lock()
     acc1 = CaloBCIDLumiCondAlgCfg (flags1)
     acc1.printConfig(summariseProps=True, onlyComponents=only)
diff --git a/Calorimeter/CaloRec/python/CaloCellContainerAliasAlgConfig.py b/Calorimeter/CaloRec/python/CaloCellContainerAliasAlgConfig.py
index a8f687190bc8c0e65cbcef8d11d7426a7a204022..ea5dace533e8e278ed9f00fe55afba70a29cd82a 100644
--- a/Calorimeter/CaloRec/python/CaloCellContainerAliasAlgConfig.py
+++ b/Calorimeter/CaloRec/python/CaloCellContainerAliasAlgConfig.py
@@ -27,7 +27,7 @@ if __name__ == "__main__":
     only = ['CaloCellContainerAliasAlg_myalias']
 
     flags1 = initConfigFlags()
-    flags1.Input.Files = defaultTestFiles.RAW
+    flags1.Input.Files = defaultTestFiles.RAW_RUN2
     flags1.lock()
     acc1 = CaloCellContainerAliasAlgCfg (flags1, 'myalias')
     acc1.printConfig(summariseProps=True, onlyComponents=only)
diff --git a/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlgConfig.py b/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlgConfig.py
index fc3a36914465005e2a8765be2ef1e8c7e50c11fe..a65c85100d9184e7e8e2470dce246a2f232f1326 100644
--- a/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlgConfig.py
+++ b/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlgConfig.py
@@ -30,7 +30,7 @@ if __name__ == "__main__":
     only = ['CaloThinCellsByClusterAlg_myclusters']
 
     flags1 = initConfigFlags()
-    flags1.Input.Files = defaultTestFiles.RAW
+    flags1.Input.Files = defaultTestFiles.RAW_RUN2
     flags1.lock()
     acc1 = CaloThinCellsByClusterAlgCfg(flags1, 'StreamAOD',
                                         'myclusters', ['TileGap3'])
diff --git a/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlgConfig.py b/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlgConfig.py
index 7dddd532ed38d4e33d620823ca0e1d5801198fe9..afb81a69adf4ee113af4f8794094cee7631cf310 100644
--- a/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlgConfig.py
+++ b/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlgConfig.py
@@ -36,7 +36,7 @@ if __name__ == "__main__":
     only = ['CaloThinCellsBySamplingAlg_TileGap3']
 
     flags1 = initConfigFlags()
-    flags1.Input.Files = defaultTestFiles.RAW
+    flags1.Input.Files = defaultTestFiles.RAW_RUN2
     flags1.lock()
     acc1 = CaloThinCellsBySamplingAlgCfg (flags1, 'StreamAOD',
                                           ['TileGap3'])
diff --git a/Control/AthenaConfiguration/python/TestDefaults.py b/Control/AthenaConfiguration/python/TestDefaults.py
index 59642781f47d6d09a87a81bb63067dfb80913d00..97301d727f638646699c9bf1f9adf48ba2ed3c44 100644
--- a/Control/AthenaConfiguration/python/TestDefaults.py
+++ b/Control/AthenaConfiguration/python/TestDefaults.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
 # Files for use in configuration unit tests
 
 class defaultTestFiles:
@@ -20,8 +20,8 @@ class defaultTestFiles:
         f"{d}/Tier0ChainTests/mc16_13TeV.900311.Epos_minbias_inelastic_lowjetphoton.simul.HITS_FILT.e8341_s3687_s3704/HITS_FILT.26106626._000574.pool.root.1",
     ]
     HITS_DATA_OVERLAY = [f"{d}/OverlayTests/DataOverlaySimulation/22.0/v1/mc16_13TeV.361107.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zmumu.HITS.pool.root"]
-    RAW = [f"{d}/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"]
     RAW_RUN1 = [f"{d}/Tier0ChainTests/data12_8TeV.00209109.physics_JetTauEtmiss.merge.RAW._lb0186._SFO-1._0001.1"]
+    RAW_RUN2 = [f"{d}/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"]
     RAW_RUN3 = [f"{d}/Tier0ChainTests/TCT_Run3/data22_13p6TeV.00431493.physics_Main.daq.RAW._lb0525._SFO-16._0001.data"]
     RAW_BKG = [f"{d}/OverlayTests/mc15_valid.00200010.overlay_streamsAll_2016_pp_1.skim.DRAW.r8381/DRAW.09331084._000146.pool.root.1"]
     RDO_RUN2 = [f"{d}/CampaignInputs/mc20/RDO/mc20_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.recon.AOD.e6337_s3681_r13145/100events.RDO.pool.root"]
diff --git a/Control/AthenaConfiguration/test/testAllConfigFlags_TRIG.py b/Control/AthenaConfiguration/test/testAllConfigFlags_TRIG.py
index c8675893ccdc84f7f58a2dd0727a98690880bfe8..9293a80ccc2bd1be0c7c9b47e4f245eac64c31ef 100755
--- a/Control/AthenaConfiguration/test/testAllConfigFlags_TRIG.py
+++ b/Control/AthenaConfiguration/test/testAllConfigFlags_TRIG.py
@@ -18,7 +18,7 @@ class Test(unittest.TestCase):
 
    def test_data(self):
       """For data, trigger always uses dedicated tags."""
-      self.flags.Input.Files = defaultTestFiles.RAW
+      self.flags.Input.Files = defaultTestFiles.RAW_RUN2
 
       self.assertEqual(self.flags.GeoModel.AtlasVersion, trigGeoTag(self.flags))
       self.assertEqual(self.flags.IOVDb.GlobalTag, trigGlobalTag(self.flags))
diff --git a/DataQuality/DataQualityTools/python/DQTDetSynchMonAlg.py b/DataQuality/DataQualityTools/python/DQTDetSynchMonAlg.py
index 9a3c9c58c4b0dcd05371df534b5bd0aad3544c38..7bd6a18e369f3346cdb2ca1af580c26a17719f72 100644
--- a/DataQuality/DataQualityTools/python/DQTDetSynchMonAlg.py
+++ b/DataQuality/DataQualityTools/python/DQTDetSynchMonAlg.py
@@ -160,7 +160,7 @@ if __name__ == '__main__':
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
     nightly = '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CommonInputs/'
     file = 'data16_13TeV.00311321.physics_Main.recon.AOD.r9264/AOD.11038520._000001.pool.root.1'
-    ConfigFlags.Input.Files = defaultTestFiles.RAW
+    ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2
     #ConfigFlags.Input.isMC = False
     ConfigFlags.Output.HISTFileName = 'ExampleMonitorOutput.root'
     
diff --git a/Database/CoolLumiUtilities/python/BunchGroupCondAlgConfig.py b/Database/CoolLumiUtilities/python/BunchGroupCondAlgConfig.py
index 0d5b37b077f3b50cbf94d34dccf7aeea9a905789..f4c414b3614ac2ed1dc53b5c57d617879570e8e3 100644
--- a/Database/CoolLumiUtilities/python/BunchGroupCondAlgConfig.py
+++ b/Database/CoolLumiUtilities/python/BunchGroupCondAlgConfig.py
@@ -36,12 +36,12 @@ if __name__ == "__main__":
     from AthenaConfiguration.AllConfigFlags import initConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.lock()
 
     print ('--- data')
     flags1 = flags.clone()
-    flags1.Input.Files = defaultTestFiles.RAW
+    flags1.Input.Files = defaultTestFiles.RAW_RUN2
     flags1.Input.ProjectName = 'data12_8TeV'
     flags1.lock()
     acc1 = BunchGroupCondAlgCfg (flags1)
@@ -51,7 +51,7 @@ if __name__ == "__main__":
 
     print ('--- default')
     flags2 = flags.clone()
-    flags2.Input.Files = defaultTestFiles.RAW
+    flags2.Input.Files = defaultTestFiles.RAW_RUN2
     flags2.lock()
     acc2 = BunchGroupCondAlgCfg (flags2)
     acc2.printCondAlgs(summariseProps=True)
diff --git a/Database/CoolLumiUtilities/python/BunchLumisCondAlgConfig.py b/Database/CoolLumiUtilities/python/BunchLumisCondAlgConfig.py
index c02f03b4198f92945906e2d04eaab4eeb92b8414..8a632d8596bf90f623a584a546579e5d175fe4fb 100644
--- a/Database/CoolLumiUtilities/python/BunchLumisCondAlgConfig.py
+++ b/Database/CoolLumiUtilities/python/BunchLumisCondAlgConfig.py
@@ -48,7 +48,7 @@ if __name__ == "__main__":
 
     print ('--- data')
     flags1 = initConfigFlags()
-    flags1.Input.Files = defaultTestFiles.RAW
+    flags1.Input.Files = defaultTestFiles.RAW_RUN2
     flags1.Input.ProjectName = 'data12_8TeV'
     flags1.lock()
     acc1 = BunchLumisCondAlgCfg (flags1)
@@ -58,7 +58,7 @@ if __name__ == "__main__":
 
     print ('--- data+overlay')
     flags2 = initConfigFlags()
-    flags2.Input.Files = defaultTestFiles.RAW
+    flags2.Input.Files = defaultTestFiles.RAW_RUN2
     flags2.Input.ProjectName = 'data12_8TeV'
     flags2.Common.ProductionStep = ProductionStep.Overlay
     flags2.lock()
@@ -69,7 +69,7 @@ if __name__ == "__main__":
 
     print ('--- default')
     flags3 = initConfigFlags()
-    flags3.Input.Files = defaultTestFiles.RAW
+    flags3.Input.Files = defaultTestFiles.RAW_RUN2
     flags3.lock()
     acc3 = BunchLumisCondAlgCfg (flags3)
     acc3.printCondAlgs(summariseProps=True)
diff --git a/Database/CoolLumiUtilities/python/FillParamsCondAlgConfig.py b/Database/CoolLumiUtilities/python/FillParamsCondAlgConfig.py
index f3cb847dd3d9d5d88bf1586133c482d45deb1996..a39656e7626d3859d6e9a86c8297860f692ac6b0 100644
--- a/Database/CoolLumiUtilities/python/FillParamsCondAlgConfig.py
+++ b/Database/CoolLumiUtilities/python/FillParamsCondAlgConfig.py
@@ -37,7 +37,7 @@ if __name__ == "__main__":
 
     print ('--- data')
     flags1 = initConfigFlags()
-    flags1.Input.Files = defaultTestFiles.RAW
+    flags1.Input.Files = defaultTestFiles.RAW_RUN2
     flags1.Input.ProjectName = 'data12_8TeV'
     flags1.lock()
     acc1 = FillParamsCondAlgCfg (flags1)
@@ -47,7 +47,7 @@ if __name__ == "__main__":
 
     print ('--- default')
     flags2 = initConfigFlags()
-    flags2.Input.Files = defaultTestFiles.RAW
+    flags2.Input.Files = defaultTestFiles.RAW_RUN2
     flags2.lock()
     acc2 = FillParamsCondAlgCfg (flags2)
     acc2.printCondAlgs(summariseProps=True)
diff --git a/Database/CoolLumiUtilities/python/OnlineLumiCalibrationCondAlgConfig.py b/Database/CoolLumiUtilities/python/OnlineLumiCalibrationCondAlgConfig.py
index 21fe128d4fb3d66c084da9b627c3a61619c91c2c..4569406a58a9b0ba320e0d8224b2e58caf200c13 100644
--- a/Database/CoolLumiUtilities/python/OnlineLumiCalibrationCondAlgConfig.py
+++ b/Database/CoolLumiUtilities/python/OnlineLumiCalibrationCondAlgConfig.py
@@ -37,7 +37,7 @@ if __name__ == "__main__":
 
     print ('--- data')
     flags1 = initConfigFlags()
-    flags1.Input.Files = defaultTestFiles.RAW
+    flags1.Input.Files = defaultTestFiles.RAW_RUN2
     flags1.lock()
     acc1 = OnlineLumiCalibrationCondAlgCfg (flags1)
     acc1.printCondAlgs(summariseProps=True)
diff --git a/Database/IOVDbSvc/python/IOVDbSvcConfig.py b/Database/IOVDbSvc/python/IOVDbSvcConfig.py
index d97a94f863e420104d91b2a8426c1b41a73b3d54..202cab8b80525eff475fd2a23802daf1fcbc7432 100644
--- a/Database/IOVDbSvc/python/IOVDbSvcConfig.py
+++ b/Database/IOVDbSvc/python/IOVDbSvcConfig.py
@@ -257,7 +257,7 @@ if __name__ == '__main__':
     from AthenaConfiguration.AllConfigFlags import initConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.lock()
 
     acc = IOVDbSvcCfg(flags)
diff --git a/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py b/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py
index f3e0cee5f37edbf5a87b78e3b970ec8d47f9390d..9316518af0ab62aaf2f8a2611ffb60e8a5a5f4f6 100644
--- a/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py
+++ b/Event/ByteStreamCnvSvc/python/ByteStreamConfig.py
@@ -237,7 +237,7 @@ if __name__ == "__main__":
     log = logging.getLogger('ByteStreamConfig')
     
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Output.doWriteBS = True
     flags.lock()
 
diff --git a/Event/EventBookkeeperTools/test/test_CutFlowSvc.py b/Event/EventBookkeeperTools/test/test_CutFlowSvc.py
index c2cef89bf095a124cff7cac8b3f80f8cd77ceb11..b9f328a2fda1485e2ff4bd68257ddd2a1d287159 100755
--- a/Event/EventBookkeeperTools/test/test_CutFlowSvc.py
+++ b/Event/EventBookkeeperTools/test/test_CutFlowSvc.py
@@ -33,7 +33,7 @@ flags = initConfigFlags()
 if args.input:
   flags.Input.Files = [args.input]
 elif args.data:
-  flags.Input.Files = defaultTestFiles.RAW
+  flags.Input.Files = defaultTestFiles.RAW_RUN2
 else:
   flags.Input.Files = defaultTestFiles.AOD_RUN2_MC
 
diff --git a/ForwardDetectors/ForwardRec/python/LucidRecConfig.py b/ForwardDetectors/ForwardRec/python/LucidRecConfig.py
index d4acf9581fa5dd0d431b0721dde8452d07b55f5d..d4241e7bdc2e0e21f7721ef79374fb8513c19d3f 100644
--- a/ForwardDetectors/ForwardRec/python/LucidRecConfig.py
+++ b/ForwardDetectors/ForwardRec/python/LucidRecConfig.py
@@ -30,7 +30,7 @@ if __name__=="__main__":
 
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.lock()
 
     acc = MainServicesCfg(flags)
diff --git a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
index 6236cb41a70d44081576de92f75d009aa9d04087..3f45b38e5704c9fe1a3dfa0ea1be67a3b26f0950 100644
--- a/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
+++ b/InnerDetector/InDetConditions/PixelConditionsAlgorithms/python/PixelConditionsConfig.py
@@ -423,7 +423,7 @@ if __name__ == '__main__':
     flags.fillFromArgs()
 
     from AthenaConfiguration.TestDefaults import defaultTestFiles
-    flags.Input.Files = defaultTestFiles.RAW # need to update this depending on EDMversion
+    flags.Input.Files = defaultTestFiles.RAW_RUN2 # need to update this depending on EDMversion
     flags.Exec.MaxEvents=5
 
     flags.lock()
diff --git a/InnerDetector/InDetConfig/python/TrackingPassFlags.py b/InnerDetector/InDetConfig/python/TrackingPassFlags.py
index edeefd975df0800febdb31360d546a4f1f29e5cf..de406604f34ea72e7c93d29043097f511f78985d 100644
--- a/InnerDetector/InDetConfig/python/TrackingPassFlags.py
+++ b/InnerDetector/InDetConfig/python/TrackingPassFlags.py
@@ -1085,7 +1085,7 @@ if __name__ == "__main__":
   flags = initConfigFlags()
 
   from AthenaConfiguration.TestDefaults import defaultTestFiles
-  flags.Input.Files=defaultTestFiles.RAW
+  flags.Input.Files=defaultTestFiles.RAW_RUN2
   
   from AthenaCommon.Logging import logging
   l = logging.getLogger('TrackingPassFlags')
diff --git a/LArCalorimeter/LArCabling/python/LArCablingConfig.py b/LArCalorimeter/LArCabling/python/LArCablingConfig.py
index 2b31546b536eca2f69e9dc1dd12f2293a17818f0..c30ab34e4e056f8a9a310666d14d224ea6f3c640 100644
--- a/LArCalorimeter/LArCabling/python/LArCablingConfig.py
+++ b/LArCalorimeter/LArCabling/python/LArCablingConfig.py
@@ -107,7 +107,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
 
     flags=initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.lock()
 
     acc = LArOnOffIdMappingCfg( flags )
diff --git a/LArCalorimeter/LArCafJobs/python/LArReadCellsConfig.py b/LArCalorimeter/LArCafJobs/python/LArReadCellsConfig.py
index f7e017116e3ddfa1e1a0edf1581f02eaecc8b9fd..9bd2e75a87375d8a5be6aa41bab5845cd3f067bd 100644
--- a/LArCalorimeter/LArCafJobs/python/LArReadCellsConfig.py
+++ b/LArCalorimeter/LArCafJobs/python/LArReadCellsConfig.py
@@ -47,7 +47,7 @@ if __name__=="__main__":
     addShapeDumpFlags(flags)
 
     from AthenaConfiguration.TestDefaults import defaultTestFiles
-    flags.Input.Files=defaultTestFiles.RAW
+    flags.Input.Files=defaultTestFiles.RAW_RUN2
     flags.LAr.ROD.forceIter=True
     flags.LArShapeDump.outputNtup="SPLASH"
     flags.lock()
diff --git a/LArCalorimeter/LArCafJobs/python/LArShapeDumperConfig.py b/LArCalorimeter/LArCafJobs/python/LArShapeDumperConfig.py
index 9b22c405769fdebf58aae2cdf8205b66ee4567df..4afcadea5db2fd102a7153caee2a955162e1a4cc 100644
--- a/LArCalorimeter/LArCafJobs/python/LArShapeDumperConfig.py
+++ b/LArCalorimeter/LArCafJobs/python/LArShapeDumperConfig.py
@@ -98,7 +98,7 @@ if __name__=="__main__":
     addShapeDumpFlags(flags)
 
     from AthenaConfiguration.TestDefaults import defaultTestFiles
-    flags.Input.Files=defaultTestFiles.RAW
+    flags.Input.Files=defaultTestFiles.RAW_RUN2
     flags.LAr.ROD.forceIter=True
 
     flags.lock()
diff --git a/LArCalorimeter/LArCnv/LArByteStream/python/LArRawDataReadingConfig.py b/LArCalorimeter/LArCnv/LArByteStream/python/LArRawDataReadingConfig.py
index ef5bcaf3feef8d73ff29dfffac921de9ea347094..660aa9ab5e221d2ce5e76d20538b5fa72d300d24 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/python/LArRawDataReadingConfig.py
+++ b/LArCalorimeter/LArCnv/LArByteStream/python/LArRawDataReadingConfig.py
@@ -36,7 +36,7 @@ if __name__=="__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     flags.LAr.doAlign=False
     flags.Exec.OutputLevel=DEBUG
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.lock()
 
     acc = MainServicesCfg( flags )
diff --git a/LArCalorimeter/LArCnv/LArByteStream/python/LArRawSCDataReadingConfig.py b/LArCalorimeter/LArCnv/LArByteStream/python/LArRawSCDataReadingConfig.py
index 2956fc72c8ed8c1103f024c6f531a07a9b23bd5a..d48d0c67b552830d34a75f68813026165be944d7 100644
--- a/LArCalorimeter/LArCnv/LArByteStream/python/LArRawSCDataReadingConfig.py
+++ b/LArCalorimeter/LArCnv/LArByteStream/python/LArRawSCDataReadingConfig.py
@@ -31,7 +31,7 @@ if __name__=="__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     flags.LAr.doAlign=False
     flags.Exec.OutputLevel=DEBUG
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.lock()
 
     acc = MainServicesCfg( flags )
diff --git a/LArCalorimeter/LArConfiguration/python/LArElecCalibDBConfig.py b/LArCalorimeter/LArConfiguration/python/LArElecCalibDBConfig.py
index e80cf61a2c4fd0427da8478ff3cad5c0c96ab834..e65d6b2fe1551a4f900a9a013ea674b6b283219c 100644
--- a/LArCalorimeter/LArConfiguration/python/LArElecCalibDBConfig.py
+++ b/LArCalorimeter/LArConfiguration/python/LArElecCalibDBConfig.py
@@ -258,7 +258,7 @@ if __name__ == "__main__":
 
     print ('--- run2')
     flags1 = initConfigFlags()
-    flags1.Input.Files = defaultTestFiles.RAW
+    flags1.Input.Files = defaultTestFiles.RAW_RUN2
     flags1.lock()
     acc1 = LArElecCalibDbCfg (flags1, ['Ramp', 'Pedestal'])
     acc1.printCondAlgs(summariseProps=True)
@@ -267,7 +267,7 @@ if __name__ == "__main__":
 
     print ('--- run1')
     flags2 = initConfigFlags()
-    flags2.Input.Files = defaultTestFiles.RAW
+    flags2.Input.Files = defaultTestFiles.RAW_RUN2
     from AthenaConfiguration.Enums import LHCPeriod
     flags2.GeoModel.Run=LHCPeriod.Run1
     flags2.lock()
diff --git a/LArCalorimeter/LArConfiguration/python/LArMonitoringConfig.py b/LArCalorimeter/LArConfiguration/python/LArMonitoringConfig.py
index 0824273e555f07df0078230b643753a6e8e58e6a..a318141f21e00b369b6c06b05de345a451bd1c11 100644
--- a/LArCalorimeter/LArConfiguration/python/LArMonitoringConfig.py
+++ b/LArCalorimeter/LArConfiguration/python/LArMonitoringConfig.py
@@ -56,7 +56,7 @@ if __name__=='__main__':
 
 
    from AthenaConfiguration.TestDefaults import defaultTestFiles
-   flags.Input.Files = defaultTestFiles.RAW
+   flags.Input.Files = defaultTestFiles.RAW_RUN2
 
    flags.Output.HISTFileName = 'LArMonitoringOutput.root'
    flags.DQ.enableLumiAccess = True
diff --git a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/python/LArGMConfig.py b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/python/LArGMConfig.py
index b637d90f11978126b94ac9010d2ae29eb3ce0c4f..6e20d89db60ef81c434f8c22ea4b0d65520c8080 100644
--- a/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/python/LArGMConfig.py
+++ b/LArCalorimeter/LArGeoModel/LArGeoAlgsNV/python/LArGMConfig.py
@@ -79,7 +79,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
 
-    ConfigFlags.Input.Files = defaultTestFiles.RAW
+    ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2
     ConfigFlags.lock()
 
     acc = LArGMCfg(ConfigFlags)
diff --git a/LArCalorimeter/LArMonitoring/python/LArAffectedRegionsAlg.py b/LArCalorimeter/LArMonitoring/python/LArAffectedRegionsAlg.py
index c973283d9dddff82f253f9daea074512e18540df..67d834893312e9e5d237ae6276edef1cdadcfe44 100644
--- a/LArCalorimeter/LArMonitoring/python/LArAffectedRegionsAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArAffectedRegionsAlg.py
@@ -384,7 +384,7 @@ if __name__=='__main__':
     createLArMonConfigFlags()
 
     from AthenaConfiguration.TestDefaults import defaultTestFiles
-    ConfigFlags.Input.Files = defaultTestFiles.RAW
+    ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2
 
     ConfigFlags.Output.HISTFileName = 'LArAffectedRegionsOutput.root'
     ConfigFlags.DQ.enableLumiAccess = False
diff --git a/LArCalorimeter/LArMonitoring/python/LArCollisionTimeMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArCollisionTimeMonAlg.py
index 5fd257a9351d63a3ef601817e99315fdf9a2ffb0..1b60ee03b36c2f9e68d7a382324920a3ec9e909a 100644
--- a/LArCalorimeter/LArMonitoring/python/LArCollisionTimeMonAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArCollisionTimeMonAlg.py
@@ -257,7 +257,7 @@ if __name__=='__main__':
 
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.DQ.enableLumiAccess = False #copied from LArRecoFromRaw
     flags.DQ.useTrigger = False #copied from LArRecoFromRaw 
     flags.Output.HISTFileName = 'LArCollTimeMonitoringOutput.root'
diff --git a/LArCalorimeter/LArMonitoring/python/LArCosmicsMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArCosmicsMonAlg.py
index e12bbda6d5931cc1d830c9585c70165301e70b06..1d4f2c4e0585981ebf1ecd581e661169238935a6 100644
--- a/LArCalorimeter/LArMonitoring/python/LArCosmicsMonAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArCosmicsMonAlg.py
@@ -91,7 +91,7 @@ if __name__=='__main__':
    createLArMonConfigFlags()
 
    from AthenaConfiguration.TestDefaults import defaultTestFiles
-   ConfigFlags.Input.Files = defaultTestFiles.RAW
+   ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2
 
    ConfigFlags.Output.HISTFileName = 'LArCosmicsMonOutput.root'
    ConfigFlags.DQ.enableLumiAccess = False
diff --git a/LArCalorimeter/LArMonitoring/python/LArCoverageAlg.py b/LArCalorimeter/LArMonitoring/python/LArCoverageAlg.py
index d034ba1290de3b2880ee65d8960d6aa97ec49034..07c434b66b7086f4d46289afb11741a7050f2481 100644
--- a/LArCalorimeter/LArMonitoring/python/LArCoverageAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArCoverageAlg.py
@@ -511,7 +511,7 @@ if __name__=='__main__':
     createLArMonConfigFlags()
 
     from AthenaConfiguration.TestDefaults import defaultTestFiles
-    ConfigFlags.Input.Files = defaultTestFiles.RAW
+    ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2
     ConfigFlags.DQ.useTrigger = False
 
     ConfigFlags.Output.HISTFileName = 'LArCoverageOutput.root'
diff --git a/LArCalorimeter/LArMonitoring/python/LArDigitMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArDigitMonAlg.py
index 75f547126a76dbc3c62f6ac1d7700a6b3d42afc1..3208ae9b4734353cf109bc1a76a94cf899d0a2aa 100644
--- a/LArCalorimeter/LArMonitoring/python/LArDigitMonAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArDigitMonAlg.py
@@ -202,7 +202,7 @@ if __name__=='__main__':
    createLArMonConfigFlags()
 
    from AthenaConfiguration.TestDefaults import defaultTestFiles
-   ConfigFlags.Input.Files = defaultTestFiles.RAW
+   ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2
 
    ConfigFlags.Output.HISTFileName = 'LArDigitsMonOutput.root'
    ConfigFlags.DQ.enableLumiAccess = False
diff --git a/LArCalorimeter/LArMonitoring/python/LArFEBMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArFEBMonAlg.py
index bd3efd8a4e3a675b27e207df00a00bdaf621114b..a37d83887d9f860d88291f5efd69958655fed814 100644
--- a/LArCalorimeter/LArMonitoring/python/LArFEBMonAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArFEBMonAlg.py
@@ -430,7 +430,7 @@ if __name__=='__main__':
    createLArMonConfigFlags()
 
    from AthenaConfiguration.TestDefaults import defaultTestFiles
-   ConfigFlags.Input.Files = defaultTestFiles.RAW
+   ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2
 
    ConfigFlags.Output.HISTFileName = 'LArFEBMonOutput.root'
    ConfigFlags.DQ.enableLumiAccess = True
diff --git a/LArCalorimeter/LArMonitoring/python/LArNoiseCorrelationMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArNoiseCorrelationMonAlg.py
index 4fe34b118a747857f8f856859bcf193d83d798ec..073a64f5fe6f4f054123f73b4a992b62b612ddca 100644
--- a/LArCalorimeter/LArMonitoring/python/LArNoiseCorrelationMonAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArNoiseCorrelationMonAlg.py
@@ -207,7 +207,7 @@ if __name__=='__main__':
    createLArMonConfigFlags()
 
    from AthenaConfiguration.TestDefaults import defaultTestFiles
-   ConfigFlags.Input.Files = defaultTestFiles.RAW
+   ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2
 
    ConfigFlags.Output.HISTFileName = 'LArNoiseCorrMonOutput.root'
    ConfigFlags.DQ.enableLumiAccess = False
diff --git a/LArCalorimeter/LArMonitoring/python/LArRODMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArRODMonAlg.py
index 4e51f4e7d33f0b0ab3bc61247c039b7f9cce0f48..e777c778ea3b5576741afed25c0964d2f92af072 100644
--- a/LArCalorimeter/LArMonitoring/python/LArRODMonAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArRODMonAlg.py
@@ -231,7 +231,7 @@ if __name__=='__main__':
    createLArMonConfigFlags()
 
    from AthenaConfiguration.TestDefaults import defaultTestFiles
-   ConfigFlags.Input.Files = defaultTestFiles.RAW
+   ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2
 
    ConfigFlags.Output.HISTFileName = 'LArRODMonOutput.root'
    ConfigFlags.DQ.enableLumiAccess = False
diff --git a/LArCalorimeter/LArMonitoring/python/LArRawChannelMonAlg.py b/LArCalorimeter/LArMonitoring/python/LArRawChannelMonAlg.py
index ace2402f101621006d308474c83c3274c686b921..238065e67935818b1cb86cc1e0962180ae33a764 100644
--- a/LArCalorimeter/LArMonitoring/python/LArRawChannelMonAlg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArRawChannelMonAlg.py
@@ -334,7 +334,7 @@ if __name__=='__main__':
 
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     from AthenaConfiguration.Enums import BeamType
-    ConfigFlags.Input.Files = defaultTestFiles.RAW
+    ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2
     ConfigFlags.Output.HISTFileName = 'LArRawChannelMonOutput.root'
     ConfigFlags.DQ.enableLumiAccess = False
     ConfigFlags.DQ.useTrigger = False
diff --git a/LArCalorimeter/LArMonitoring/python/LArReco_fromraw_Cfg.py b/LArCalorimeter/LArMonitoring/python/LArReco_fromraw_Cfg.py
index 4b6b494e3eb37afce98bdf5282587f6ce174aec6..93075ee91eb3a2aab18dfd0efff539fd5bb538a9 100644
--- a/LArCalorimeter/LArMonitoring/python/LArReco_fromraw_Cfg.py
+++ b/LArCalorimeter/LArMonitoring/python/LArReco_fromraw_Cfg.py
@@ -12,7 +12,7 @@ if __name__=="__main__":
    createLArMonConfigFlags()
 
    from AthenaConfiguration.TestDefaults import defaultTestFiles
-   ConfigFlags.Input.Files = defaultTestFiles.RAW
+   ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2
 
    ConfigFlags.Output.HISTFileName = 'LArMonitoringOutput.root'
    ConfigFlags.DQ.enableLumiAccess = False
diff --git a/LArCalorimeter/LArROD/python/LArFebErrorSummaryMakerConfig.py b/LArCalorimeter/LArROD/python/LArFebErrorSummaryMakerConfig.py
index 6fafba9788eef3ce08f1da4e453c7365c70142de..67377e7c1030021df37e590ba5d1567b55e2c429 100644
--- a/LArCalorimeter/LArROD/python/LArFebErrorSummaryMakerConfig.py
+++ b/LArCalorimeter/LArROD/python/LArFebErrorSummaryMakerConfig.py
@@ -65,7 +65,7 @@ if __name__=="__main__":
     log.setLevel(DEBUG)
 
     from AthenaConfiguration.TestDefaults import defaultTestFiles
-    ConfigFlags.Input.Files = defaultTestFiles.RAW
+    ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2
     ConfigFlags.lock()
 
 
diff --git a/LArCalorimeter/LArROD/python/LArRawChannelBuilderAlgConfig.py b/LArCalorimeter/LArROD/python/LArRawChannelBuilderAlgConfig.py
index 773b1eebc9a77f7c9c074bfef6e17c872b99f849..7d3ba4410518663ea45cc716552bdfac32b81827 100644
--- a/LArCalorimeter/LArROD/python/LArRawChannelBuilderAlgConfig.py
+++ b/LArCalorimeter/LArROD/python/LArRawChannelBuilderAlgConfig.py
@@ -92,7 +92,7 @@ if __name__=="__main__":
     log.setLevel(DEBUG)
 
     from AthenaConfiguration.TestDefaults import defaultTestFiles
-    ConfigFlags.Input.Files = defaultTestFiles.RAW
+    ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2
     # in case of testing iterative OFC:
     #ConfigFlags.Input.Files = ['/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data15_1beam/data15_1beam.00260466.physics_L1Calo.merge.RAW._lb1380._SFO-ALL._0001.1']
     ConfigFlags.Input.isMC = False
diff --git a/LArCalorimeter/LArROD/python/LArRawChannelBuilderCrestConfig.py b/LArCalorimeter/LArROD/python/LArRawChannelBuilderCrestConfig.py
index 309e6f862b011484516b81cac832ee3c171c1bab..29bd2ded7b51a5ae33cb2936ee9a33fe2470e7bd 100644
--- a/LArCalorimeter/LArROD/python/LArRawChannelBuilderCrestConfig.py
+++ b/LArCalorimeter/LArROD/python/LArRawChannelBuilderCrestConfig.py
@@ -92,7 +92,7 @@ if __name__=="__main__":
     log.setLevel(DEBUG)
 
     from AthenaConfiguration.TestDefaults import defaultTestFiles
-    ConfigFlags.Input.Files = defaultTestFiles.RAW
+    ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2
     # in case of testing iterative OFC:
     #ConfigFlags.Input.Files = ['/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data15_1beam/data15_1beam.00260466.physics_L1Calo.merge.RAW._lb1380._SFO-ALL._0001.1']
     ConfigFlags.Input.isMC = False
diff --git a/LArCalorimeter/LArRecUtils/python/LArADC2MeVCondAlgConfig.py b/LArCalorimeter/LArRecUtils/python/LArADC2MeVCondAlgConfig.py
index 4498f31bf1d4f472907cd5cefd4f2b8bce2fcb8e..7f28a9d2ec461ce25f5b9e8b87d70269e5d304c0 100644
--- a/LArCalorimeter/LArRecUtils/python/LArADC2MeVCondAlgConfig.py
+++ b/LArCalorimeter/LArRecUtils/python/LArADC2MeVCondAlgConfig.py
@@ -45,7 +45,7 @@ if __name__ == "__main__":
 
     print ('--- data')
     flags1 = initConfigFlags()
-    flags1.Input.Files = defaultTestFiles.RAW
+    flags1.Input.Files = defaultTestFiles.RAW_RUN2
     flags1.lock()
     acc1 = LArADC2MeVCondAlgCfg (flags1)
     acc1.printCondAlgs(summariseProps=True)
diff --git a/LArCalorimeter/LArRecUtils/python/LArADC2MeVSCCondAlgConfig.py b/LArCalorimeter/LArRecUtils/python/LArADC2MeVSCCondAlgConfig.py
index f726290082e85b2cb636ebd9c23b552f7085defe..b74128f9fc3267e61d67ef79d1038cb507697750 100644
--- a/LArCalorimeter/LArRecUtils/python/LArADC2MeVSCCondAlgConfig.py
+++ b/LArCalorimeter/LArRecUtils/python/LArADC2MeVSCCondAlgConfig.py
@@ -45,7 +45,7 @@ if __name__ == "__main__":
 
     print ('--- data')
     flags1 = initConfigFlags()
-    flags1.Input.Files = defaultTestFiles.RAW
+    flags1.Input.Files = defaultTestFiles.RAW_RUN2
     flags1.lock()
     acc1 = LArADC2MeVSCCondAlgCfg (flags1)
     acc1.printCondAlgs(summariseProps=True)
diff --git a/LumiBlock/LumiBlockComps/python/LBDurationCondAlgConfig.py b/LumiBlock/LumiBlockComps/python/LBDurationCondAlgConfig.py
index b8b2398e35208cfa4316e3a294d1ca9c2adb19f7..a51309559cce304469580eb9336aa17b2baaf9a6 100644
--- a/LumiBlock/LumiBlockComps/python/LBDurationCondAlgConfig.py
+++ b/LumiBlock/LumiBlockComps/python/LBDurationCondAlgConfig.py
@@ -32,7 +32,7 @@ if __name__ == "__main__":
 
     print ('--- data')
     flags1 = initConfigFlags()
-    flags1.Input.Files = defaultTestFiles.RAW
+    flags1.Input.Files = defaultTestFiles.RAW_RUN2
     flags1.lock()
     acc1 = LBDurationCondAlgCfg (flags1)
     acc1.printCondAlgs(summariseProps=True)
diff --git a/LumiBlock/LumiBlockComps/python/LumiBlockMuWriterConfig.py b/LumiBlock/LumiBlockComps/python/LumiBlockMuWriterConfig.py
index 92244cfec40821d9f97c9366cd44e3a0d23410c0..e8e19cc26cfdb5e41aa899b95c5a0673faaf9640 100644
--- a/LumiBlock/LumiBlockComps/python/LumiBlockMuWriterConfig.py
+++ b/LumiBlock/LumiBlockComps/python/LumiBlockMuWriterConfig.py
@@ -38,7 +38,7 @@ if __name__ == "__main__":
 
     print ('--- collisions')
     flags1 = initConfigFlags()
-    flags1.Input.Files = defaultTestFiles.RAW
+    flags1.Input.Files = defaultTestFiles.RAW_RUN2
     flags1.lock()
     acc1 = LumiBlockMuWriterCfg (flags1)
     acc1.printCondAlgs (summariseProps=True)
diff --git a/LumiBlock/LumiBlockComps/python/LuminosityCondAlgConfig.py b/LumiBlock/LumiBlockComps/python/LuminosityCondAlgConfig.py
index 295bcfe9e00862e7b7e0d601ddd4bb71ec0cccb4..f65b449f680fb945adc7f35fdbda9db08be81b64 100644
--- a/LumiBlock/LumiBlockComps/python/LuminosityCondAlgConfig.py
+++ b/LumiBlock/LumiBlockComps/python/LuminosityCondAlgConfig.py
@@ -200,7 +200,7 @@ if __name__ == "__main__":
 
     print ('--- run2')
     flags1 = initConfigFlags()
-    flags1.Input.Files = defaultTestFiles.RAW
+    flags1.Input.Files = defaultTestFiles.RAW_RUN2
     flags1.lock()
     acc1 = LuminosityCondAlgCfg (flags1)
     acc1.printCondAlgs(summariseProps=True)
@@ -209,7 +209,7 @@ if __name__ == "__main__":
 
     print ('--- run2/express')
     flags2 = initConfigFlags()
-    flags2.Input.Files = defaultTestFiles.RAW
+    flags2.Input.Files = defaultTestFiles.RAW_RUN2
     flags2.Common.doExpressProcessing = True
     flags2.lock()
     acc2 = LuminosityCondAlgCfg (flags2)
@@ -219,7 +219,7 @@ if __name__ == "__main__":
 
     print ('--- run1')
     flags3 = initConfigFlags()
-    flags3.Input.Files = defaultTestFiles.RAW
+    flags3.Input.Files = defaultTestFiles.RAW_RUN2
     flags3.Input.ProjectName = 'data12_8TeV'
     flags3.lock()
     acc3 = LuminosityCondAlgCfg (flags3)
@@ -229,7 +229,7 @@ if __name__ == "__main__":
 
     print ('--- run1/express')
     flags4 = initConfigFlags()
-    flags4.Input.Files = defaultTestFiles.RAW
+    flags4.Input.Files = defaultTestFiles.RAW_RUN2
     flags4.Input.ProjectName = 'data12_8TeV'
     flags4.Common.doExpressProcessing = True
     flags4.lock()
@@ -248,7 +248,7 @@ if __name__ == "__main__":
 
     print ('--- online')
     flags6 = initConfigFlags()
-    flags6.Input.Files = defaultTestFiles.RAW
+    flags6.Input.Files = defaultTestFiles.RAW_RUN2
     flags6.Common.useOnlineLumi = True
     flags6.lock()
     acc6 = LuminosityCondAlgCfg (flags6)
@@ -257,7 +257,7 @@ if __name__ == "__main__":
 
     print ('--- forced online')
     flags7 = initConfigFlags()
-    flags7.Input.Files = defaultTestFiles.RAW
+    flags7.Input.Files = defaultTestFiles.RAW_RUN2
     flags7.lock()
     acc7 = LuminosityCondAlgCfg (flags7, useOnlineLumi=True, suffix='Online')
     acc7.printCondAlgs(summariseProps=True)
diff --git a/LumiBlock/LumiBlockComps/python/TrigLiveFractionCondAlgConfig.py b/LumiBlock/LumiBlockComps/python/TrigLiveFractionCondAlgConfig.py
index 1191c1c8234726ff9dd68da74675e47b0e6bc5a0..c923651fc0b4d7da07e17dea8347c88803624a63 100644
--- a/LumiBlock/LumiBlockComps/python/TrigLiveFractionCondAlgConfig.py
+++ b/LumiBlock/LumiBlockComps/python/TrigLiveFractionCondAlgConfig.py
@@ -48,7 +48,7 @@ if __name__ == "__main__":
 
     print ('--- run2')
     flags1 = initConfigFlags()
-    flags1.Input.Files = defaultTestFiles.RAW
+    flags1.Input.Files = defaultTestFiles.RAW_RUN2
     flags1.lock()
     acc1 = TrigLiveFractionCondAlgCfg (flags1)
     acc1.printCondAlgs(summariseProps=True)
@@ -56,7 +56,7 @@ if __name__ == "__main__":
 
     print ('--- run1')
     flags3 = initConfigFlags()
-    flags3.Input.Files = defaultTestFiles.RAW
+    flags3.Input.Files = defaultTestFiles.RAW_RUN2
     flags3.Input.ProjectName = 'data12_8TeV'
     flags3.lock()
     acc3 = TrigLiveFractionCondAlgCfg (flags3)
diff --git a/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py b/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py
index 7601160a5e102694d61f0ab750c1979556815565..781c9ef26223b73f12b4a5bc29ef1c8884a475b9 100644
--- a/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py
+++ b/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py
@@ -78,7 +78,7 @@ if __name__=="__main__":
     log.setLevel(VERBOSE)
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Input.isMC = False
     flags.lock()
 
diff --git a/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py b/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py
index 3b0af41099fcd024cb52c414bbf4aadd721ace2e..e9076c1c217172c3f0ce55cf50019fd946715870 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py
@@ -377,7 +377,7 @@ if __name__=="__main__":
     from AthenaConfiguration.AllConfigFlags import initConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     # Set global tag by hand for now
     flags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2018-13"#"CONDBR2-BLKPA-2015-17"
     flags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01"#"ATLAS-R2-2015-03-01-00"
diff --git a/MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py b/MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py
index e0ac3692347f1b75d9b5e815eaa1e0ea49c12111..ca87d6644d046a4176628f8007b7e2b58c55f2cb 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py
@@ -160,7 +160,7 @@ if __name__ == '__main__':
     from AthenaConfiguration.AllConfigFlags import initConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.lock()
 
     acc = ComponentAccumulator()
diff --git a/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py b/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py
index 6d1a78d608af239771af959b49f8fd8f8b956476..eaf7432218e66fcc865bac9cf784419632579878 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py
@@ -348,7 +348,7 @@ def muonRdoDecodeTestData( forTrigger = False ):
     from AthenaConfiguration.AllConfigFlags import initConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
 
     # Set global tag by hand for now
     flags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2018-13"#"CONDBR2-BLKPA-2015-17"
diff --git a/MuonSpectrometer/MuonConfig/test/MdtRdoToPrepDataTool_test.py b/MuonSpectrometer/MuonConfig/test/MdtRdoToPrepDataTool_test.py
index 5a0125fe0f51fc523e33981f1f52e56ce63efab9..cf9075c09741a8f89500a32e31847139c6b6b8ef 100644
--- a/MuonSpectrometer/MuonConfig/test/MdtRdoToPrepDataTool_test.py
+++ b/MuonSpectrometer/MuonConfig/test/MdtRdoToPrepDataTool_test.py
@@ -55,7 +55,7 @@ from AthenaConfiguration.AllConfigFlags import initConfigFlags
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 
 flags = initConfigFlags()
-flags.Input.Files = defaultTestFiles.RAW
+flags.Input.Files = defaultTestFiles.RAW_RUN2
 flags.lock()
 from AthenaConfiguration.MainServicesConfig import MainServicesCfg 
 acc=MainServicesCfg(flags)
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/python/CscMonitoringRAW_Alg.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/python/CscMonitoringRAW_Alg.py
index 7e27c5a8b08c3f748bde96a21b350abd20fa94cc..a6df7f647f4a7e6946a91a50c8ea627a5c525606 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/python/CscMonitoringRAW_Alg.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/python/CscMonitoringRAW_Alg.py
@@ -143,7 +143,7 @@ if __name__=='__main__':
     from AthenaConfiguration.AllConfigFlags import initConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
 
     flags.Output.HISTFileName = 'CscRDOMonitorOutput.root'
     flags.Detector.GeometryMuon=False
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/python/AnalysisTriggerAlgsCAConfig.py b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/python/AnalysisTriggerAlgsCAConfig.py
index 9a14b75453ddb2cfe7551322eda367832f944cfe..4b0a6bc37ec8ee9200ea789f03103e889b0a1917 100644
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/python/AnalysisTriggerAlgsCAConfig.py
+++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/python/AnalysisTriggerAlgsCAConfig.py
@@ -69,7 +69,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.AllConfigFlags import initConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Exec.MaxEvents = 20
     flags.fillFromArgs()
     flags.lock()
diff --git a/Reconstruction/RecJobTransforms/test/RecoSteeringTest.py b/Reconstruction/RecJobTransforms/test/RecoSteeringTest.py
index dd3c91784a2df39da1b1a63dbb184752f140c5ab..a2dea7e74eb1981b755d7c68c3aa71851af3a29b 100755
--- a/Reconstruction/RecJobTransforms/test/RecoSteeringTest.py
+++ b/Reconstruction/RecJobTransforms/test/RecoSteeringTest.py
@@ -24,7 +24,7 @@ def _run(input):
         from AthenaConfiguration.TestDefaults import defaultTestFiles
         from AthenaConfiguration.Enums import ProductionStep
         if input == "RAW":
-            flags.Input.Files = defaultTestFiles.RAW
+            flags.Input.Files = defaultTestFiles.RAW_RUN2
             flags.Common.ProductionStep=ProductionStep.Reconstruction
         if input == "ESD":
             flags.Input.Files = defaultTestFiles.ESD
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileCisCalibAlgConfig.py b/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileCisCalibAlgConfig.py
index e9144017d7eac6365674c620ca25b2e0460796e0..6ef7273a488816794c38675a51fd5a618dc5045c 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileCisCalibAlgConfig.py
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileCisCalibAlgConfig.py
@@ -70,7 +70,7 @@ if __name__=='__main__':
     from AthenaConfiguration.AllConfigFlags import initConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Tile.doFit = True
     flags.Exec.MaxEvents = 3
     flags.Tile.RunType = 'CIS'
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileDigiNoiseCalibAlgConfig.py b/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileDigiNoiseCalibAlgConfig.py
index e76a6e59c5632f3d424ea64e1956e08cc93c0abd..54bddcc13433d3a4f72880e2787c8a5267f1a4b2 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileDigiNoiseCalibAlgConfig.py
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileDigiNoiseCalibAlgConfig.py
@@ -44,7 +44,7 @@ if __name__=='__main__':
     from AthenaConfiguration.AllConfigFlags import initConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Exec.MaxEvents = 3
     flags.fillFromArgs()
     flags.lock()
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileRawChNoiseCalibAlgConfig.py b/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileRawChNoiseCalibAlgConfig.py
index d7773fbd75e778c6b3c762caf3287402f3448e1f..b89fb0db51405d3eb3e1b4bf3e7bffe570041433 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileRawChNoiseCalibAlgConfig.py
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileRawChNoiseCalibAlgConfig.py
@@ -57,7 +57,7 @@ if __name__=='__main__':
     from AthenaConfiguration.AllConfigFlags import initConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Exec.MaxEvents = 3
     flags.fillFromArgs()
     flags.lock()
diff --git a/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileTriggerCalibAlgConfig.py b/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileTriggerCalibAlgConfig.py
index d3c69c2d1aa27302c8e1b54d0d877cd0f22c726d..75fe2a9d37eea26f71fa19bd91ed1bda187b03ec 100644
--- a/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileTriggerCalibAlgConfig.py
+++ b/TileCalorimeter/TileCalib/TileCalibAlgs/python/TileTriggerCalibAlgConfig.py
@@ -81,7 +81,7 @@ if __name__=='__main__':
     from AthenaConfiguration.AllConfigFlags import initConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Tile.doFit = True
     flags.Exec.MaxEvents = 3
     flags.Tile.RunType = 'CIS'
diff --git a/TileCalorimeter/TileConditions/python/TileAutoCorrelationConfig.py b/TileCalorimeter/TileConditions/python/TileAutoCorrelationConfig.py
index 5e5f9405d3344a91bbc0a53086db72092bcd4194..564b75201474e93fb2a91f171662565766041555 100644
--- a/TileCalorimeter/TileConditions/python/TileAutoCorrelationConfig.py
+++ b/TileCalorimeter/TileConditions/python/TileAutoCorrelationConfig.py
@@ -96,7 +96,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.lock()
 
     acc = ComponentAccumulator()
diff --git a/TileCalorimeter/TileConditions/python/TileBadChannelsConfig.py b/TileCalorimeter/TileConditions/python/TileBadChannelsConfig.py
index 24ec09a2b1bdecfc2901135d5b09db3d137f5b86..a809346576652bcff3bff9542a00fed5f919474f 100644
--- a/TileCalorimeter/TileConditions/python/TileBadChannelsConfig.py
+++ b/TileCalorimeter/TileConditions/python/TileBadChannelsConfig.py
@@ -113,7 +113,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.lock()
 
     acc = ComponentAccumulator()
diff --git a/TileCalorimeter/TileConditions/python/TileCablingSvcConfig.py b/TileCalorimeter/TileConditions/python/TileCablingSvcConfig.py
index 186ecd5ee606b2a1b346208fbe7249ae7f912e65..0eb3203e59d1572377a7e6e7e710fec906b4f116 100644
--- a/TileCalorimeter/TileConditions/python/TileCablingSvcConfig.py
+++ b/TileCalorimeter/TileConditions/python/TileCablingSvcConfig.py
@@ -84,7 +84,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.lock()
 
     acc = ComponentAccumulator()
diff --git a/TileCalorimeter/TileConditions/python/TileCondToolsTestConfig.py b/TileCalorimeter/TileConditions/python/TileCondToolsTestConfig.py
index c36d6a09eadbda26dc01dd189a3beb578b20df59..d9d22a6ca9f3d999499a6722d37d0e5b81780aab 100644
--- a/TileCalorimeter/TileConditions/python/TileCondToolsTestConfig.py
+++ b/TileCalorimeter/TileConditions/python/TileCondToolsTestConfig.py
@@ -102,7 +102,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.lock()
 
     acc = ComponentAccumulator()
diff --git a/TileCalorimeter/TileConditions/python/TileDCSConfig.py b/TileCalorimeter/TileConditions/python/TileDCSConfig.py
index 1c4bb576cf517d3bf843dc1a20e158b0e756225b..807233ea3227c09359c37c08ddc52f382b8615bb 100644
--- a/TileCalorimeter/TileConditions/python/TileDCSConfig.py
+++ b/TileCalorimeter/TileConditions/python/TileDCSConfig.py
@@ -104,7 +104,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.lock()
 
     acc = ComponentAccumulator()
diff --git a/TileCalorimeter/TileConditions/python/TileDSPThresholdConfig.py b/TileCalorimeter/TileConditions/python/TileDSPThresholdConfig.py
index 6eece03699917f39de54b6a52d4fc3ea4a2ae131..5c1e176211d9d6932dc72e24c2cfd20580868adb 100644
--- a/TileCalorimeter/TileConditions/python/TileDSPThresholdConfig.py
+++ b/TileCalorimeter/TileConditions/python/TileDSPThresholdConfig.py
@@ -92,7 +92,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.lock()
 
     acc = ComponentAccumulator()
diff --git a/TileCalorimeter/TileConditions/python/TileEMScaleConfig.py b/TileCalorimeter/TileConditions/python/TileEMScaleConfig.py
index 28941c885a770f98d8bd26eaa33d879106ffdffe..d0be135bc975a64f69ad15af44e66849e53fdf43 100644
--- a/TileCalorimeter/TileConditions/python/TileEMScaleConfig.py
+++ b/TileCalorimeter/TileConditions/python/TileEMScaleConfig.py
@@ -193,7 +193,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.lock()
 
     acc = ComponentAccumulator()
diff --git a/TileCalorimeter/TileConditions/python/TileInfoLoaderConfig.py b/TileCalorimeter/TileConditions/python/TileInfoLoaderConfig.py
index c1db1b3c8f90315949dddf8b7f937afca8070de7..734917aa626ec66bbefa2e3ad3d1019083a41841 100644
--- a/TileCalorimeter/TileConditions/python/TileInfoLoaderConfig.py
+++ b/TileCalorimeter/TileConditions/python/TileInfoLoaderConfig.py
@@ -57,7 +57,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.lock()
 
     acc = ComponentAccumulator()
diff --git a/TileCalorimeter/TileConditions/python/TileIntegratorConfig.py b/TileCalorimeter/TileConditions/python/TileIntegratorConfig.py
index e8c85fac147628a8fc735ec2258b61560bd0f817..64c45994e1b78b123c84f38717a0bcc85ba5e45e 100644
--- a/TileCalorimeter/TileConditions/python/TileIntegratorConfig.py
+++ b/TileCalorimeter/TileConditions/python/TileIntegratorConfig.py
@@ -92,7 +92,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.lock()
 
     acc = ComponentAccumulator()
diff --git a/TileCalorimeter/TileConditions/python/TileMuIDConfig.py b/TileCalorimeter/TileConditions/python/TileMuIDConfig.py
index b687dff6bdd6b5c87b6973761f5bce2f49af706b..028fdd4eeb239a98bb24a583c79cd2fa733e0366 100644
--- a/TileCalorimeter/TileConditions/python/TileMuIDConfig.py
+++ b/TileCalorimeter/TileConditions/python/TileMuIDConfig.py
@@ -89,7 +89,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.lock()
 
     acc = ComponentAccumulator()
diff --git a/TileCalorimeter/TileConditions/python/TileOFCConfig.py b/TileCalorimeter/TileConditions/python/TileOFCConfig.py
index 0209c62dac2462b7d6dd57649f66896efadb3573..be5ce04367ffa5f6a17fcc06bb50db70fec4dfb0 100644
--- a/TileCalorimeter/TileConditions/python/TileOFCConfig.py
+++ b/TileCalorimeter/TileConditions/python/TileOFCConfig.py
@@ -162,7 +162,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Tile.RunType = 'PHY'
     flags.lock()
 
diff --git a/TileCalorimeter/TileConditions/python/TilePulseShapeConfig.py b/TileCalorimeter/TileConditions/python/TilePulseShapeConfig.py
index 3c61190d358985543c24fdea3b53b04daf8f4fca..00bd19428fc89eff34c3ac6451c1bd1eed981705 100644
--- a/TileCalorimeter/TileConditions/python/TilePulseShapeConfig.py
+++ b/TileCalorimeter/TileConditions/python/TilePulseShapeConfig.py
@@ -142,7 +142,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Tile.RunType = 'PHY'
     flags.lock()
 
diff --git a/TileCalorimeter/TileConditions/python/TileSampleNoiseConfig.py b/TileCalorimeter/TileConditions/python/TileSampleNoiseConfig.py
index 548375a0438191f05370af51389d02637742c4fe..03f15e126f4c994d7c937aa1e74f0d2746435354 100644
--- a/TileCalorimeter/TileConditions/python/TileSampleNoiseConfig.py
+++ b/TileCalorimeter/TileConditions/python/TileSampleNoiseConfig.py
@@ -123,7 +123,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Common.isOnline = True
     flags.lock()
 
diff --git a/TileCalorimeter/TileConditions/python/TileTMDBConfig.py b/TileCalorimeter/TileConditions/python/TileTMDBConfig.py
index 1f08729214adb6e8d581a1aee2b1409d3bbeebba..8beb67294e53eda42177da900d324fb9274907e2 100644
--- a/TileCalorimeter/TileConditions/python/TileTMDBConfig.py
+++ b/TileCalorimeter/TileConditions/python/TileTMDBConfig.py
@@ -129,7 +129,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Tile.RunType = 'PHY'
     flags.lock()
 
diff --git a/TileCalorimeter/TileConditions/python/TileTimingConfig.py b/TileCalorimeter/TileConditions/python/TileTimingConfig.py
index eda3b080e0c18ac3365f5160a86cabd57476fda2..6f532f8ed057e7ce032af27d9e4db3a37fa030f6 100644
--- a/TileCalorimeter/TileConditions/python/TileTimingConfig.py
+++ b/TileCalorimeter/TileConditions/python/TileTimingConfig.py
@@ -128,7 +128,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Tile.RunType = 'PHY'
     flags.lock()
 
diff --git a/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OfflineData_test.py b/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OfflineData_test.py
index 6406ac13be3af656c3fe0067728a5460954cf1dc..6c51344d5418365c38886ea5af14a1a5df8c564a 100644
--- a/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OfflineData_test.py
+++ b/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OfflineData_test.py
@@ -16,7 +16,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Tile.RunType = 'PHY'
     flags.lock()
 
diff --git a/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OnlineData_test.py b/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OnlineData_test.py
index f822ef2aef41d624cade0f1c9755d09f72885a9e..6cba826e69cb7d9288f276715601b31b1e38dcb0 100644
--- a/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OnlineData_test.py
+++ b/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OnlineData_test.py
@@ -16,7 +16,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Common.isOnline = True
     flags.Tile.RunType = 'PHY'
     flags.lock()
diff --git a/TileCalorimeter/TileConfiguration/python/TileConfigFlags.py b/TileCalorimeter/TileConfiguration/python/TileConfigFlags.py
index 6e204293b5abf3e32e15369a5b025c067f9270c4..94de51b766f1600906efa24fce3fb0da372bea2f 100644
--- a/TileCalorimeter/TileConfiguration/python/TileConfigFlags.py
+++ b/TileCalorimeter/TileConfiguration/python/TileConfigFlags.py
@@ -187,7 +187,7 @@ if __name__=="__main__":
      from AthenaConfiguration.AllConfigFlags import initConfigFlags
      from AthenaConfiguration.TestDefaults import defaultTestFiles
      flags = initConfigFlags()
-     flags.Input.Files = defaultTestFiles.RAW
+     flags.Input.Files = defaultTestFiles.RAW_RUN2
 
      if len(sys.argv) > 1:
           flags.fillFromArgs()
diff --git a/TileCalorimeter/TileGeoModel/python/TileGMConfig.py b/TileCalorimeter/TileGeoModel/python/TileGMConfig.py
index 4b55525895424c515f16926eb37f101ff7861612..a216df697c17fd96419374f237ac1f0d63b2f2ed 100644
--- a/TileCalorimeter/TileGeoModel/python/TileGMConfig.py
+++ b/TileCalorimeter/TileGeoModel/python/TileGMConfig.py
@@ -32,7 +32,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.lock()
 
     acc = TileGMCfg( flags )
diff --git a/TileCalorimeter/TileL2Algs/python/TileL2Config.py b/TileCalorimeter/TileL2Algs/python/TileL2Config.py
index ab37055dde6d05db7aea5b444cce8c919cae9288..135b03e52cafeea9c585183f665e8f70f48066f4 100644
--- a/TileCalorimeter/TileL2Algs/python/TileL2Config.py
+++ b/TileCalorimeter/TileL2Algs/python/TileL2Config.py
@@ -99,7 +99,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.fillFromArgs()
     flags.Output.ESDFileName = "myESD.pool.root"
     flags.lock()
diff --git a/TileCalorimeter/TileMonitoring/python/RunTileMonitoring.py b/TileCalorimeter/TileMonitoring/python/RunTileMonitoring.py
index 87e7b8d5bc90ca37b5f5826940b96f59ffee1b5b..b231a253f8e057240536147409aaf8f3d586708e 100755
--- a/TileCalorimeter/TileMonitoring/python/RunTileMonitoring.py
+++ b/TileCalorimeter/TileMonitoring/python/RunTileMonitoring.py
@@ -205,7 +205,7 @@ if __name__=='__main__':
             flags.Input.Files = [os.path.join(inputDirectory, inputFile)]
         else:
             from AthenaConfiguration.TestDefaults import defaultTestFiles
-            flags.Input.Files = defaultTestFiles.RAW
+            flags.Input.Files = defaultTestFiles.RAW_RUN2
 
     runNumber = flags.Input.RunNumber[0]
     flags.GeoModel.AtlasVersion = 'ATLAS-R3S-2021-03-01-00' if not flags.Input.isMC and runNumber >= 411938 else 'ATLAS-R2-2016-01-00-01'
diff --git a/TileCalorimeter/TileMonitoring/python/TileDQFragMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileDQFragMonitorAlgorithm.py
index 5f05449d0888467c1d7c3b3af7d0720cf71bdcbe..7544ba20a6ef59079ceed534b02f1d32ef17a05b 100644
--- a/TileCalorimeter/TileMonitoring/python/TileDQFragMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileDQFragMonitorAlgorithm.py
@@ -255,7 +255,7 @@ if __name__=='__main__':
     from AthenaConfiguration.AllConfigFlags import initConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Output.HISTFileName = 'TileDQFragMonitorOutput.root'
     flags.DQ.useTrigger = False
     flags.DQ.enableLumiAccess = False
diff --git a/TileCalorimeter/TileMonitoring/python/TileDigiNoiseMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileDigiNoiseMonitorAlgorithm.py
index 7e0d5fa2b54caef3bc031df75390681b513fc880..71d7488c21c0c85c52ebc394ce27373781e479b8 100644
--- a/TileCalorimeter/TileMonitoring/python/TileDigiNoiseMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileDigiNoiseMonitorAlgorithm.py
@@ -93,7 +93,7 @@ if __name__=='__main__':
     from AthenaConfiguration.AllConfigFlags import initConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Output.HISTFileName = 'TileDigiNoiseMonitorOutput.root'
     flags.DQ.useTrigger = False
     flags.DQ.enableLumiAccess = False
diff --git a/TileCalorimeter/TileMonitoring/python/TileDigitsFlxMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileDigitsFlxMonitorAlgorithm.py
index b696df7a76c0567ccac16eeb0e5a465a4db10426..5b9853f1ff6f5702813aee45720face9703fc093 100644
--- a/TileCalorimeter/TileMonitoring/python/TileDigitsFlxMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileDigitsFlxMonitorAlgorithm.py
@@ -167,7 +167,7 @@ if __name__=='__main__':
     fragIDs = [int(fragID, base=16) for fragID in args.fragIDs]
 
     from AthenaConfiguration.TestDefaults import defaultTestFiles
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Output.HISTFileName = 'TileDigitsFlxMonitorOutput.root'
     flags.DQ.useTrigger = False
     flags.DQ.enableLumiAccess = False
diff --git a/TileCalorimeter/TileMonitoring/python/TileDigitsMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileDigitsMonitorAlgorithm.py
index 3a8353337a87d5025125d3361e3b6ef2a7d63bed..5392d2e84b808aa62d2dcdbaab5a629aa2a7f7ab 100644
--- a/TileCalorimeter/TileMonitoring/python/TileDigitsMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileDigitsMonitorAlgorithm.py
@@ -255,7 +255,7 @@ if __name__=='__main__':
     from AthenaConfiguration.AllConfigFlags import initConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Output.HISTFileName = 'TileDigitsMonitorOutput2.root'
     flags.DQ.useTrigger = False
     flags.DQ.enableLumiAccess = False
diff --git a/TileCalorimeter/TileMonitoring/python/TileRODMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileRODMonitorAlgorithm.py
index 146833a8ddefe7bdfe785bf421402f5123b97953..7eeff666eb937b0a00c779d6bab4d7b6246718a1 100644
--- a/TileCalorimeter/TileMonitoring/python/TileRODMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileRODMonitorAlgorithm.py
@@ -177,7 +177,7 @@ if __name__=='__main__':
     from AthenaConfiguration.AllConfigFlags import initConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Output.HISTFileName = 'TileRODMonitorOutput.root'
     flags.DQ.useTrigger = False
     flags.DQ.enableLumiAccess = False
diff --git a/TileCalorimeter/TileMonitoring/python/TileRawChannelFlxMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileRawChannelFlxMonitorAlgorithm.py
index 98aa3e872fb8e75858d7096d57f4f2967e300ff1..84ee937e3dead55bb3e2473df01864b7fe10e2ca 100644
--- a/TileCalorimeter/TileMonitoring/python/TileRawChannelFlxMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileRawChannelFlxMonitorAlgorithm.py
@@ -104,7 +104,7 @@ if __name__=='__main__':
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
 
     from AthenaConfiguration.TestDefaults import defaultTestFiles
-    ConfigFlags.Input.Files = defaultTestFiles.RAW
+    ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2
     ConfigFlags.Output.HISTFileName = 'TileRawChannelFlxMonitorOutput.root'
     ConfigFlags.DQ.useTrigger = False
     ConfigFlags.DQ.enableLumiAccess = False
diff --git a/TileCalorimeter/TileMonitoring/python/TileRawChannelMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileRawChannelMonitorAlgorithm.py
index fd12e1f49634a262b493124fb696e0c68da0925f..c0a1da53954e0c1229366f18236857317941dbc5 100644
--- a/TileCalorimeter/TileMonitoring/python/TileRawChannelMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileRawChannelMonitorAlgorithm.py
@@ -227,7 +227,7 @@ if __name__=='__main__':
     from AthenaConfiguration.AllConfigFlags import initConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Output.HISTFileName = 'TileRawChannelMonitorOutput.root'
     flags.DQ.useTrigger = False
     flags.DQ.enableLumiAccess = False
diff --git a/TileCalorimeter/TileMonitoring/python/TileTMDBDigitsMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileTMDBDigitsMonitorAlgorithm.py
index 3cf351a04fda5d33e53218bfbd441be5ed51cee9..ed32f300c08cffb3fd6e606c977d0047c97d8488 100644
--- a/TileCalorimeter/TileMonitoring/python/TileTMDBDigitsMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileTMDBDigitsMonitorAlgorithm.py
@@ -76,7 +76,7 @@ if __name__=='__main__':
     from AthenaConfiguration.AllConfigFlags import initConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Output.HISTFileName = 'TileTMDBDigitsMonitorOutput.root'
     flags.DQ.useTrigger = False
     flags.DQ.enableLumiAccess = False
diff --git a/TileCalorimeter/TileMonitoring/python/TileTMDBMonitorAlgorithm.py b/TileCalorimeter/TileMonitoring/python/TileTMDBMonitorAlgorithm.py
index 142f6ec5bff76c0e6bfd9171f01ff14716d38d06..64fbadfa9af6812d16cfe6c603c368e185e4929d 100644
--- a/TileCalorimeter/TileMonitoring/python/TileTMDBMonitorAlgorithm.py
+++ b/TileCalorimeter/TileMonitoring/python/TileTMDBMonitorAlgorithm.py
@@ -132,7 +132,7 @@ if __name__=='__main__':
     from AthenaConfiguration.AllConfigFlags import initConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Output.HISTFileName = 'TileTMDBMonitorOutput.root'
     flags.DQ.useTrigger = False
     flags.DQ.enableLumiAccess = False
diff --git a/TileCalorimeter/TileRawUtils/python/RegSelCondAlg_TileConfig.py b/TileCalorimeter/TileRawUtils/python/RegSelCondAlg_TileConfig.py
index 8dc060a96a092f6d642a907774712e7039aab1df..beccfb33944e72ed09ddf8460a392acb68d183af 100644
--- a/TileCalorimeter/TileRawUtils/python/RegSelCondAlg_TileConfig.py
+++ b/TileCalorimeter/TileRawUtils/python/RegSelCondAlg_TileConfig.py
@@ -35,7 +35,7 @@ if __name__ == "__main__":
     # Test setup
     log.setLevel(INFO)
 
-    ConfigFlags.Input.Files = defaultTestFiles.RAW
+    ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2
     ConfigFlags.lock()
 
     # Initialize configuration object, add accumulator, merge, and run.
diff --git a/TileCalorimeter/TileRec/python/TileAANtupleConfig.py b/TileCalorimeter/TileRec/python/TileAANtupleConfig.py
index 9677cf1f8943f2df97d7fc350e165966f6cd2034..cd75bb19bfd4a22217be1827d63eabf28e0c6df3 100644
--- a/TileCalorimeter/TileRec/python/TileAANtupleConfig.py
+++ b/TileCalorimeter/TileRec/python/TileAANtupleConfig.py
@@ -100,7 +100,7 @@ if __name__=='__main__':
     log.setLevel(INFO)
 
     from AthenaConfiguration.TestDefaults import defaultTestFiles
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Exec.MaxEvents = 3
     flags.fillFromArgs(parser=parser)
 
diff --git a/TileCalorimeter/TileRecAlgs/python/TileDigitsFilterConfig.py b/TileCalorimeter/TileRecAlgs/python/TileDigitsFilterConfig.py
index 566bbf58421f11573ef3eb81a33c054aa0161f44..1cc669060f9a7c0dc1114a7edc567ad3754ce19e 100644
--- a/TileCalorimeter/TileRecAlgs/python/TileDigitsFilterConfig.py
+++ b/TileCalorimeter/TileRecAlgs/python/TileDigitsFilterConfig.py
@@ -69,7 +69,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Output.ESDFileName = "myESD.pool.root"
     flags.Tile.RunType = 'PHY'
     flags.lock()
diff --git a/TileCalorimeter/TileRecUtils/python/TileCellBuilderConfig.py b/TileCalorimeter/TileRecUtils/python/TileCellBuilderConfig.py
index 2b8fbd0acc23f43e088ad6612322d092fb5ecbb3..9ef96dbe4a2bc121c016479052778ddafc53a128 100644
--- a/TileCalorimeter/TileRecUtils/python/TileCellBuilderConfig.py
+++ b/TileCalorimeter/TileRecUtils/python/TileCellBuilderConfig.py
@@ -79,7 +79,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Tile.RunType = 'PHY'
     flags.fillFromArgs()
     flags.lock()
diff --git a/TileCalorimeter/TileRecUtils/python/TileCellMakerConfig.py b/TileCalorimeter/TileRecUtils/python/TileCellMakerConfig.py
index 2f70f61a2c3bae6b33192e7e6583d476f77e6bf7..3e50ba536caf8ce5062147bc6f397da24884704e 100644
--- a/TileCalorimeter/TileRecUtils/python/TileCellMakerConfig.py
+++ b/TileCalorimeter/TileRecUtils/python/TileCellMakerConfig.py
@@ -117,7 +117,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Tile.RunType = 'PHY'
     flags.Tile.doOptATLAS = True
     flags.Tile.correctTimeJumps = True
diff --git a/TileCalorimeter/TileRecUtils/python/TileCellNoiseFilterConfig.py b/TileCalorimeter/TileRecUtils/python/TileCellNoiseFilterConfig.py
index b3a298bbdaf4ed00e586dfce8a27ba93b6ca8919..0c8e9283ba2b3aad9b95119dfc8c38a9b07b95fc 100644
--- a/TileCalorimeter/TileRecUtils/python/TileCellNoiseFilterConfig.py
+++ b/TileCalorimeter/TileRecUtils/python/TileCellNoiseFilterConfig.py
@@ -55,7 +55,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Tile.RunType = 'PHY'
     flags.Tile.NoiseFilter = 111
     flags.fillFromArgs()
diff --git a/TileCalorimeter/TileRecUtils/python/TileDQstatusConfig.py b/TileCalorimeter/TileRecUtils/python/TileDQstatusConfig.py
index ce93c5e9add7ee141898081d25c06f419db408d9..22f5f04ba302eefe680c3b2538186d1bc5dc7115 100644
--- a/TileCalorimeter/TileRecUtils/python/TileDQstatusConfig.py
+++ b/TileCalorimeter/TileRecUtils/python/TileDQstatusConfig.py
@@ -98,7 +98,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Tile.RunType = 'PHY'
     flags.lock()
 
diff --git a/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderConfig.py b/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderConfig.py
index 3511d7b85da9d40c5bcba7890e9bac0c4496d710..6304ce893df268ba3e1bf120995fa36aedf29904 100644
--- a/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderConfig.py
+++ b/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderConfig.py
@@ -75,7 +75,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Tile.RunType = 'PHY'
     flags.Tile.NoiseFilter = 1
     flags.lock()
diff --git a/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderFitConfig.py b/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderFitConfig.py
index ee81a09fa21f257efdbb72a6acd1042f4b0021ab..2171a5079186787e90fd71b0914f7acc300c5b3d 100644
--- a/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderFitConfig.py
+++ b/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderFitConfig.py
@@ -54,7 +54,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Tile.RunType = 'PHY'
     flags.Tile.NoiseFilter = 1
     flags.lock()
diff --git a/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderMFConfig.py b/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderMFConfig.py
index e14aeebd38718d7933e48fec859bd92d2b50851d..8b6e5d963dc41f7f68f04359e67026df5ff22ffb 100644
--- a/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderMFConfig.py
+++ b/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderMFConfig.py
@@ -66,7 +66,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Tile.RunType = 'PHY'
     flags.Tile.NoiseFilter = 1
     flags.lock()
diff --git a/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderOptConfig.py b/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderOptConfig.py
index 16584d4804c3dcfa050ff31ba8543262774dff75..234bad4b8728b16568e9e2599f09ba7a3cda25a6 100644
--- a/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderOptConfig.py
+++ b/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderOptConfig.py
@@ -94,7 +94,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Tile.RunType = 'PHY'
     flags.Tile.NoiseFilter = 1
     flags.lock()
diff --git a/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderWienerConfig.py b/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderWienerConfig.py
index 144657d96d1b56ccee32f548eb0b0ff4a35ab277..7068dbaafc99ded13e02bb8b8937690dd40cc02e 100644
--- a/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderWienerConfig.py
+++ b/TileCalorimeter/TileRecUtils/python/TileRawChannelBuilderWienerConfig.py
@@ -56,7 +56,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Tile.RunType = 'PHY'
     flags.Tile.NoiseFilter = 1
     flags.lock()
diff --git a/TileCalorimeter/TileRecUtils/python/TileRawChannelCorrectionConfig.py b/TileCalorimeter/TileRecUtils/python/TileRawChannelCorrectionConfig.py
index 0ad278a6a59d2dd9897a8081251ef89e3c91176e..7856c1090e331a665e3940d3bca180ed2f1c4885 100644
--- a/TileCalorimeter/TileRecUtils/python/TileRawChannelCorrectionConfig.py
+++ b/TileCalorimeter/TileRecUtils/python/TileRawChannelCorrectionConfig.py
@@ -184,7 +184,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Tile.RunType = 'PHY'
     flags.Tile.correctPedestalDifference = True
     flags.Tile.zeroAmplitudeWithoutDigits = True
diff --git a/TileCalorimeter/TileRecUtils/python/TileRawChannelMakerConfig.py b/TileCalorimeter/TileRecUtils/python/TileRawChannelMakerConfig.py
index 69e047a3a9a3bb9fe0118e7a047bb3f25c8ce0a3..8df4aeafe63fb30f33f8290691facb2f35328467 100644
--- a/TileCalorimeter/TileRecUtils/python/TileRawChannelMakerConfig.py
+++ b/TileCalorimeter/TileRecUtils/python/TileRawChannelMakerConfig.py
@@ -166,7 +166,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Tile.RunType = 'PHY'
     flags.Tile.doFit = True
     flags.Tile.doOF1 = True
diff --git a/TileCalorimeter/TileSvc/TileByteStream/python/TileHid2RESrcIDConfig.py b/TileCalorimeter/TileSvc/TileByteStream/python/TileHid2RESrcIDConfig.py
index a61942e93c744c963488374c326cecc575d9e23d..a144e164981d46f517e29159921430f7be9b50f0 100644
--- a/TileCalorimeter/TileSvc/TileByteStream/python/TileHid2RESrcIDConfig.py
+++ b/TileCalorimeter/TileSvc/TileByteStream/python/TileHid2RESrcIDConfig.py
@@ -51,7 +51,7 @@ if __name__ == "__main__":
     log.setLevel(INFO)
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.lock()
 
     # Initialize configuration object, add accumulator, merge, and run.
diff --git a/Tracking/TrkConditions/TrackingGeometryCondAlg/python/AtlasTrackingGeometryCondAlgConfig.py b/Tracking/TrkConditions/TrackingGeometryCondAlg/python/AtlasTrackingGeometryCondAlgConfig.py
index 6bfe9f87e789b72b1ad5d7888b739312a7268b2f..8c33166e307ffc287cfcaf67d585256b7154797d 100644
--- a/Tracking/TrkConditions/TrackingGeometryCondAlg/python/AtlasTrackingGeometryCondAlgConfig.py
+++ b/Tracking/TrkConditions/TrackingGeometryCondAlg/python/AtlasTrackingGeometryCondAlgConfig.py
@@ -189,7 +189,7 @@ if __name__ == '__main__':
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
 
-    ConfigFlags.Input.Files = defaultTestFiles.RAW
+    ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2
     ConfigFlags.lock()
 
     acc = TrackingGeometryCondAlgCfg(ConfigFlags)
diff --git a/Tracking/TrkConfig/python/AtlasTrackingGeometrySvcConfig.py b/Tracking/TrkConfig/python/AtlasTrackingGeometrySvcConfig.py
index 329ab0dc9964d67df0bc8b4d7d57fc8f0a3222ae..793b89f2db1f160d91b04a4fd28ab6594cb1b356 100644
--- a/Tracking/TrkConfig/python/AtlasTrackingGeometrySvcConfig.py
+++ b/Tracking/TrkConfig/python/AtlasTrackingGeometrySvcConfig.py
@@ -72,7 +72,7 @@ if __name__ == '__main__':
 
     from AthenaConfiguration.TestDefaults import defaultTestFiles
 
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.lock()
 
     acc = TrackingGeometrySvcCfg(flags)
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/python/MdtDataPreparator_test.py b/Trigger/TrigAlgorithms/TrigL2MuonSA/python/MdtDataPreparator_test.py
index 67e91836e83e2aad57e1514db24a4d947757a5ae..636882e19af46aa2a706dd13f8c4e8531f865239 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/python/MdtDataPreparator_test.py
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/python/MdtDataPreparator_test.py
@@ -53,7 +53,7 @@ def testCfg (configFlags):
 from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 
-ConfigFlags.Input.Files = defaultTestFiles.RAW
+ConfigFlags.Input.Files = defaultTestFiles.RAW_RUN2
 
 ConfigFlags.lock()
 from AthenaConfiguration.MainServicesConfig import MainServicesCfg 
diff --git a/Trigger/TrigAlgorithms/TrigL2MuonSA/python/TrigL2MuonSAConfig_newJO.py b/Trigger/TrigAlgorithms/TrigL2MuonSA/python/TrigL2MuonSAConfig_newJO.py
index a0cc98378be2fe74a8f8eeced73867bc5e023a15..7d982e867d6aacf507785e70189a273c32d3f8c5 100644
--- a/Trigger/TrigAlgorithms/TrigL2MuonSA/python/TrigL2MuonSAConfig_newJO.py
+++ b/Trigger/TrigAlgorithms/TrigL2MuonSA/python/TrigL2MuonSAConfig_newJO.py
@@ -379,7 +379,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     from AthenaConfiguration.AllConfigFlags import initConfigFlags
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.lock()
 
     cfg = l2MuFastAlgCfg(flags, roisKey="MURoIs")
diff --git a/Trigger/TrigAlgorithms/TrigMinBias/python/MbtsConfig.py b/Trigger/TrigAlgorithms/TrigMinBias/python/MbtsConfig.py
index 1da77a7794a29e49bfa6218565367aafebb0279e..e3832ed6fd09c4497d0a09a065ea5d8597b0fe78 100644
--- a/Trigger/TrigAlgorithms/TrigMinBias/python/MbtsConfig.py
+++ b/Trigger/TrigAlgorithms/TrigMinBias/python/MbtsConfig.py
@@ -29,7 +29,7 @@ if __name__ == '__main__':
     from AthenaConfiguration.TestDefaults import defaultTestFiles
 
     flags = initConfigFlags()
-    flags.Input.Files=defaultTestFiles.RAW # or ESD or AOD or ...
+    flags.Input.Files=defaultTestFiles.RAW_RUN2 # or ESD or AOD or ...
     flags.lock()
 
     acc=ComponentAccumulator()
diff --git a/Trigger/TrigAlgorithms/TrigMinBias/python/MinBiasCountersConfig.py b/Trigger/TrigAlgorithms/TrigMinBias/python/MinBiasCountersConfig.py
index ad19f8a48471096b869d67ec04cd724079460161..7c39d7235760c128e275bf6b520157afe31ab063 100644
--- a/Trigger/TrigAlgorithms/TrigMinBias/python/MinBiasCountersConfig.py
+++ b/Trigger/TrigAlgorithms/TrigMinBias/python/MinBiasCountersConfig.py
@@ -35,7 +35,7 @@ if __name__ == '__main__':
     from AthenaConfiguration.TestDefaults import defaultTestFiles
 
     flags = initConfigFlags()
-    flags.Input.Files=defaultTestFiles.RAW # or ESD or AOD or ...
+    flags.Input.Files=defaultTestFiles.RAW_RUN2 # or ESD or AOD or ...
     flags.lock()
 
     acc = ComponentAccumulator()
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigCaloDataAccessConfig.py b/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigCaloDataAccessConfig.py
index 88bf44b23670e8876e9d453bc8b86b30efad7fcd..a12e3c8a8943236e08f3dacc3e1aaf1da933c4b8 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigCaloDataAccessConfig.py
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigCaloDataAccessConfig.py
@@ -106,7 +106,7 @@ if __name__ == "__main__":
     import sys
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Input.isMC=False
     flags.lock()
 
diff --git a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauConfigFlags.py b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauConfigFlags.py
index d5e1c1570502539651f1b949f3411d7b4f695b53..9baf9d2b1dfb74471656f00c4f3f9b5ae29f1c1a 100644
--- a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauConfigFlags.py
+++ b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauConfigFlags.py
@@ -50,7 +50,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.AllConfigFlags import initConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
 
     flags.lock()
     flags.Tau.CalibrateLCConfig
diff --git a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecConfig.py b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecConfig.py
index b1ab39265c9556a6536adf49056b7c915af5edb0..7d1fd26f70fad192d102e60767db24f41ad7817a 100644
--- a/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecConfig.py
+++ b/Trigger/TrigAlgorithms/TrigTauRec/python/TrigTauRecConfig.py
@@ -167,7 +167,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.AllConfigFlags import initConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.lock()
 
     acc = trigTauRecMergedCaloOnlyMVACfg(flags)
diff --git a/Trigger/TrigAnalysis/TrigDecisionTool/python/TrigDecisionToolConfig.py b/Trigger/TrigAnalysis/TrigDecisionTool/python/TrigDecisionToolConfig.py
index 16126027d074b4415111216934a3ec9fa79f0904..87e0c8829b6d0d360e2b4c87ad6e2165578599b3 100644
--- a/Trigger/TrigAnalysis/TrigDecisionTool/python/TrigDecisionToolConfig.py
+++ b/Trigger/TrigAnalysis/TrigDecisionTool/python/TrigDecisionToolConfig.py
@@ -97,7 +97,7 @@ if __name__ == '__main__':
 
     flags = initConfigFlags()
     if '--RAWRUN2' in sys.argv:
-        flags.Input.Files = defaultTestFiles.RAW
+        flags.Input.Files = defaultTestFiles.RAW_RUN2
     else:
         flags.Input.Files = defaultTestFiles.AOD_RUN2_DATA
         #TODO expand the test scope Run3 AODs and RAWs
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py b/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py
index c531a07f4335f7ad6027c3b2d2830df4a9c35a91..e7c625aab81199046d64b7266348798ab1671174 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConfigSvcCfg.py
@@ -380,7 +380,7 @@ if __name__ == "__main__":
             flags = initConfigFlags()
             flags.Trigger.EDMVersion = 3
             from AthenaConfiguration.TestDefaults import defaultTestFiles
-            flags.Input.Files = defaultTestFiles.RAW
+            flags.Input.Files = defaultTestFiles.RAW_RUN2
             flags.lock()
             TrigConfigSvcCfg( flags )
             L1PrescaleCondAlgCfg( flags )
@@ -391,7 +391,7 @@ if __name__ == "__main__":
             from AthenaConfiguration.AllConfigFlags import initConfigFlags
             flags = initConfigFlags()
             from AthenaConfiguration.TestDefaults import defaultTestFiles
-            flags.Input.Files = defaultTestFiles.RAW
+            flags.Input.Files = defaultTestFiles.RAW_RUN2
             flags.lock()
             TrigConfigSvcCfg( flags )
             L1PrescaleCondAlgCfg( flags )
diff --git a/Trigger/TrigEvent/TrigNavTools/python/NavConverterConfig.py b/Trigger/TrigEvent/TrigNavTools/python/NavConverterConfig.py
index 326df5963103a7d92d9c93fba96ec5dc3a5813de..1f6b8848a9625cefbae356e96289c877e6ba822a 100644
--- a/Trigger/TrigEvent/TrigNavTools/python/NavConverterConfig.py
+++ b/Trigger/TrigEvent/TrigNavTools/python/NavConverterConfig.py
@@ -57,7 +57,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.AllConfigFlags import initConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.lock()
 
     acc = NavConverterCfg(flags)
diff --git a/Trigger/TrigT1/L1Topo/L1TopoByteStream/python/L1TopoByteStreamConfig.py b/Trigger/TrigT1/L1Topo/L1TopoByteStream/python/L1TopoByteStreamConfig.py
index 0c614adbc5341e77df7e385414e4996bb4f68c8d..4768c6e0a528fa2a3d804cfdb9a86d9746f3e8d4 100644
--- a/Trigger/TrigT1/L1Topo/L1TopoByteStream/python/L1TopoByteStreamConfig.py
+++ b/Trigger/TrigT1/L1Topo/L1TopoByteStream/python/L1TopoByteStreamConfig.py
@@ -52,7 +52,7 @@ if __name__ == '__main__':
 
     flags = initConfigFlags()
     flags.Exec.OutputLevel = DEBUG  # noqa: ATL900 - fine for short unit test
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.lock()
 
     acc = MainServicesCfg(flags)
diff --git a/Trigger/TrigT1/TrigT1CaloCondSvc/python/L1CaloCondConfig.py b/Trigger/TrigT1/TrigT1CaloCondSvc/python/L1CaloCondConfig.py
index c919e46c595607fe3402a6bb902afc24e2b9dc48..1e9538dd0965f340af67eb08fdbe85b6aa47c144 100644
--- a/Trigger/TrigT1/TrigT1CaloCondSvc/python/L1CaloCondConfig.py
+++ b/Trigger/TrigT1/TrigT1CaloCondSvc/python/L1CaloCondConfig.py
@@ -65,7 +65,7 @@ if __name__=="__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW 
+    flags.Input.Files = defaultTestFiles.RAW_RUN2 
     flags.Exec.MaxEvents = 1
     flags.IOVDb.GlobalTag = 'CONDBR2-BLKPA-2022-02'
     flags.GeoModel.AtlasVersion="ATLAS-R2-2015-03-01-00"
diff --git a/Trigger/TrigT1/TrigT1MuctpiPhase1/python/TrigMUCTPIConfigFlags.py b/Trigger/TrigT1/TrigT1MuctpiPhase1/python/TrigMUCTPIConfigFlags.py
index bc7b94588a0486f35b78d36b218ee2ca53f1add5..aeb1fa8cb22255f2ba7306e27fc3cb8fb9d9ea87 100644
--- a/Trigger/TrigT1/TrigT1MuctpiPhase1/python/TrigMUCTPIConfigFlags.py
+++ b/Trigger/TrigT1/TrigT1MuctpiPhase1/python/TrigMUCTPIConfigFlags.py
@@ -26,7 +26,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
 
     flags.lock()
     flags.dump("MUCTPI|Trigger")
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
index 844aed0e85ec87a61a16c85f32d056d4ef6b40a6..152f952c17163fafe3f1012625ae52a215974625 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py
@@ -412,7 +412,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     ComponentAccumulator.debugMode = "trackCA trackPublicTool trackEventAlgo trackCondAlgo trackPrivateTool"
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.lock()
     # this configuration is not runable, the test checks if there is no mistake in python scripts above
     # output can be used by experts to check actual configuration (e.g. here we configure to run on RAW and it should be reflected in settings)
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerRecoConfig.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerRecoConfig.py
index e7454facdb1b55dad141b038e36837fa9a68037f..eaf1480caa6f25267d63ca04690078f33c5bad30 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerRecoConfig.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerRecoConfig.py
@@ -365,7 +365,7 @@ if __name__ == '__main__':
     if flags.Trigger.EDMVersion==1:
       flags.Input.Files = defaultTestFiles.RAW_RUN1
     elif flags.Trigger.EDMVersion==2:
-      flags.Input.Files = defaultTestFiles.RAW
+      flags.Input.Files = defaultTestFiles.RAW_RUN2
     elif flags.Trigger.EDMVersion==3:
       flags.Input.Files = defaultTestFiles.RAW_RUN3
       
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/EventBuildingSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/EventBuildingSequences.py
index e7ce773d89ee3e518a00ce62928db24672526570..3406c72abe04088de6f32661d3609a7ee0ca9849 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/EventBuildingSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/EventBuildingSequences.py
@@ -332,7 +332,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     from AthenaConfiguration.AllConfigFlags import initConfigFlags
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.lock()
     failures = 0
     for eb_identifier in EventBuildingInfo.getAllEventBuildingIdentifiers():
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Config/GenerateMenuMT_newJO.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Config/GenerateMenuMT_newJO.py
index 8cf4d5b9a62100c0fd085569dbefee70d1beb913..63bf7a2f3a1c41e91bc14af90aac7c0b9e3a37a0 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Config/GenerateMenuMT_newJO.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Config/GenerateMenuMT_newJO.py
@@ -146,7 +146,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
 
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.Trigger.triggerMenuSetup = "Dev_pp_run3_v1"
     flags.lock()
 
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Egamma/TrigEgammaConfigFlags.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Egamma/TrigEgammaConfigFlags.py
index f9480fac8f1e0dac8fd2b9f8adc77081d90476bd..6e8828214b0d764f30c257eedf680255b39659b4 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Egamma/TrigEgammaConfigFlags.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Egamma/TrigEgammaConfigFlags.py
@@ -29,7 +29,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.AllConfigFlags import initConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
 
     flags.lock()
     flags.dump("Egamma|Trigger")
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/generateTau.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/generateTau.py
index b28143600b9a1adb404cfb40b3f186747088f518..35a685bfc8753992436cf5f1f845996517ca4faa 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/generateTau.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Tau/generateTau.py
@@ -179,7 +179,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.AllConfigFlags import initConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     flags = initConfigFlags()
-    flags.Input.Files = defaultTestFiles.RAW
+    flags.Input.Files = defaultTestFiles.RAW_RUN2
     flags.lock()
     from TriggerMenuMT.HLT.Config.Utility.DictFromChainName import dictFromChainName
     chain = generateChains(flags, dictFromChainName(flags, 'HLT_tau0_perf_ptonly_L1TAU8'))
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/scripts/test_menu_CA.py b/Trigger/TriggerCommon/TriggerMenuMT/scripts/test_menu_CA.py
index 6f292ce132e1e0608dc557295b21d522f3fbfc84..5a04a477649910770de79a9e4a093346884abc53 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/scripts/test_menu_CA.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/scripts/test_menu_CA.py
@@ -27,7 +27,7 @@ flags.Trigger.enabledSignatures = ['Muon', 'Photon','Electron', 'MinBias', 'Heav
 flags.Trigger.generateMenuDiagnostics = True
 
 from AthenaConfiguration.TestDefaults import defaultTestFiles
-flags.Input.Files = defaultTestFiles.RAW
+flags.Input.Files = defaultTestFiles.RAW_RUN2
 flags.Trigger.triggerMenuSetup="Dev_pp_run3_v1"
 
 flags.Trigger.EDMVersion=3