diff --git a/AtlasGeometryCommon/BeamPipeGeoModel/test/BeamPipeGMConfig_test.py b/AtlasGeometryCommon/BeamPipeGeoModel/test/BeamPipeGMConfig_test.py
index cced184f10a04943aea7893ab90d8d370f84040c..a15021edca23b49b989678fbfa6eecaa7e622033 100755
--- a/AtlasGeometryCommon/BeamPipeGeoModel/test/BeamPipeGMConfig_test.py
+++ b/AtlasGeometryCommon/BeamPipeGeoModel/test/BeamPipeGMConfig_test.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """Run tests on BeamPipeGeoModel configuration
 
-Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 """
 if __name__ == "__main__":
     from AthenaCommon.Configurable import Configurable
@@ -9,8 +9,8 @@ if __name__ == "__main__":
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
 
-    ConfigFlags.Input.Files = defaultTestFiles.HITS
-    ConfigFlags.GeoModel.Align.Dynamic    = False
+    ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
+    ConfigFlags.GeoModel.Align.Dynamic = False
     ConfigFlags.lock()
 
     from BeamPipeGeoModel.BeamPipeGMConfig import BeamPipeGeometryCfg
diff --git a/Calorimeter/CaloClusterCorrection/test/config_t.py b/Calorimeter/CaloClusterCorrection/test/config_t.py
index df176c80988c869ba793587b89b0ba23ed8c0ef4..9ffcbccad690ec557e6e1b051cd816786f974f2a 100644
--- a/Calorimeter/CaloClusterCorrection/test/config_t.py
+++ b/Calorimeter/CaloClusterCorrection/test/config_t.py
@@ -218,7 +218,7 @@ def test2 (flags_in):
     flags = flags_in.clone()
     flags.Input.isMC = True
     flags.IOVDb.GlobalTag = 'OFLCOND-RUN12-SDR-31'
-    flags.Input.Files = defaultTestFiles.RDO
+    flags.Input.Files = defaultTestFiles.RDO_RUN2
     flags.lock()
 
     ca = make_CaloSwCorrectionsCfg (flags, version = '@GLOBAL',
diff --git a/Calorimeter/CaloMonitoring/python/CaloBaselineMonAlg.py b/Calorimeter/CaloMonitoring/python/CaloBaselineMonAlg.py
index 4c9ec1ab2a68996cafd546b6e3671351ed507c52..ead2b1800e1352a62ca90a45227f045e0984e485 100644
--- a/Calorimeter/CaloMonitoring/python/CaloBaselineMonAlg.py
+++ b/Calorimeter/CaloMonitoring/python/CaloBaselineMonAlg.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 #
 
 from __future__ import print_function
@@ -205,8 +205,6 @@ if __name__=='__main__':
 
     # Set the Athena configuration flags
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
-    #from AthenaConfiguration.TestDefaults import defaultTestFiles
-    #ConfigFlags.Input.Files = defaultTestFiles.ESD
     ConfigFlags.Input.Files = ['/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayMonitoringRTT/data15_13TeV.00278748.physics_ZeroBias.merge.RAW._lb0384._SFO-ALL._0001.1']
     #ConfigFlags.Input.isMC = True
     ConfigFlags.Output.HISTFileName = 'CaloBaselineMonOutput.root'
diff --git a/Calorimeter/CaloMonitoring/python/LArCellMonAlg.py b/Calorimeter/CaloMonitoring/python/LArCellMonAlg.py
index 8af9ba4205064f206d09b647a015e943cafd1a37..8096f55531dbe620cacb4223b239f7ea083adce9 100644
--- a/Calorimeter/CaloMonitoring/python/LArCellMonAlg.py
+++ b/Calorimeter/CaloMonitoring/python/LArCellMonAlg.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 #
 
 def LArCellMonConfigOld(inputFlags):
@@ -512,8 +512,6 @@ if __name__=='__main__':
 
     # Set the Athena configuration flags
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
-#    from AthenaConfiguration.TestDefaults import defaultTestFiles
-#    ConfigFlags.Input.Files = defaultTestFiles.ESD
     ConfigFlags.Input.Files = ['/eos/atlas/atlastier0/rucio//data18_13TeV/physics_Main/00357750/data18_13TeV.00357750.physics_Main.daq.RAW/data18_13TeV.00357750.physics_Main.daq.RAW._lb0123._SFO-3._0004.data']
     # to test tier0 workflow:
     #ConfigFlags.Input.Files = ['/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayMonitoringRTT/data15_13TeV.00278748.physics_ZeroBias.merge.RAW._lb0384._SFO-ALL._0001.1']
diff --git a/Calorimeter/CaloRec/python/CaloBCIDAvgAlgConfig.py b/Calorimeter/CaloRec/python/CaloBCIDAvgAlgConfig.py
index 4435c6957b86cac9f78deb67163a35bb851fba1c..b1ac95eca5faf8dc3eb01d70295f1f1f115d92c9 100644
--- a/Calorimeter/CaloRec/python/CaloBCIDAvgAlgConfig.py
+++ b/Calorimeter/CaloRec/python/CaloBCIDAvgAlgConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 # File: CaloRec/python/CaloBCIDAvgAlgConfig.py
 # Created: Mar 2019, sss
@@ -30,7 +30,6 @@ if __name__ == "__main__":
     from AthenaCommon.Configurable import Configurable
     Configurable.configurableRun3Behavior=1
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
-    from AthenaConfiguration.TestDefaults import defaultTestFiles
     ConfigFlags.loadAllDynamicFlags()
 
     only = ['CaloBCIDAvgAlg',
@@ -47,7 +46,7 @@ if __name__ == "__main__":
             ]
     print ('--- data')
     flags1 = ConfigFlags.clone()
-    flags1.Input.Files = defaultTestFiles.RAW
+    flags1.Input.Files = []
     flags1.lock()
     acc1 = CaloBCIDAvgAlgCfg (flags1)
     acc1.printConfig(summariseProps=True, onlyComponents=only)
@@ -55,7 +54,7 @@ if __name__ == "__main__":
 
     print ('--- mc')
     flags2 = ConfigFlags.clone()
-    flags2.Input.Files = defaultTestFiles.RAW
+    flags2.Input.Files = []
     flags2.Input.isMC = True
     flags2.lock()
     acc2 = CaloBCIDAvgAlgCfg (flags2)
@@ -64,7 +63,7 @@ if __name__ == "__main__":
 
     print ('--- online')
     flags3 = ConfigFlags.clone()
-    flags3.Input.Files = defaultTestFiles.RAW
+    flags3.Input.Files = []
     flags3.Common.isOnline = True
     flags3.lock()
     acc3 = CaloBCIDAvgAlgCfg (flags3)
diff --git a/Calorimeter/CaloRec/python/CaloCellContainerAliasAlg_test.py b/Calorimeter/CaloRec/python/CaloCellContainerAliasAlg_test.py
index eb13356e675d322abbfa6a7455bef754da3a74db..1f70ff423eaa0fd2c300ba769876a8295f048d8f 100644
--- a/Calorimeter/CaloRec/python/CaloCellContainerAliasAlg_test.py
+++ b/Calorimeter/CaloRec/python/CaloCellContainerAliasAlg_test.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration.
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration.
 #
 # File: CaloRec/python/CaloCellContainerAliasAlg_test.py
 # Author: scott snyder
@@ -58,7 +58,7 @@ Configurable.configurableRun3Behavior=1
 from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 
-ConfigFlags.Input.Files = defaultTestFiles.RDO
+ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
 ConfigFlags.Input.TimeStamp = 1000
 ConfigFlags.Detector.GeometryLAr = True
 ConfigFlags.Detector.GeometryTile = True
diff --git a/Calorimeter/CaloRec/python/CaloCellMakerConfig.py b/Calorimeter/CaloRec/python/CaloCellMakerConfig.py
index b337368d552becabe80fc58ead72a871f91c7aab..a968db449b53b21dc7401deca1b53e2a31b11598 100644
--- a/Calorimeter/CaloRec/python/CaloCellMakerConfig.py
+++ b/Calorimeter/CaloRec/python/CaloCellMakerConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.ComponentFactory import CompFactory
@@ -70,7 +70,7 @@ if __name__=="__main__":
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
 
-    ConfigFlags.Input.Files = defaultTestFiles.RDO
+    ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
     ConfigFlags.lock()
 
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
diff --git a/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlg_test.py b/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlg_test.py
index 3cb430033b127e461574c0be4b76e5cb318c943f..dbd69ad23de0e4e280b2c532afa1b412b8140109 100644
--- a/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlg_test.py
+++ b/Calorimeter/CaloRec/python/CaloThinCellsByClusterAlg_test.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration.
 #
 # File: CaloRec/python/CaloThinCellsByClusterAlg_test.py
 # Author: scott snyder
@@ -144,7 +144,7 @@ Configurable.configurableRun3Behavior=1
 from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 
-ConfigFlags.Input.Files = defaultTestFiles.RDO
+ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
 ConfigFlags.Input.TimeStamp = 1000
 ConfigFlags.Detector.GeometryLAr = True
 ConfigFlags.Detector.GeometryTile = True
diff --git a/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlg_test.py b/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlg_test.py
index cdc0967451c1c3b6af55d32338f521bd1387fbf3..c06be07bfefaccaac3fc6a51618ff364969a9b99 100644
--- a/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlg_test.py
+++ b/Calorimeter/CaloRec/python/CaloThinCellsBySamplingAlg_test.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration.
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration.
 #
 # File: CaloRec/python/CaloThinCellsBySamplingAlg_test.py
 # Author: scott snyder
@@ -79,7 +79,7 @@ Configurable.configurableRun3Behavior=1
 from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 
-ConfigFlags.Input.Files = defaultTestFiles.RDO
+ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
 ConfigFlags.Input.TimeStamp = 1000
 ConfigFlags.Detector.GeometryLAr = True
 ConfigFlags.Detector.GeometryTile = True
diff --git a/Calorimeter/CaloRec/share/ToolConstantsCondAlg_test.ref b/Calorimeter/CaloRec/share/ToolConstantsCondAlg_test.ref
index 9be2c8c58526e636b3302425ebcb2db6e5e9a10d..89796d57f7ad9710e44d992345350c8b929f27c8 100644
--- a/Calorimeter/CaloRec/share/ToolConstantsCondAlg_test.ref
+++ b/Calorimeter/CaloRec/share/ToolConstantsCondAlg_test.ref
@@ -35,7 +35,7 @@ CondInputLoader                                      INFO created CondCont<CondA
 ApplicationMgr                                       INFO Application Manager Started successfully
 AthenaEventLoopMgr                                   INFO   ===>>>  start of run 284500    <<<===
 AthenaEventLoopMgr                                   INFO   ===>>>  start processing event #0, run #284500 0 events processed so far  <<<===
-IOVDbFolder                                          INFO HVS tag OFLCOND-MC16-SDR-17 resolved to LARCellCorrOflDeadOTX-000-00 for folder /LAR/CellCorrOfl/deadOTX
+IOVDbFolder                                          INFO HVS tag OFLCOND-MC16-SDR-RUN2-09 resolved to LARCellCorrOflDeadOTX-000-00 for folder /LAR/CellCorrOfl/deadOTX
 dumper1                                              INFO dumper.energyCalibrationTypes = [0, 0, 0, -1]
 dumper.energyCalibrations = [2, 0.9959, 0.07493, -0.1599, 2, 2, 0.9962, 0.04997, -0.1839, 2, 2, 0.9984, 0.0143, -0.9648, 2]
 dumper.etaCalibrationSizes = [14, 14, 13, 0]
diff --git a/Calorimeter/CaloRec/test/ToolConstantsCondAlg_test.py b/Calorimeter/CaloRec/test/ToolConstantsCondAlg_test.py
index 6b29c835bc85986fdce0ae5a8e3dbc52ebbc6e12..14c5de7584cf4cc38f1b8c0298ba702cb9d29f6d 100755
--- a/Calorimeter/CaloRec/test/ToolConstantsCondAlg_test.py
+++ b/Calorimeter/CaloRec/test/ToolConstantsCondAlg_test.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration.
 #
 # File: CaloRec/python/ToolConstantsCondALg_test.py
 # Author: scott snyder
@@ -11,7 +11,6 @@
 
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.ComponentFactory import CompFactory
-import ROOT
 
 
 def testCfg (configFlags):
@@ -49,7 +48,7 @@ Configurable.configurableRun3Behavior=1
 from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 
-ConfigFlags.Input.Files = defaultTestFiles.RDO
+ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
 ConfigFlags.Input.TimeStamp = 1000
 
 ConfigFlags.lock()
diff --git a/Calorimeter/CaloTools/python/CaloEstimatedGainToolConfig.py b/Calorimeter/CaloTools/python/CaloEstimatedGainToolConfig.py
index 7cf957b74a02728b3f7d8e36ee94e4c34b060f4e..18180d09d4a67d4a38a1963feb9bfca2550ce42f 100644
--- a/Calorimeter/CaloTools/python/CaloEstimatedGainToolConfig.py
+++ b/Calorimeter/CaloTools/python/CaloEstimatedGainToolConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 #
 # File: CaloTools/python/CaloEstimatedGainToolConfig.py
 # Created: Aug 2019, sss
@@ -66,7 +66,7 @@ if __name__ == "__main__":
     ConfigFlags.loadAllDynamicFlags()
 
     flags1 = ConfigFlags.clone()
-    flags1.Input.Files = defaultTestFiles.RDO
+    flags1.Input.Files = defaultTestFiles.RDO_RUN2
     flags1.lock()
     acc1 = CaloEstimatedGainToolCfg (flags1)
     only = ['CaloEstimatedGainTool']
diff --git a/Calorimeter/CaloTools/python/CaloEstimatedGainTool_test.py b/Calorimeter/CaloTools/python/CaloEstimatedGainTool_test.py
index 450684dca51b6bf6cd0d59cbac77e556a86a6be5..f3d0e2943346134e4a046fc6d115dbd4339d4dc9 100644
--- a/Calorimeter/CaloTools/python/CaloEstimatedGainTool_test.py
+++ b/Calorimeter/CaloTools/python/CaloEstimatedGainTool_test.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration.
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration.
 #
 # File: CaloTools/python/CaloEstimatedGainTool_test.py
 # Author: scott snyder
@@ -106,7 +106,7 @@ Configurable.configurableRun3Behavior=1
 from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 
-ConfigFlags.Input.Files = defaultTestFiles.RDO
+ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
 ConfigFlags.Detector.GeometryLAr = True
 ConfigFlags.Detector.GeometryTile = True
 ConfigFlags.needFlagsCategory('Tile')
diff --git a/Calorimeter/CaloUtils/test/ToolWithConstants_test.py b/Calorimeter/CaloUtils/test/ToolWithConstants_test.py
index 5901bb89ef23abafa332c6c25d5bd79210bbcf40..d7ef2839a3ffa99c56abf9af38c36bd6386e22f3 100755
--- a/Calorimeter/CaloUtils/test/ToolWithConstants_test.py
+++ b/Calorimeter/CaloUtils/test/ToolWithConstants_test.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration.
 #
 # File: CaloRec/python/ToolWithConstants_test.py
 # Author: scott snyder
@@ -92,7 +92,7 @@ Configurable.configurableRun3Behavior=1
 from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 
-ConfigFlags.Input.Files = defaultTestFiles.RDO
+ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
 ConfigFlags.Input.TimeStamp = 1000
 
 ConfigFlags.lock()
diff --git a/Control/AthenaConfiguration/python/TestDefaults.py b/Control/AthenaConfiguration/python/TestDefaults.py
index 318d651931129119f9ec40b3916e91543359fb1b..af4b78291ddc60b41be2d366e9c2a0bb33995a4d 100644
--- a/Control/AthenaConfiguration/python/TestDefaults.py
+++ b/Control/AthenaConfiguration/python/TestDefaults.py
@@ -1,28 +1,27 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 # Files for use in configuration unit tests
 
 class defaultTestFiles:
     import os
     d = os.environ.get ("ATLAS_REFERENCE_DATA",
                         "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art")
-    EVNT= [d + "/SimCoreTests/mcatnlojimmy_ttbar_leptonfilter.19.2.5.37.EVNT.pool.root"] #find an official file.
-    HITS= [d + "/Tier0ChainTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3091/HITS.10504490._000425.pool.root.1"]
-    HITS_SPECIAL = [d + "/DigitizationTests/mc16_13TeV.HITS.16965029._000024.pool.root.1"]
-    HITS_DATA_OVERLAY = [d + "/OverlayMonitoringRTT/mc16_13TeV.361107.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zmumu.OverlaySim/HITS.pool.root"]
-    HITS_MINBIAS_HIGH = [
-        d + "/Tier0ChainTests/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.merge.HITS.e4981_s3087_s3089/HITS.10501933._000005.pool.root.1",
-        d + "/Tier0ChainTests/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.merge.HITS.e4981_s3087_s3089/HITS.10501933._000013.pool.root.1",
-        d + "/Tier0ChainTests/mc16_13TeV.361239.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_high.merge.HITS.e4981_s3087_s3089/HITS.10501933._000018.pool.root.1",
+    EVNT = [f"{d}/SimCoreTests/mcatnlojimmy_ttbar_leptonfilter.19.2.5.37.EVNT.pool.root"] #find an official file.
+    HITS_RUN2 = [f"{d}/Tier0ChainTests/mc16_13TeV.410470.PhPy8EG_A14_ttbar_hdamp258p75_nonallhad.simul.HITS.e6337_s3681/HITS.25836812._004813.pool.root.1"]
+    HITS_RUN2_MINBIAS_HIGH = [
+        f"{d}/Tier0ChainTests/mc16_13TeV.800831.Py8EG_minbias_inelastic_highjetphotonlepton.simul.HITS_FILT.e8341_s3687_s3704/HITS_FILT.26106512._000149.pool.root.1",
+        f"{d}/Tier0ChainTests/mc16_13TeV.800831.Py8EG_minbias_inelastic_highjetphotonlepton.simul.HITS_FILT.e8341_s3687_s3704/HITS_FILT.26106512._000581.pool.root.1",
+        f"{d}/Tier0ChainTests/mc16_13TeV.800831.Py8EG_minbias_inelastic_highjetphotonlepton.simul.HITS_FILT.e8341_s3687_s3704/HITS_FILT.26106512._000717.pool.root.1",
     ]
-    HITS_MINBIAS_LOW = [
-        d + "/Tier0ChainTests/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.merge.HITS.e4981_s3087_s3089/HITS.10501925._000003.pool.root.1",
-        d + "/Tier0ChainTests/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.merge.HITS.e4981_s3087_s3089/HITS.10501925._000024.pool.root.1",
-        d + "/Tier0ChainTests/mc16_13TeV.361238.Pythia8EvtGen_A3NNPDF23LO_minbias_inelastic_low.merge.HITS.e4981_s3087_s3089/HITS.10501925._000044.pool.root.1",
+    HITS_RUN2_MINBIAS_LOW = [
+        f"{d}/Tier0ChainTests/mc16_13TeV.900311.Epos_minbias_inelastic_lowjetphoton.simul.HITS_FILT.e8341_s3687_s3704/HITS_FILT.26106626._000068.pool.root.1",
+        f"{d}/Tier0ChainTests/mc16_13TeV.900311.Epos_minbias_inelastic_lowjetphoton.simul.HITS_FILT.e8341_s3687_s3704/HITS_FILT.26106626._000480.pool.root.1",
+        f"{d}/Tier0ChainTests/mc16_13TeV.900311.Epos_minbias_inelastic_lowjetphoton.simul.HITS_FILT.e8341_s3687_s3704/HITS_FILT.26106626._000574.pool.root.1",
     ]
-    RAW = [d + "/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"]
-    RAW_BKG = [d + "/OverlayMonitoringRTT/mc15_valid.00200010.overlay_streamsAll_2016_pp_1.skim.DRAW.r8381/DRAW.09331084._000146.pool.root.1"]
-    RDO = [d + "/Tier0ChainTests/q221/21.0/v1/myRDO.pool.root"]
-    RDO_BKG = [d + "/OverlayMonitoringRTT/PileupPremixing/22.0/v4/RDO.merged-pileup-MT.100events.pool.root"]
-    ESD = [d + "/RecExRecoTest/mc16_13TeV.361022.Pythia8EvtGen_A14NNPDF23LO_jetjet_JZ2W.recon.ESD.e3668_s3170_r10572_homeMade.pool.root"]
-    AOD = [d + "/CommonInputs/data16_13TeV.00311321.physics_Main.recon.AOD.r9264/AOD.11038520._000001.pool.root.1"]
-    AOD_MC = [d + "/CommonInputs/mc16_13TeV.410501.PowhegPythia8EvtGen_A14_ttbar_hdamp258p75_nonallhad.merge.AOD.e5458_s3126_r9364_r9315/AOD.11182705._000001.pool.root.1"]
+    HITS_DATA_OVERLAY = [f"{d}/OverlayMonitoringRTT/mc16_13TeV.361107.PowhegPythia8EvtGen_AZNLOCTEQ6L1_Zmumu.OverlaySim/HITS.pool.root"]
+    RAW = [f"{d}/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"]
+    RAW_BKG = [f"{d}/OverlayMonitoringRTT/mc15_valid.00200010.overlay_streamsAll_2016_pp_1.skim.DRAW.r8381/DRAW.09331084._000146.pool.root.1"]
+    RDO_RUN2 = [f"{d}/WorkflowReferences/master/q443/v1/myRDO.pool.root"]
+    RDO_BKG_RUN2 = [f"{d}/OverlayTests/PresampledPileUp/22.0/Run2/large/mc20_13TeV.900149.PG_single_nu_Pt50.digit.RDO.e8307_s3482_s3136_d1715/RDO.26811908._031801.pool.root.1"]
+    ESD = [f"{d}/RecExRecoTest/mc16_13TeV.361022.Pythia8EvtGen_A14NNPDF23LO_jetjet_JZ2W.recon.ESD.e3668_s3170_r10572_homeMade.pool.root"]
+    AOD = [f"{d}/CommonInputs/data16_13TeV.00311321.physics_Main.recon.AOD.r9264/AOD.11038520._000001.pool.root.1"]
+    AOD_MC = [f"{d}/CommonInputs/mc16_13TeV.410501.PowhegPythia8EvtGen_A14_ttbar_hdamp258p75_nonallhad.merge.AOD.e5458_s3126_r9364_r9315/AOD.11182705._000001.pool.root.1"]
diff --git a/Control/AthenaConfiguration/test/testAllConfigFlags_HITS.py b/Control/AthenaConfiguration/test/testAllConfigFlags_HITS.py
index cbccb4d85a4a7dbe08e1b3b24baf8567ce286f76..847283188d6f0bff54de1529ded7aefa5f5cd701 100755
--- a/Control/AthenaConfiguration/test/testAllConfigFlags_HITS.py
+++ b/Control/AthenaConfiguration/test/testAllConfigFlags_HITS.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.TestDefaults import defaultTestFiles
-ConfigFlags.Input.Files = defaultTestFiles.HITS
+ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
 ConfigFlags._loadDynaFlags("Detector")
 
 # Don't fail just because G4AtlasApps isn't present in this build.
diff --git a/Control/AthenaConfiguration/test/testAllConfigFlags_RDO.py b/Control/AthenaConfiguration/test/testAllConfigFlags_RDO.py
index d8b8614d0bd8ffc72b893f156c9e8e45937ba5f1..20a6c779d29ba299a02370528c340a619b085c63 100755
--- a/Control/AthenaConfiguration/test/testAllConfigFlags_RDO.py
+++ b/Control/AthenaConfiguration/test/testAllConfigFlags_RDO.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.TestDefaults import defaultTestFiles
-ConfigFlags.Input.Files = defaultTestFiles.RDO
+ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
 ConfigFlags._loadDynaFlags("Detector")
 
 # Don't fail just because G4AtlasApps isn't present in this build.
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelConfig.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelConfig.py
index e192f375ff30133013086e56387987290a6caa91..65159ffe20190626a1d6c1aec6d6d9d8ccaf1eb1 100644
--- a/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelConfig.py
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/GeoModelConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.ComponentFactory import CompFactory
@@ -42,9 +42,8 @@ def GeoModelCfg(configFlags):
 
 if __name__ == "__main__":
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
-    from AthenaConfiguration.TestDefaults import defaultTestFiles
 
-    ConfigFlags.Input.Files = defaultTestFiles.RAW
+    ConfigFlags.Input.Files = []
     Configurable.configurableRun3Behavior=1
 
     acc = GeoModelCfg( ConfigFlags )
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/test/AtlasGeometryConfig_HITS_test.py b/DetectorDescription/GeoModel/AtlasGeoModel/test/AtlasGeometryConfig_HITS_test.py
index b1f721b81d458e9a7fb1ce1dbeb5579806db6349..227889039b341475d3728a696a77f8a3a6f5cb78 100755
--- a/DetectorDescription/GeoModel/AtlasGeoModel/test/AtlasGeometryConfig_HITS_test.py
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/test/AtlasGeometryConfig_HITS_test.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """Run a test on Atlas Geometry configuration using a HITS file as input
 
-Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 """
 if __name__ == "__main__":
     from AthenaCommon.Logging import log
@@ -16,9 +16,9 @@ if __name__ == "__main__":
     Configurable.configurableRun3Behavior = True
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     # Provide MC input
-    ConfigFlags.Input.Files = defaultTestFiles.HITS
+    ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
     ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
-    ConfigFlags.GeoModel.Align.Dynamic    = False
+    ConfigFlags.GeoModel.Align.Dynamic = False
     ConfigFlags.lock()
 
     # Construct ComponentAccumulator
diff --git a/Event/DumpEventDataToJSON/python/DumpEventDataToJSONConfig.py b/Event/DumpEventDataToJSON/python/DumpEventDataToJSONConfig.py
index 31d166d49b6c65ccaacc6806acfbdbcb93f7e107..abdaf94c3460646e668d4a2e68f92e3babbced5e 100644
--- a/Event/DumpEventDataToJSON/python/DumpEventDataToJSONConfig.py
+++ b/Event/DumpEventDataToJSON/python/DumpEventDataToJSONConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.ComponentFactory import CompFactory
@@ -45,7 +45,6 @@ if __name__ == "__main__":
     from AthenaCommon.Logging import log
     # from AthenaCommon.Constants import DEBUG
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
-    # from AthenaConfiguration.TestDefaults import defaultTestFiles
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
     from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
 
diff --git a/Event/EventInfoMgt/python/TagInfoMgrConfig.py b/Event/EventInfoMgt/python/TagInfoMgrConfig.py
index 1b080e6023898b7ff48d7fcbd8f0d708a1841d85..fab1946c0605003900b25f8afad81d05e9aaef6d 100644
--- a/Event/EventInfoMgt/python/TagInfoMgrConfig.py
+++ b/Event/EventInfoMgt/python/TagInfoMgrConfig.py
@@ -31,7 +31,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
 
-    ConfigFlags.Input.Files = defaultTestFiles.RDO
+    ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
     ConfigFlags.lock()
 
     acc, tagInfoMgr = TagInfoMgrCfg( ConfigFlags, {"SomeKey": "SomeValue"} )
diff --git a/Event/xAOD/xAODEventInfoCnv/test/EventInfoCnv_test.py b/Event/xAOD/xAODEventInfoCnv/test/EventInfoCnv_test.py
index 20fc24eca90c6f11ccccf20db22e1c68d994f08b..46077478730d975eed8d628383c3aa405948384e 100755
--- a/Event/xAOD/xAODEventInfoCnv/test/EventInfoCnv_test.py
+++ b/Event/xAOD/xAODEventInfoCnv/test/EventInfoCnv_test.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """Run tests for old EventInfo to xAOD::EventInfo conversion
 
-Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 """
 import sys
 
@@ -34,7 +34,7 @@ parser.add_argument("-d", "--debug", default='', type=str,
 args = parser.parse_args()
 
 # Configure
-ConfigFlags.Input.Files = defaultTestFiles.HITS
+ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
 ConfigFlags.Output.HITSFileName = "myHITS.pool.root"
 
diff --git a/Event/xAOD/xAODEventInfoCnv/test/EventInfoOverlayLegacy_test.py b/Event/xAOD/xAODEventInfoCnv/test/EventInfoOverlayLegacy_test.py
index 39c4a079f96226e28555301531c4592e9801b9cd..0cb452d4ecd46d56a954f2c27fdb636ef3e65af1 100755
--- a/Event/xAOD/xAODEventInfoCnv/test/EventInfoOverlayLegacy_test.py
+++ b/Event/xAOD/xAODEventInfoCnv/test/EventInfoOverlayLegacy_test.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """Run tests for EventInfo overlay with legacy inputs
 
-Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 """
 import sys
 
@@ -22,8 +22,9 @@ parser = CommonTestArgumentParser("EventInfoOverlayLegacy_test.py")
 args = parser.parse_args()
 
 # Configure
-ConfigFlags.Input.Files = defaultTestFiles.RDO_BKG
-ConfigFlags.Input.SecondaryFiles = defaultTestFiles.HITS
+ConfigFlags.Input.Files = defaultTestFiles.RDO_BKG_RUN2
+# use old HITS on purpose
+ConfigFlags.Input.SecondaryFiles = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3091/HITS.10504490._000425.pool.root.1"]
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
 ConfigFlags.Overlay.DataOverlay = False
 ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
diff --git a/Event/xAOD/xAODEventInfoCnv/test/EventInfoOverlay_test.py b/Event/xAOD/xAODEventInfoCnv/test/EventInfoOverlay_test.py
index 2096a6dcbe4c3c12c0c51730f905fc5b1c0b3ae3..3f441a86b954e8725c8b35e3f803f8b17a504d67 100755
--- a/Event/xAOD/xAODEventInfoCnv/test/EventInfoOverlay_test.py
+++ b/Event/xAOD/xAODEventInfoCnv/test/EventInfoOverlay_test.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """Run tests for EventInfo overlay
 
-Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 """
 import sys
 
@@ -22,7 +22,7 @@ parser = CommonTestArgumentParser("EventInfoOverlay_test.py")
 args = parser.parse_args()
 
 # Configure
-ConfigFlags.Input.Files = defaultTestFiles.RDO_BKG
+ConfigFlags.Input.Files = defaultTestFiles.RDO_BKG_RUN2
 ConfigFlags.Input.SecondaryFiles = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayMonitoringRTT/TestCase_xAODEventInfo.root"]
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
 ConfigFlags.Overlay.DataOverlay = False
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsTools/test/SCT_ConditionsConfig_test.py b/InnerDetector/InDetConditions/SCT_ConditionsTools/test/SCT_ConditionsConfig_test.py
index f4a5a71ad10fd0e1d146e1e2df0bfe00f223bd8a..0f6c70f457cf78838c58eda18cdbd53be2003cd3 100755
--- a/InnerDetector/InDetConditions/SCT_ConditionsTools/test/SCT_ConditionsConfig_test.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsTools/test/SCT_ConditionsConfig_test.py
@@ -1,10 +1,9 @@
 #!/usr/bin/env python
 """Run tests on SCT_ConditionsTools/python/*Config.py scripts
 
-Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 """
 from AthenaConfiguration.AllConfigFlags import ConfigFlags
-from AthenaConfiguration.TestDefaults import defaultTestFiles
 from AthenaCommon.Logging import log
 from AthenaCommon.Constants import DEBUG
 from AthenaCommon.Configurable import Configurable
@@ -13,7 +12,7 @@ from SCT_ConditionsTools.SCT_ConditionsToolsConfig import SCT_DCSConditionsCfg,
 # test setup
 log.setLevel(DEBUG)
 Configurable.configurableRun3Behavior = True
-ConfigFlags.Input.Files = defaultTestFiles.HITS
+ConfigFlags.Input.Files = []
 ConfigFlags.lock()
 # call tests
 dcs_acc = SCT_DCSConditionsCfg(ConfigFlags, name="DCSTest")
diff --git a/InnerDetector/InDetConditions/SiLorentzAngleTool/test/SiLorentzAngleConfig_test.py b/InnerDetector/InDetConditions/SiLorentzAngleTool/test/SiLorentzAngleConfig_test.py
index 4b462d1147f2c9bca38bc309a134eead6d7d6524..f298c9bab3391d176983f067604a6e762242109b 100755
--- a/InnerDetector/InDetConditions/SiLorentzAngleTool/test/SiLorentzAngleConfig_test.py
+++ b/InnerDetector/InDetConditions/SiLorentzAngleTool/test/SiLorentzAngleConfig_test.py
@@ -1,9 +1,8 @@
 #!/usr/bin/env python
 """Run tests on *LorentzAngleConfig.py
 
-Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 """
-from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 from AthenaCommon.Logging import log
@@ -15,7 +14,7 @@ from SiLorentzAngleTool.PixelLorentzAngleConfig import PixelLorentzAngleCfg
 # test setup
 log.setLevel(DEBUG)
 Configurable.configurableRun3Behavior = True
-ConfigFlags.Input.Files = defaultTestFiles.HITS
+ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
 # using __init__ to reset, preventing errors on deletion
 # case online
 ConfigFlags.Common.isOnline = True
diff --git a/InnerDetector/InDetConditions/SiPropertiesTool/test/SiPropertiesConfig_test.py b/InnerDetector/InDetConditions/SiPropertiesTool/test/SiPropertiesConfig_test.py
index e6e58b02d35c0e662ac4bcd32460f8e6b2516c6a..940b4d025b666f5d50418b3ccaacaa0097ffe226 100755
--- a/InnerDetector/InDetConditions/SiPropertiesTool/test/SiPropertiesConfig_test.py
+++ b/InnerDetector/InDetConditions/SiPropertiesTool/test/SiPropertiesConfig_test.py
@@ -1,9 +1,8 @@
 #!/usr/bin/env python
 """Run tests on SCT_SiPropertiesConfig.py
 
-Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 """
-from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 from AthenaCommon.Logging import log
@@ -15,7 +14,7 @@ from SiPropertiesTool.PixelSiPropertiesConfig import PixelSiPropertiesCfg
 # test setup
 log.setLevel(DEBUG)
 Configurable.configurableRun3Behavior = True
-ConfigFlags.Input.Files = defaultTestFiles.HITS
+ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
 ConfigFlags.lock()
 # test
 sct_acc = SCT_SiPropertiesCfg(ConfigFlags, name="SCT_SiPropertiesConfigTest")
diff --git a/InnerDetector/InDetConfig/python/BackTrackingConfig.py b/InnerDetector/InDetConfig/python/BackTrackingConfig.py
index 8ac05a06d7dcac677851cc084a9d91aab945f44c..2734bf5b7e2d2649ef7440df20cc2b3c356787a1 100644
--- a/InnerDetector/InDetConfig/python/BackTrackingConfig.py
+++ b/InnerDetector/InDetConfig/python/BackTrackingConfig.py
@@ -339,7 +339,7 @@ if __name__ == "__main__":
 
     from AthenaConfiguration.AllConfigFlags import ConfigFlags as flags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
-    flags.Input.Files=defaultTestFiles.RDO
+    flags.Input.Files=defaultTestFiles.RDO_RUN2
 
     # disable calo for this test
     flags.Detector.EnableCalo = False
diff --git a/InnerDetector/InDetConfig/python/ClusterizationConfig.py b/InnerDetector/InDetConfig/python/ClusterizationConfig.py
index eb94e3e1d4dfb0861c83c6633ee77592791bad66..c02b9ca2cd9f8cabf2a397f9d34f9928802df152 100644
--- a/InnerDetector/InDetConfig/python/ClusterizationConfig.py
+++ b/InnerDetector/InDetConfig/python/ClusterizationConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 
 from InDetConfig.TrackRecoConfig 	import BCM_ZeroSuppressionCfg, PixelClusterizationCfg, \
@@ -64,7 +64,7 @@ if __name__ == "__main__":
     ConfigFlags.InDet.Tracking.doPixelClusterSplitting = True
 
     from AthenaConfiguration.TestDefaults import defaultTestFiles
-    ConfigFlags.Input.Files = defaultTestFiles.RDO
+    ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
     ConfigFlags.lock()
     ConfigFlags.dump()
 
diff --git a/InnerDetector/InDetConfig/python/ITkSiliconPreProcessing.py b/InnerDetector/InDetConfig/python/ITkSiliconPreProcessing.py
index 740bf4148545de970e9dc72ec325c8db726f04d4..a21849d58ac095921e4a9f60745c1f06c2761bb0 100644
--- a/InnerDetector/InDetConfig/python/ITkSiliconPreProcessing.py
+++ b/InnerDetector/InDetConfig/python/ITkSiliconPreProcessing.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.ComponentFactory import CompFactory
@@ -231,7 +231,7 @@ if __name__ == "__main__":
 
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
-    ConfigFlags.Input.Files=defaultTestFiles.RDO
+    ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
 
     ConfigFlags.Detector.GeometryITkPixel   = True
     ConfigFlags.Detector.GeometryITkStrip   = True
diff --git a/InnerDetector/InDetConfig/python/ITkTrackRecoConfig.py b/InnerDetector/InDetConfig/python/ITkTrackRecoConfig.py
index 666081541d4d204fd50a91369f24eced629f3646..ad92f0d56812316159a4154a0f978f92f11664cf 100644
--- a/InnerDetector/InDetConfig/python/ITkTrackRecoConfig.py
+++ b/InnerDetector/InDetConfig/python/ITkTrackRecoConfig.py
@@ -314,7 +314,7 @@ if __name__ == "__main__":
     ConfigFlags.Detector.EnableCalo = False
 
     from AthenaConfiguration.TestDefaults import defaultTestFiles
-    ConfigFlags.Input.Files = defaultTestFiles.RDO
+    ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
     ConfigFlags.lock()
 
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
diff --git a/InnerDetector/InDetConfig/python/ITkTrackTruthConfig.py b/InnerDetector/InDetConfig/python/ITkTrackTruthConfig.py
index e1a69c1221639ee4d1b11689f30677d51d630000..d4496ed3738d7f869f4cb55626e96d1b5fecb4dc 100644
--- a/InnerDetector/InDetConfig/python/ITkTrackTruthConfig.py
+++ b/InnerDetector/InDetConfig/python/ITkTrackTruthConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.ComponentFactory     import CompFactory
 # -------------------------------------------------------------------------
@@ -74,7 +74,7 @@ if __name__ == "__main__":
     ConfigFlags.Detector.GeometryITkStrip = True
 
     from AthenaConfiguration.TestDefaults import defaultTestFiles
-    ConfigFlags.Input.Files = defaultTestFiles.RDO
+    ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
     ConfigFlags.lock()
     ConfigFlags.dump()
 
diff --git a/InnerDetector/InDetConfig/python/InDetGeometryConfig.py b/InnerDetector/InDetConfig/python/InDetGeometryConfig.py
index 32943d0ab4751880db27c1679767a0d90ac02335..b605f6db47ecc6592d9a82c6f175d54db58957b2 100644
--- a/InnerDetector/InDetConfig/python/InDetGeometryConfig.py
+++ b/InnerDetector/InDetConfig/python/InDetGeometryConfig.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 #
 
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
@@ -51,14 +51,13 @@ if __name__ == "__main__":
   Configurable.configurableRun3Behavior = True
   from AthenaConfiguration.TestDefaults import defaultTestFiles
   # Provide MC input
-  ConfigFlags.Input.Files = defaultTestFiles.HITS
+  ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
   ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
-  ConfigFlags.GeoModel.Align.Dynamic    = False
+  ConfigFlags.GeoModel.Align.Dynamic = False
   # Provide data input
-  ##from AthenaConfiguration.TestDefaults import defaultTestFiles
-  ##ConfigFlags.Input.Files = defaultTestFiles.AOD
-  ##ConfigFlags.GeoModel.Align.Dynamic    = True
-  #
+  # from AthenaConfiguration.TestDefaults import defaultTestFiles
+  # ConfigFlags.Input.Files = defaultTestFiles.AOD
+  # ConfigFlags.GeoModel.Align.Dynamic = True
   ConfigFlags.lock()
   # Construct ComponentAccumulator
   acc = MainServicesCfg(ConfigFlags)
diff --git a/InnerDetector/InDetConfig/python/SiliconPreProcessing.py b/InnerDetector/InDetConfig/python/SiliconPreProcessing.py
index a14f880143789f7618daf4a9161595260a2922b5..9f359d8e5438f7a47c537d07d5924959389ae9a1 100644
--- a/InnerDetector/InDetConfig/python/SiliconPreProcessing.py
+++ b/InnerDetector/InDetConfig/python/SiliconPreProcessing.py
@@ -231,7 +231,7 @@ if __name__ == "__main__":
 
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
-    ConfigFlags.Input.Files=defaultTestFiles.RDO
+    ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
 
     ConfigFlags.InDet.Tracking.doPixelClusterSplitting = True
 
diff --git a/InnerDetector/InDetConfig/python/TRTExtensionConfig.py b/InnerDetector/InDetConfig/python/TRTExtensionConfig.py
index 212ca304add34390f266dd651a3751b3ff36e6a7..1a64f3eab3cfef7eefec5e8eb343d4ad2b87bfc6 100644
--- a/InnerDetector/InDetConfig/python/TRTExtensionConfig.py
+++ b/InnerDetector/InDetConfig/python/TRTExtensionConfig.py
@@ -163,7 +163,7 @@ if __name__ == "__main__":
     ConfigFlags.InDet.Tracking.holeSearchInGX2Fit = True
 
     from AthenaConfiguration.TestDefaults import defaultTestFiles
-    ConfigFlags.Input.Files = defaultTestFiles.RDO
+    ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
     ConfigFlags.lock()
     ConfigFlags.dump()
 
diff --git a/InnerDetector/InDetConfig/python/TRTPhaseConfig.py b/InnerDetector/InDetConfig/python/TRTPhaseConfig.py
index 80f3fe0f09188e9edab6921ed6b191acc87d3738..7bbeab01ce8562a0db1f1d41e63a436f917c6e5f 100644
--- a/InnerDetector/InDetConfig/python/TRTPhaseConfig.py
+++ b/InnerDetector/InDetConfig/python/TRTPhaseConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.ComponentFactory     import CompFactory
 import InDetConfig.TrackingCommonConfig         as   TC
@@ -145,7 +145,7 @@ if __name__ == "__main__":
     # TODO: TRT only?
 
     from AthenaConfiguration.TestDefaults import defaultTestFiles
-    ConfigFlags.Input.Files = defaultTestFiles.RDO
+    ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
     ConfigFlags.lock()
     ConfigFlags.dump()
 
diff --git a/InnerDetector/InDetConfig/python/TRTPreProcessing.py b/InnerDetector/InDetConfig/python/TRTPreProcessing.py
index 9de5b5c2b37719b5603ca9bf4d55e81838bdd449..a8f872baae050b6047a8762c96ba9e7783372725 100644
--- a/InnerDetector/InDetConfig/python/TRTPreProcessing.py
+++ b/InnerDetector/InDetConfig/python/TRTPreProcessing.py
@@ -280,7 +280,7 @@ if __name__ == "__main__":
 
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
-    ConfigFlags.Input.Files=defaultTestFiles.RDO
+    ConfigFlags.Input.Files=defaultTestFiles.RDO_RUN2
 
     # TODO: TRT only?
 
diff --git a/InnerDetector/InDetConfig/python/TRTSegmentFindingConfig.py b/InnerDetector/InDetConfig/python/TRTSegmentFindingConfig.py
index 25fddb225c071b24252fad1c5a8e3fe084b7cc4a..db23a977a49a8f430b8d217c079eac293530f1ab 100644
--- a/InnerDetector/InDetConfig/python/TRTSegmentFindingConfig.py
+++ b/InnerDetector/InDetConfig/python/TRTSegmentFindingConfig.py
@@ -206,8 +206,7 @@ if __name__ == "__main__":
 
     from AthenaConfiguration.AllConfigFlags import ConfigFlags as flags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
-    flags.Input.Files=defaultTestFiles.RDO
-
+    flags.Input.Files=defaultTestFiles.RDO_RUN2
 
     numThreads=1
     flags.Concurrency.NumThreads=numThreads
diff --git a/InnerDetector/InDetConfig/python/TRTStandaloneConfig.py b/InnerDetector/InDetConfig/python/TRTStandaloneConfig.py
index 9838a9233820687c12ee1b631efe8a45c41ad7f6..60adb120378ffd33d30665cfdd8431e9d79e03f9 100644
--- a/InnerDetector/InDetConfig/python/TRTStandaloneConfig.py
+++ b/InnerDetector/InDetConfig/python/TRTStandaloneConfig.py
@@ -194,7 +194,7 @@ if __name__ == "__main__":
 
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
-    ConfigFlags.Input.Files=defaultTestFiles.RDO
+    ConfigFlags.Input.Files=defaultTestFiles.RDO_RUN2
 
     # TODO: TRT only?
 
diff --git a/InnerDetector/InDetConfig/python/TrackRecoConfig.py b/InnerDetector/InDetConfig/python/TrackRecoConfig.py
index 963fc15b62d777dcc9c24ae161151568b6966b56..3f75e0fc39765c94a6d4663e3084efeac97fe9dd 100644
--- a/InnerDetector/InDetConfig/python/TrackRecoConfig.py
+++ b/InnerDetector/InDetConfig/python/TrackRecoConfig.py
@@ -534,7 +534,7 @@ if __name__ == "__main__":
     ConfigFlags.Detector.EnableCalo = False
 
     from AthenaConfiguration.TestDefaults import defaultTestFiles
-    ConfigFlags.Input.Files = defaultTestFiles.RDO
+    ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
     ConfigFlags.lock()
 
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
diff --git a/InnerDetector/InDetConfig/python/TrackTruthConfig.py b/InnerDetector/InDetConfig/python/TrackTruthConfig.py
index f4650b30e4be5e42edfff30098ead96366f86d89..68b0981c30c1738ea979f40af7bf57d7f6d50006 100644
--- a/InnerDetector/InDetConfig/python/TrackTruthConfig.py
+++ b/InnerDetector/InDetConfig/python/TrackTruthConfig.py
@@ -81,7 +81,7 @@ if __name__ == "__main__":
     ConfigFlags.InDet.Tracking.doPixelClusterSplitting = True
 
     from AthenaConfiguration.TestDefaults import defaultTestFiles
-    ConfigFlags.Input.Files = defaultTestFiles.RDO
+    ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
     ConfigFlags.lock()
     ConfigFlags.dump()
 
diff --git a/InnerDetector/InDetConfig/python/VertexFindingConfig.py b/InnerDetector/InDetConfig/python/VertexFindingConfig.py
index aa7e8be6658f8b18babef1354ad0e8a106f206e9..58e660f5e5be46b8dd5ed821c1ca25075fe23e3d 100644
--- a/InnerDetector/InDetConfig/python/VertexFindingConfig.py
+++ b/InnerDetector/InDetConfig/python/VertexFindingConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.ComponentFactory import CompFactory
 
@@ -273,7 +273,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.ComponentAccumulator import printProperties
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
 
-    flags.Input.Files = defaultTestFiles.RDO
+    flags.Input.Files = defaultTestFiles.RDO_RUN2
     import sys
     if 'ActsGaussAdaptiveMultiFinding' in sys.argv:
         flags.InDet.PriVertex.setup = "ActsGaussAdaptiveMultiFinding"
diff --git a/InnerDetector/InDetDetDescr/PixelGeoModel/test/PixelGMConfig_test.py b/InnerDetector/InDetDetDescr/PixelGeoModel/test/PixelGMConfig_test.py
index 9b927f0386429723f2fa834adcbdfb4dbafa8d81..fbc63e0edc2b2991aadbc6ca92c0235839646d86 100755
--- a/InnerDetector/InDetDetDescr/PixelGeoModel/test/PixelGMConfig_test.py
+++ b/InnerDetector/InDetDetDescr/PixelGeoModel/test/PixelGMConfig_test.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """Run tests on PixelGeoModel configuration
 
-Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 """
 if __name__ == "__main__":
     from AthenaCommon.Configurable import Configurable
@@ -9,9 +9,9 @@ if __name__ == "__main__":
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
 
-    ConfigFlags.Input.Files = defaultTestFiles.HITS
+    ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
     ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
-    ConfigFlags.GeoModel.Align.Dynamic    = False
+    ConfigFlags.GeoModel.Align.Dynamic = False
     ConfigFlags.lock()
 
     if ConfigFlags.Common.Project == "AthSimulation":
diff --git a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/test/PixelReadoutGeometryConfig_test.py b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/test/PixelReadoutGeometryConfig_test.py
index 6eabff9fba6ce829f3684e2208615271d83358bb..0f0b7b1d39f38a4d216cddec19190cfb12c4990f 100755
--- a/InnerDetector/InDetDetDescr/PixelReadoutGeometry/test/PixelReadoutGeometryConfig_test.py
+++ b/InnerDetector/InDetDetDescr/PixelReadoutGeometry/test/PixelReadoutGeometryConfig_test.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 from AthenaConfiguration.AllConfigFlags import ConfigFlags
-from AthenaConfiguration.TestDefaults import defaultTestFiles
 from AthenaCommon.Logging import log
 from AthenaCommon.Constants import DEBUG
 from AthenaCommon.Configurable import Configurable
@@ -10,7 +9,7 @@ from PixelReadoutGeometry.PixelReadoutGeometryConfig import PixelReadoutManagerC
 # test setup
 log.setLevel(DEBUG)
 Configurable.configurableRun3Behavior = True
-ConfigFlags.Input.Files = defaultTestFiles.HITS
+ConfigFlags.Input.Files = []
 # test
 PixelReadoutManagerAcc = PixelReadoutManagerCfg(ConfigFlags, name="PixelReadoutManagerTest")
 # prevent raise on __del__
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/test/SCT_GMConfig_test.py b/InnerDetector/InDetDetDescr/SCT_GeoModel/test/SCT_GMConfig_test.py
index d2dab2fc1a5ba929d2cda92abe21d1b7258df8eb..57ca928f51a9682ce3aa2f54e4854df027b93d0b 100755
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/test/SCT_GMConfig_test.py
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/test/SCT_GMConfig_test.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """Run tests on SCT_GeoModel configuration
 
-Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 """
 if __name__ == "__main__":
     from AthenaCommon.Configurable import Configurable
@@ -9,9 +9,9 @@ if __name__ == "__main__":
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
 
-    ConfigFlags.Input.Files = defaultTestFiles.HITS
+    ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
     ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
-    ConfigFlags.GeoModel.Align.Dynamic    = False
+    ConfigFlags.GeoModel.Align.Dynamic = False
     ConfigFlags.lock()
 
     if ConfigFlags.Common.Project == "AthSimulation":
diff --git a/InnerDetector/InDetDetDescr/TRT_GeoModel/test/TRT_GMConfig_test.py b/InnerDetector/InDetDetDescr/TRT_GeoModel/test/TRT_GMConfig_test.py
index 606ba3467cdb96a70663115c82ca102e37b38d44..6a55c9c79731764b02f6c5f126baeb7d513d8d97 100755
--- a/InnerDetector/InDetDetDescr/TRT_GeoModel/test/TRT_GMConfig_test.py
+++ b/InnerDetector/InDetDetDescr/TRT_GeoModel/test/TRT_GMConfig_test.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """Run tests on TRT_GeoModel configuration
 
-Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 """
 if __name__ == "__main__":
     from AthenaCommon.Configurable import Configurable
@@ -9,7 +9,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
 
-    ConfigFlags.Input.Files = defaultTestFiles.HITS
+    ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
     ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
     ConfigFlags.GeoModel.Align.Dynamic = False
     ConfigFlags.lock()
diff --git a/InnerDetector/InDetDigitization/BCM_Digitization/test/BCM_DigitizationConfigNew_test.py b/InnerDetector/InDetDigitization/BCM_Digitization/test/BCM_DigitizationConfigNew_test.py
index 21d9299790757cab2646b218670a72678b692af1..3adfe72789de6889c6e1afc8240aa6382e50b7a4 100755
--- a/InnerDetector/InDetDigitization/BCM_Digitization/test/BCM_DigitizationConfigNew_test.py
+++ b/InnerDetector/InDetDigitization/BCM_Digitization/test/BCM_DigitizationConfigNew_test.py
@@ -1,10 +1,9 @@
 #!/usr/bin/env python
 """Run tests on BCM_DigitizationConfigNew.py
 
-Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 """
 import sys
-import os
 from AthenaCommon.Logging import log
 from AthenaCommon.Constants import DEBUG
 from AthenaCommon.Configurable import Configurable
@@ -18,7 +17,7 @@ from BCM_Digitization.BCM_DigitizationConfigNew import BCM_DigitizationCfg
 log.setLevel(DEBUG)
 Configurable.configurableRun3Behavior = True
 # Configure
-ConfigFlags.Input.Files = defaultTestFiles.HITS
+ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
 ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
 ConfigFlags.GeoModel.Align.Dynamic = False
 ConfigFlags.lock()
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/test/PixelDigitizationConfigNew_test.py b/InnerDetector/InDetDigitization/PixelDigitization/test/PixelDigitizationConfigNew_test.py
index 1ecfd86a20357384f49c47c00644438a32ef01d7..55c699fd44fc8e74922f210c4f886253e0bbf305 100755
--- a/InnerDetector/InDetDigitization/PixelDigitization/test/PixelDigitizationConfigNew_test.py
+++ b/InnerDetector/InDetDigitization/PixelDigitization/test/PixelDigitizationConfigNew_test.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """Run tests on SCT_DigitizationConfigNew.py
 
-Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 """
 import sys
 from AthenaCommon.Logging import log
@@ -17,7 +17,7 @@ from PixelDigitization.PixelDigitizationConfigNew import PixelDigitizationHSCfg
 log.setLevel(DEBUG)
 Configurable.configurableRun3Behavior = True
 # Configure
-ConfigFlags.Input.Files = defaultTestFiles.HITS
+ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
 ConfigFlags.GeoModel.Align.Dynamic = False
 ConfigFlags.GeoModel.Type = "BrlIncl4.0_ref"
diff --git a/InnerDetector/InDetDigitization/SCT_Digitization/test/SCT_DigitizationConfigNew_test.py b/InnerDetector/InDetDigitization/SCT_Digitization/test/SCT_DigitizationConfigNew_test.py
index 86eeb724d991b0e35305532a8a11deea4d1a3a2f..fde068c11df71c61a1f94fa7aed9a796dd558ef3 100755
--- a/InnerDetector/InDetDigitization/SCT_Digitization/test/SCT_DigitizationConfigNew_test.py
+++ b/InnerDetector/InDetDigitization/SCT_Digitization/test/SCT_DigitizationConfigNew_test.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """Run tests on SCT_DigitizationConfigNew.py
 
-Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 """
 from AthenaCommon.Logging import log
 from AthenaCommon.Constants import DEBUG
@@ -16,7 +16,7 @@ from SCT_Digitization.SCT_DigitizationConfigNew import SCT_DigitizationHSCfg
 log.setLevel(DEBUG)
 Configurable.configurableRun3Behavior = True
 # Configure
-ConfigFlags.Input.Files = defaultTestFiles.HITS
+ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
 ConfigFlags.GeoModel.Align.Dynamic = False
 ConfigFlags.Concurrency.NumThreads = 1
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/test/TRT_DigitizationConfigNew_test.py b/InnerDetector/InDetDigitization/TRT_Digitization/test/TRT_DigitizationConfigNew_test.py
index b73c321dceb6ece83ba3734ee4d263c5b0f2a634..8eb5d7e8dce5b41c9cca67e64c6d96d370d24439 100755
--- a/InnerDetector/InDetDigitization/TRT_Digitization/test/TRT_DigitizationConfigNew_test.py
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/test/TRT_DigitizationConfigNew_test.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """Run tests on TRT_DigitizationConfigNew.py
 
-Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 """
 import sys
 from AthenaCommon.Logging import log
@@ -17,7 +17,7 @@ from TRT_Digitization.TRT_DigitizationConfigNew import TRT_DigitizationHSCfg
 log.setLevel(DEBUG)
 Configurable.configurableRun3Behavior = True
 # Configure
-ConfigFlags.Input.Files = defaultTestFiles.HITS
+ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
 ConfigFlags.GeoModel.Align.Dynamic = False
 ConfigFlags.Concurrency.NumThreads = 1
diff --git a/LArCalorimeter/LArExample/LArConditionsCommon/share/LArCellConditions.py b/LArCalorimeter/LArExample/LArConditionsCommon/share/LArCellConditions.py
index 7badf4e31e26cf28de3d65df77cbf1787204b237..277dda21f0e1dc58c22f1e2104a7eb8fbd9a23f5 100755
--- a/LArCalorimeter/LArExample/LArConditionsCommon/share/LArCellConditions.py
+++ b/LArCalorimeter/LArExample/LArConditionsCommon/share/LArCellConditions.py
@@ -1,5 +1,5 @@
 #!/bin/env python
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 ##=======================================================================================
 ## Name:        LArCellConditions.py
@@ -111,6 +111,7 @@ except:
 sys.argv = sys.argv[:1] + ['-b'] 
 
 from AthenaConfiguration.AllConfigFlags import ConfigFlags 
+ConfigFlags.Input.Files = []
 ConfigFlags.Input.TimeStamp = 1000
 ConfigFlags.Input.isMC=False
 ConfigFlags.Input.RunNumber=run
@@ -119,8 +120,7 @@ ConfigFlags.IOVDb.GlobalTag=tag
 ConfigFlags.LAr.doAlign=False
 ConfigFlags.Exec.OutputLevel=8
 ConfigFlags.lock()
-#from AthenaConfiguration.TestDefaults import defaultTestFiles
-#ConfigFlags.Input.Files = defaultTestFiles.RAW
+
 from RootUtils import PyROOTFixes  # noqa F401
 from AthenaConfiguration.MainServicesConfig import MainServicesCfg
 cfg=MainServicesCfg(ConfigFlags)
@@ -151,11 +151,9 @@ theLArCellConditionsAlg=LArCellConditionsAlg("LArCellConditions",
                                              printLocation=geo)
 cfg.addEventAlgo(theLArCellConditionsAlg)
 
-import readline
 if os.path.exists( fhistory ):
     readline.read_history_file( fhistory )
 readline.set_history_length( 128 )
 cfg.run(2,OutputLevel=7) #First event is dummy to close DB connections, second has the user-loop
 
 readline.write_history_file(fhistory)
-
diff --git a/LArCalorimeter/LArRecUtils/python/LArRecUtilsConfig.py b/LArCalorimeter/LArRecUtils/python/LArRecUtilsConfig.py
index d6b8bf0375d598b115aa8007be4c7bb050e7f1fc..f19473e62e62c65cc6aea4148774c00b41af809f 100644
--- a/LArCalorimeter/LArRecUtils/python/LArRecUtilsConfig.py
+++ b/LArCalorimeter/LArRecUtils/python/LArRecUtilsConfig.py
@@ -1,6 +1,6 @@
 """ComponentAccumulator configuration utilities for LArRecUtils
 
-Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 """
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.ComponentFactory import CompFactory
@@ -211,7 +211,7 @@ if __name__ == "__main__":
 
     print ('--- LArOFCCondAlg 1')
     flags1 = ConfigFlags.clone()
-    flags1.Input.Files = defaultTestFiles.RDO
+    flags1.Input.Files = defaultTestFiles.RDO_RUN2
     flags1.lock()
     acc1 = LArOFCCondAlgCfg (flags1)
     acc1.printCondAlgs(summariseProps=True)
@@ -219,7 +219,7 @@ if __name__ == "__main__":
 
     print ('--- LArAutoCorrTotalCondAlg')
     flags4 = ConfigFlags.clone()
-    flags4.Input.Files = defaultTestFiles.RDO
+    flags4.Input.Files = defaultTestFiles.RDO_RUN2
     flags4.LAr.ROD.nSamples = 32
     flags4.lock()
     acc4 = LArAutoCorrTotalCondAlgCfg (flags4)
@@ -228,7 +228,7 @@ if __name__ == "__main__":
 
     print ('--- LArRoIMapCondAlg')
     flags5 = ConfigFlags.clone()
-    flags5.Input.Files = defaultTestFiles.RDO
+    flags5.Input.Files = defaultTestFiles.RDO_RUN2
     flags5.lock()
     acc5 = LArRoIMapCondAlgCfg (flags5)
     acc5.printCondAlgs(summariseProps=True)
diff --git a/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py b/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py
index 8461fa10515da50f3f968b1daf2d3c4ee5fada2b..d511bc7ccfbbbc62c336403796f177328981e974 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonBytestreamDecodeConfig.py
@@ -1,4 +1,4 @@
-#  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.ComponentFactory import CompFactory
@@ -366,9 +366,8 @@ if __name__=="__main__":
     Configurable.configurableRun3Behavior=1
 
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
-    ConfigFlags.Input.Files = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"]
-    #from AthenaConfiguration.TestDefaults import defaultTestFiles
-    #ConfigFlags.Input.Files = defaultTestFiles.RAW
+    from AthenaConfiguration.TestDefaults import defaultTestFiles
+    ConfigFlags.Input.Files = defaultTestFiles.RAW
     # Set global tag by hand for now
     ConfigFlags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2018-13"#"CONDBR2-BLKPA-2015-17"
     ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01"#"ATLAS-R2-2015-03-01-00"
diff --git a/MuonSpectrometer/MuonConfig/test/CSC_DigitizationConfig_test.py b/MuonSpectrometer/MuonConfig/test/CSC_DigitizationConfig_test.py
index 9977d113ef53015cece60f728b3bb0e4c6b1a7b7..a7b62fbe4017759634018a70ed20b71ce65acdbc 100755
--- a/MuonSpectrometer/MuonConfig/test/CSC_DigitizationConfig_test.py
+++ b/MuonSpectrometer/MuonConfig/test/CSC_DigitizationConfig_test.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """Run tests on CSC_DigitizationConfigNew.py
 
-Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 """
 import sys
 from AthenaCommon.Logging import log
@@ -17,7 +17,7 @@ from MuonConfig.CSC_DigitizationConfig import CSC_DigitBuilderDigitToRDOCfg
 log.setLevel(DEBUG)
 Configurable.configurableRun3Behavior = True
 # Configure
-ConfigFlags.Input.Files = defaultTestFiles.HITS
+ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
 ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
 ConfigFlags.lock()
diff --git a/MuonSpectrometer/MuonConfig/test/MDT_DigitizationConfig_test.py b/MuonSpectrometer/MuonConfig/test/MDT_DigitizationConfig_test.py
index eb565096b38c71726ca976ceb5c2c4d4b35826cd..4a2aa8dcdeb7a5850246a4dbd743cc860a275c34 100755
--- a/MuonSpectrometer/MuonConfig/test/MDT_DigitizationConfig_test.py
+++ b/MuonSpectrometer/MuonConfig/test/MDT_DigitizationConfig_test.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """Run tests on MDT_DigitizationConfigNew.py
 
-Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 """
 import sys
 from AthenaCommon.Logging import log
@@ -17,7 +17,7 @@ from MuonConfig.MDT_DigitizationConfig import MDT_DigitizationCfg
 log.setLevel(DEBUG)
 Configurable.configurableRun3Behavior = True
 # Configure
-ConfigFlags.Input.Files = defaultTestFiles.HITS_SPECIAL
+ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
 ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
 ConfigFlags.lock()
diff --git a/MuonSpectrometer/MuonConfig/test/RPC_DigitizationConfig_test.py b/MuonSpectrometer/MuonConfig/test/RPC_DigitizationConfig_test.py
index cb1fb543862cdfea3cba35af005ac6a5a75d0af8..a441203a7dd0a34f1bb5f91bdee11944d9b71a6f 100755
--- a/MuonSpectrometer/MuonConfig/test/RPC_DigitizationConfig_test.py
+++ b/MuonSpectrometer/MuonConfig/test/RPC_DigitizationConfig_test.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """Run tests on RPC_DigitizationConfigNew.py
 
-Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 """
 import sys
 from AthenaCommon.Logging import log
@@ -17,7 +17,7 @@ from MuonConfig.RPC_DigitizationConfig import RPC_DigitizerDigitToRDOCfg
 log.setLevel(DEBUG)
 Configurable.configurableRun3Behavior = True
 # Configure
-ConfigFlags.Input.Files = defaultTestFiles.HITS
+ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
 ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
 ConfigFlags.lock()
diff --git a/MuonSpectrometer/MuonConfig/test/TGC_DigitizationConfig_test.py b/MuonSpectrometer/MuonConfig/test/TGC_DigitizationConfig_test.py
index 0e93ba5283208594d32a618ca410648222b9a167..51c33ee4afbe7c8d8df1b541cf59c3646fa2eff1 100755
--- a/MuonSpectrometer/MuonConfig/test/TGC_DigitizationConfig_test.py
+++ b/MuonSpectrometer/MuonConfig/test/TGC_DigitizationConfig_test.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """Run tests on TGC_DigitizationConfigNew.py
 
-Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 """
 import sys
 from AthenaCommon.Logging import log
@@ -17,7 +17,7 @@ from MuonConfig.TGC_DigitizationConfig import TGC_DigitizerDigitToRDOCfg
 log.setLevel(DEBUG)
 Configurable.configurableRun3Behavior = True
 # Configure
-ConfigFlags.Input.Files = defaultTestFiles.HITS
+ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
 ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
 ConfigFlags.lock()
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/python/RpcMonitorAlgorithm.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/python/RpcMonitorAlgorithm.py
index 3883de8ea30073a431ac2b0ecaa5be65e4a336b9..b41dbecd92ca42ac981005bf953cb68f77e87346 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/python/RpcMonitorAlgorithm.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/python/RpcMonitorAlgorithm.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 #
 
 '''
@@ -399,10 +399,6 @@ if __name__=="__main__":
         print ("file input.txt does not exist")
         print ("WIll use files: \n", file_list)
 
-
-    # from AthenaConfiguration.TestDefaults import defaultTestFiles
-    # ConfigFlags.Input.Files = defaultTestFiles.ESD
-
     ConfigFlags.Input.Files = file_list
 
     ConfigFlags.Output.HISTFileName = 'RPCMonitoringOutput.root'
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/ThinGeantTruthConfig.py b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/ThinGeantTruthConfig.py
index 7bde9b5ee0e0b9f09ba9eea84b3d7c2e06bc9b60..824630c1d6afb54eaed4caa7af67b9d58e3f58b6 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/ThinGeantTruthConfig.py
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/ThinGeantTruthConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 __doc__ = """
           Instantiate the TRT Standalone Thinning
@@ -31,7 +31,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.ComponentAccumulator import printProperties
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
 
-    flags.Input.Files = defaultTestFiles.RDO
+    flags.Input.Files = defaultTestFiles.RDO_RUN2
     flags.Output.doWriteAOD = True  # To test the AOD parts
     flags.lock()
     acc = MainServicesCfg(flags)
diff --git a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/ThinTRTStandaloneConfig.py b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/ThinTRTStandaloneConfig.py
index af2a82b333a8f36431087b11c0cf8250a81356e4..ff77196f9f110b9849fabbb0381b21c2ce21182b 100644
--- a/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/ThinTRTStandaloneConfig.py
+++ b/PhysicsAnalysis/AnalysisCommon/ThinningUtils/python/ThinTRTStandaloneConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 __doc__ = """
           Instantiate the TRT Standalone Thinning
@@ -37,7 +37,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.ComponentAccumulator import printProperties
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
 
-    flags.Input.Files = defaultTestFiles.RDO
+    flags.Input.Files = defaultTestFiles.RDO_RUN2
     flags.Output.doWriteAOD = True  # To test the AOD parts
     flags.lock()
     acc = MainServicesCfg(flags)
diff --git a/PhysicsAnalysis/MCTruthClassifier/python/MCTruthClassifierConfig.py b/PhysicsAnalysis/MCTruthClassifier/python/MCTruthClassifierConfig.py
index f6fe8f54e9f03341b71d2e4063dbb0afdc69fe8f..469bd0ffd0213602144d1c31555ba32cbcc186a0 100644
--- a/PhysicsAnalysis/MCTruthClassifier/python/MCTruthClassifierConfig.py
+++ b/PhysicsAnalysis/MCTruthClassifier/python/MCTruthClassifierConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 __doc__ = """
           Tool configuration to instantiate MCTruthClassifier
@@ -93,7 +93,7 @@ if __name__ == "__main__":
     Configurable.configurableRun3Behavior = 1
 
     ConfigFlags.Input.isMC = True
-    ConfigFlags.Input.Files = defaultTestFiles.RDO
+    ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
     ConfigFlags.lock()
 
     mlog = logging.getLogger("MCTruthClassifierConfigTest")
diff --git a/Reconstruction/RecJobTransforms/test/RecoSteeringTest.py b/Reconstruction/RecJobTransforms/test/RecoSteeringTest.py
index 55f19d0b842cc2080f76996910f26084d2db0d09..8370000c66def9f460d9c669ef6f31481a8eaeca 100755
--- a/Reconstruction/RecJobTransforms/test/RecoSteeringTest.py
+++ b/Reconstruction/RecJobTransforms/test/RecoSteeringTest.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 from AthenaCommon.Logging import logging
 log = logging.getLogger("RecoSteering")
 
@@ -29,7 +29,7 @@ def _run(input):
         if input == "ESD":
             flags.Input.Files = defaultTestFiles.ESD
         if input == "RDO":
-            flags.Input.Files = defaultTestFiles.RDO
+            flags.Input.Files = defaultTestFiles.RDO_RUN2
 
     # Enable PerfMon
     flags.PerfMon.doFullMonMT = True
diff --git a/Reconstruction/RecoAlgs/IsolationAlgs/python/IsoDensityConfig.py b/Reconstruction/RecoAlgs/IsolationAlgs/python/IsoDensityConfig.py
index 8c50824640f96c5f627791129e5e36e40c86b318..ebc911c54161fb0094982f6315f15037b29dc9ff 100644
--- a/Reconstruction/RecoAlgs/IsolationAlgs/python/IsoDensityConfig.py
+++ b/Reconstruction/RecoAlgs/IsolationAlgs/python/IsoDensityConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 __doc__ = """
           Instantiate the electron, photon and muon isolation
@@ -101,7 +101,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.ComponentAccumulator import printProperties
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
-    flags.Input.Files = defaultTestFiles.RDO
+    flags.Input.Files = defaultTestFiles.RDO_RUN2
     flags.Output.doWriteESD = True  # To test the ESD parts
     flags.Output.doWriteAOD = True  # To test the AOD parts
     flags.lock()
diff --git a/Reconstruction/RecoAlgs/IsolationAlgs/python/IsolationBuilderConfig.py b/Reconstruction/RecoAlgs/IsolationAlgs/python/IsolationBuilderConfig.py
index 1bff452572dc2429c6ede8784768295fc1f608eb..b9e2108867a060d20bb635af66064063b14ada97 100644
--- a/Reconstruction/RecoAlgs/IsolationAlgs/python/IsolationBuilderConfig.py
+++ b/Reconstruction/RecoAlgs/IsolationAlgs/python/IsolationBuilderConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 __doc__ = """
           Instantiate the electron or photon isolation
@@ -120,7 +120,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.ComponentAccumulator import printProperties
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
-    flags.Input.Files = defaultTestFiles.RDO
+    flags.Input.Files = defaultTestFiles.RDO_RUN2
     flags.Output.doWriteESD = True  # To test the ESD parts
     flags.Output.doWriteAOD = True  # To test the AOD parts
     flags.lock()
diff --git a/Reconstruction/RecoAlgs/IsolationAlgs/python/IsolationSteeringConfig.py b/Reconstruction/RecoAlgs/IsolationAlgs/python/IsolationSteeringConfig.py
index 1db35f3913789504b6caf8360cbb113734d48aa6..d1b12d40fe921d5b1fa8630451be16c8528a3037 100644
--- a/Reconstruction/RecoAlgs/IsolationAlgs/python/IsolationSteeringConfig.py
+++ b/Reconstruction/RecoAlgs/IsolationAlgs/python/IsolationSteeringConfig.py
@@ -54,7 +54,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.ComponentAccumulator import printProperties
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
-    flags.Input.Files = defaultTestFiles.RDO
+    flags.Input.Files = defaultTestFiles.RDO_RUN2
     flags.Output.doWriteESD = True  # To test the ESD parts
     flags.Output.doWriteAOD = True  # To test the AOD parts
     flags.lock()
diff --git a/Reconstruction/egamma/egammaAlgs/python/EMBremCollectionBuilderConfig.py b/Reconstruction/egamma/egammaAlgs/python/EMBremCollectionBuilderConfig.py
index d45fd457a716fbb73f27c08852d955cac2515ab1..4d761b7f17605580e0831c8c848959144d82b0fd 100644
--- a/Reconstruction/egamma/egammaAlgs/python/EMBremCollectionBuilderConfig.py
+++ b/Reconstruction/egamma/egammaAlgs/python/EMBremCollectionBuilderConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.ComponentFactory import CompFactory
@@ -135,7 +135,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     from AthenaConfiguration.ComponentAccumulator import printProperties
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
-    flags.Input.Files = defaultTestFiles.RDO
+    flags.Input.Files = defaultTestFiles.RDO_RUN2
     flags.lock()
     acc = MainServicesCfg(flags)
     acc.merge(EMBremCollectionBuilderCfg(flags))
diff --git a/Reconstruction/egamma/egammaAlgs/python/EMVertexBuilderConfig.py b/Reconstruction/egamma/egammaAlgs/python/EMVertexBuilderConfig.py
index a3fab87ca3c18dc9fa00b75551951ce2d18659e6..e5d98fcc6d71c94cf1811efb7a032b60409ef856 100644
--- a/Reconstruction/egamma/egammaAlgs/python/EMVertexBuilderConfig.py
+++ b/Reconstruction/egamma/egammaAlgs/python/EMVertexBuilderConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.ComponentFactory import CompFactory
@@ -32,7 +32,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     from AthenaConfiguration.ComponentAccumulator import printProperties
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
-    flags.Input.Files = defaultTestFiles.RDO
+    flags.Input.Files = defaultTestFiles.RDO_RUN2
     flags.lock()
 
     acc = MainServicesCfg(flags)
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaForwardBuilderConfig.py b/Reconstruction/egamma/egammaAlgs/python/egammaForwardBuilderConfig.py
index 768a731f7a47b0eed73304229921891d95d6f05a..184faf257baa152825efe954253c3819ff1e01f8 100644
--- a/Reconstruction/egamma/egammaAlgs/python/egammaForwardBuilderConfig.py
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaForwardBuilderConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 from ElectronPhotonSelectorTools.EgammaPIDdefs import egammaPID
 from ElectronPhotonSelectorTools.AsgForwardElectronIsEMSelectorsConfig import (
@@ -68,7 +68,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     from AthenaConfiguration.ComponentAccumulator import printProperties
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
-    flags.Input.Files = defaultTestFiles.RDO
+    flags.Input.Files = defaultTestFiles.RDO_RUN2
     flags.lock()
 
     acc = MainServicesCfg(flags)
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaRecBuilderConfig.py b/Reconstruction/egamma/egammaAlgs/python/egammaRecBuilderConfig.py
index 907222a6e3855eac03e9295eea79d0a59e87e65d..ef385692aa890342d63ea77f9e71574dc6f066b6 100644
--- a/Reconstruction/egamma/egammaAlgs/python/egammaRecBuilderConfig.py
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaRecBuilderConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 __doc__ = """
           Instantiate egammaRecBuilder with default configuration
@@ -48,7 +48,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     from AthenaConfiguration.ComponentAccumulator import printProperties
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
-    flags.Input.Files = defaultTestFiles.RDO
+    flags.Input.Files = defaultTestFiles.RDO_RUN2
     flags.lock()
 
     acc = MainServicesCfg(flags)
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaSelectedTrackCopyConfig.py b/Reconstruction/egamma/egammaAlgs/python/egammaSelectedTrackCopyConfig.py
index 1c0e42946b43e43f2198ef35cc4d981a58eba7e3..c92d6e55ae9bfc0b4b594ae39aa4ef65e61eec21 100644
--- a/Reconstruction/egamma/egammaAlgs/python/egammaSelectedTrackCopyConfig.py
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaSelectedTrackCopyConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 __doc__ = "Instantiate egammaSelectedTrackCopy with default configuration"
 
@@ -63,7 +63,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     from AthenaConfiguration.ComponentAccumulator import printProperties
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
-    flags.Input.Files = defaultTestFiles.RDO
+    flags.Input.Files = defaultTestFiles.RDO_RUN2
     flags.lock()
 
     acc = MainServicesCfg(flags)
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaSuperClusterBuilderConfig.py b/Reconstruction/egamma/egammaAlgs/python/egammaSuperClusterBuilderConfig.py
index 3cf637d4024b5f8eb8fd39d8a7614e85738ae086..4f3550081b416a8e57c654a6d505667932bdab64 100644
--- a/Reconstruction/egamma/egammaAlgs/python/egammaSuperClusterBuilderConfig.py
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaSuperClusterBuilderConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 __doc__ = """Instantiate the two supercluster
 builders with default configuration"""
@@ -99,7 +99,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     from AthenaConfiguration.ComponentAccumulator import printProperties
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
-    flags.Input.Files = defaultTestFiles.RDO
+    flags.Input.Files = defaultTestFiles.RDO_RUN2
     flags.lock()
     acc = MainServicesCfg(flags)
     acc.merge(electronSuperClusterBuilderCfg(flags))
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaTopoClusterCopierConfig.py b/Reconstruction/egamma/egammaAlgs/python/egammaTopoClusterCopierConfig.py
index ce3d9fa479165fae9d72a8a6e8cfa281a681b5db..bf464003f49752fbbf770b90853ebee45a056518 100644
--- a/Reconstruction/egamma/egammaAlgs/python/egammaTopoClusterCopierConfig.py
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaTopoClusterCopierConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 __doc__ = "Instantiate egammaTopoClusterCopier with default configuration"
 
@@ -46,7 +46,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     from AthenaConfiguration.ComponentAccumulator import printProperties
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
-    flags.Input.Files = defaultTestFiles.RDO
+    flags.Input.Files = defaultTestFiles.RDO_RUN2
     flags.lock()
     acc = MainServicesCfg(flags)
     mlog = logging.getLogger("egammaTopoClusterCopierConfigTest")
diff --git a/Reconstruction/egamma/egammaAlgs/python/egammaTruthAssociationConfig.py b/Reconstruction/egamma/egammaAlgs/python/egammaTruthAssociationConfig.py
index 406515a9e1081c95a6b7a0cab001db8e769a64db..55da494b328d179dbfc260a49bd607e8da3b12c7 100644
--- a/Reconstruction/egamma/egammaAlgs/python/egammaTruthAssociationConfig.py
+++ b/Reconstruction/egamma/egammaAlgs/python/egammaTruthAssociationConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 from MCTruthClassifier.MCTruthClassifierConfig import (
     MCTruthClassifierCaloTruthMatchCfg)
@@ -60,7 +60,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     from AthenaConfiguration.ComponentAccumulator import printProperties
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
-    flags.Input.Files = defaultTestFiles.RDO
+    flags.Input.Files = defaultTestFiles.RDO_RUN2
     flags.lock()
     acc = MainServicesCfg(flags)
     mlog = logging.getLogger("egammaTruthAssociationConfigTest")
diff --git a/Reconstruction/egamma/egammaAlgs/python/topoEgammaBuilderConfig.py b/Reconstruction/egamma/egammaAlgs/python/topoEgammaBuilderConfig.py
index 0798f10243889435b6376b1b80234323cfbdf0c6..ec536acc15c60cb3f3d6521d2b58be608793cecb 100644
--- a/Reconstruction/egamma/egammaAlgs/python/topoEgammaBuilderConfig.py
+++ b/Reconstruction/egamma/egammaAlgs/python/topoEgammaBuilderConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 __doc__ = """
           Instantiate the two supercluster
@@ -81,7 +81,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     from AthenaConfiguration.ComponentAccumulator import printProperties
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
-    flags.Input.Files = defaultTestFiles.RDO
+    flags.Input.Files = defaultTestFiles.RDO_RUN2
     flags.lock()
 
     acc = MainServicesCfg(flags)
diff --git a/Reconstruction/egamma/egammaConfig/python/egammaLRTReconstructionConfig.py b/Reconstruction/egamma/egammaConfig/python/egammaLRTReconstructionConfig.py
index 57a3accda5095cbb486a55560c17e511e1ea94f5..174d85f83b188eec7d206ca10a03644226859ca1 100644
--- a/Reconstruction/egamma/egammaConfig/python/egammaLRTReconstructionConfig.py
+++ b/Reconstruction/egamma/egammaConfig/python/egammaLRTReconstructionConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 __doc__ = """
           Instantiate the EGamma LRT reconstruction.
@@ -127,7 +127,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.AllConfigFlags import ConfigFlags as flags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
-    flags.Input.Files = defaultTestFiles.RDO
+    flags.Input.Files = defaultTestFiles.RDO_RUN2
     flags.Output.doWriteESD = True  # To test the ESD parts
     flags.Output.doWriteAOD = True  # To test the AOD parts
     flags.lock()
diff --git a/Reconstruction/egamma/egammaConfig/python/egammaReconstructionConfig.py b/Reconstruction/egamma/egammaConfig/python/egammaReconstructionConfig.py
index a83c9d8ac95e9413074e5afe3dd40429d6bea95d..da83156ccf6137746f22388b760050da1dba34d2 100644
--- a/Reconstruction/egamma/egammaConfig/python/egammaReconstructionConfig.py
+++ b/Reconstruction/egamma/egammaConfig/python/egammaReconstructionConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 __doc__ = """
           Instantiate the EGamma reconstruction.
@@ -86,7 +86,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.AllConfigFlags import ConfigFlags as flags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
-    flags.Input.Files = defaultTestFiles.RDO
+    flags.Input.Files = defaultTestFiles.RDO_RUN2
     flags.Output.doWriteESD = True  # To test the ESD parts
     flags.Output.doWriteAOD = True  # To test the AOD parts
     flags.lock()
diff --git a/Reconstruction/egamma/egammaConfig/python/egammaSteeringConfig.py b/Reconstruction/egamma/egammaConfig/python/egammaSteeringConfig.py
index d1196290d7c6fc1bbc2eaa2b282ac7167d7dc847..32abd086b760fb51ec09ca090e474f299d02ea19 100644
--- a/Reconstruction/egamma/egammaConfig/python/egammaSteeringConfig.py
+++ b/Reconstruction/egamma/egammaConfig/python/egammaSteeringConfig.py
@@ -66,7 +66,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.AllConfigFlags import ConfigFlags as flags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
-    flags.Input.Files = defaultTestFiles.RDO
+    flags.Input.Files = defaultTestFiles.RDO_RUN2
     flags.Output.doWriteESD = True  # To test the ESD parts
     flags.Output.doWriteAOD = True  # To test the AOD parts
     flags.lock()
diff --git a/Reconstruction/egamma/egammaConfig/python/egammaUpstreamConfig.py b/Reconstruction/egamma/egammaConfig/python/egammaUpstreamConfig.py
index 9cd005ef57de198a32e7d7993338c6fed9d34508..83eaa4f3ad3b023504f4621f4625a7bf1a09e6fb 100644
--- a/Reconstruction/egamma/egammaConfig/python/egammaUpstreamConfig.py
+++ b/Reconstruction/egamma/egammaConfig/python/egammaUpstreamConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 __doc__ = """
         Instantiate things needed upstream the main egamma Reconstruction,
@@ -71,7 +71,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.AllConfigFlags import ConfigFlags as flags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     from AthenaConfiguration.MainServicesConfig import MainServicesCfg
-    flags.Input.Files = defaultTestFiles.RDO
+    flags.Input.Files = defaultTestFiles.RDO_RUN2
     flags.lock()
 
     acc = MainServicesCfg(flags)
diff --git a/Reconstruction/egamma/egammaMVACalib/python/egammaMVACalibConfig.py b/Reconstruction/egamma/egammaMVACalib/python/egammaMVACalibConfig.py
index 7672c6221004d673a149f6e1e0a211ead1121be5..6546d6fe431ca2c74ee0a2adc2ad4e6682f53a8c 100644
--- a/Reconstruction/egamma/egammaMVACalib/python/egammaMVACalibConfig.py
+++ b/Reconstruction/egamma/egammaMVACalib/python/egammaMVACalibConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 from AthenaCommon.Logging import logging
 from AthenaConfiguration.ComponentFactory import CompFactory
@@ -66,7 +66,7 @@ if __name__ == "__main__":
 
     Configurable.configurableRun3Behavior = True
 
-    ConfigFlags.Input.Files = defaultTestFiles.RDO
+    ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
     ConfigFlags.fillFromArgs()
     ConfigFlags.lock()
 
diff --git a/Reconstruction/egamma/egammaTools/python/EMClusterToolConfig.py b/Reconstruction/egamma/egammaTools/python/EMClusterToolConfig.py
index a61860d07ac747b2960dc0edced3501f1a19ff40..e7a4aabac156141d2cf1deff841415ba9adf2bb5 100644
--- a/Reconstruction/egamma/egammaTools/python/EMClusterToolConfig.py
+++ b/Reconstruction/egamma/egammaTools/python/EMClusterToolConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 __doc__ = "Configuration for EMClusterTool"
 
@@ -37,7 +37,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     Configurable.configurableRun3Behavior = True
 
-    ConfigFlags.Input.Files = defaultTestFiles.RDO
+    ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
     ConfigFlags.fillFromArgs()
     ConfigFlags.lock()
     ConfigFlags.dump()
diff --git a/Reconstruction/egamma/egammaTools/python/EMConversionBuilderConfig.py b/Reconstruction/egamma/egammaTools/python/EMConversionBuilderConfig.py
index 6d33afdb0401bc63ad481479d6ad1a71548a4433..2739c75ec5ba46f2dfb0a1506ff3132c5cd62039 100644
--- a/Reconstruction/egamma/egammaTools/python/EMConversionBuilderConfig.py
+++ b/Reconstruction/egamma/egammaTools/python/EMConversionBuilderConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 __doc__ = "Configure Conversion building"
 
@@ -36,7 +36,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     Configurable.configurableRun3Behavior = True
 
-    ConfigFlags.Input.Files = defaultTestFiles.RDO
+    ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
     ConfigFlags.fillFromArgs()
     ConfigFlags.lock()
     ConfigFlags.dump()
diff --git a/Reconstruction/egamma/egammaTools/python/EMPIDBuilderConfig.py b/Reconstruction/egamma/egammaTools/python/EMPIDBuilderConfig.py
index f41eb61208f3b7c09911266ad3cad23d0a232263..2ded996f17d8e47e697cedfed007fe43b980e1fe 100755
--- a/Reconstruction/egamma/egammaTools/python/EMPIDBuilderConfig.py
+++ b/Reconstruction/egamma/egammaTools/python/EMPIDBuilderConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 __doc__ = "Configure the electron and photon selectors."
 
@@ -103,7 +103,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     Configurable.configurableRun3Behavior = True
 
-    ConfigFlags.Input.Files = defaultTestFiles.RDO
+    ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
     ConfigFlags.fillFromArgs()
     ConfigFlags.lock()
     ConfigFlags.dump()
diff --git a/Reconstruction/egamma/egammaTools/python/EMShowerBuilderConfig.py b/Reconstruction/egamma/egammaTools/python/EMShowerBuilderConfig.py
index 027f1f3f1692298f21bfc60c29645ea6ef257e3f..b738a27d7e3e737e2768a69119b4a699518411be 100644
--- a/Reconstruction/egamma/egammaTools/python/EMShowerBuilderConfig.py
+++ b/Reconstruction/egamma/egammaTools/python/EMShowerBuilderConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 __doc__ = "Configuration for EMShowerBuilder"
 
@@ -37,7 +37,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     Configurable.configurableRun3Behavior = True
 
-    ConfigFlags.Input.Files = defaultTestFiles.RDO
+    ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
     ConfigFlags.fillFromArgs()
     ConfigFlags.lock()
     ConfigFlags.dump()
diff --git a/Reconstruction/egamma/egammaTools/python/EMTrackMatchBuilderConfig.py b/Reconstruction/egamma/egammaTools/python/EMTrackMatchBuilderConfig.py
index 6d819e4ff0ae222e83cd6e0bcddf6b1a80572480..555dd081a333ae653c4d15609ccc4d714b3cd6d8 100644
--- a/Reconstruction/egamma/egammaTools/python/EMTrackMatchBuilderConfig.py
+++ b/Reconstruction/egamma/egammaTools/python/EMTrackMatchBuilderConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 __doc__ = "Instantiate EMTrackMatchBuilder with default configuration"
 
@@ -46,7 +46,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     Configurable.configurableRun3Behavior = True
 
-    ConfigFlags.Input.Files = defaultTestFiles.RDO
+    ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
     ConfigFlags.fillFromArgs()
     ConfigFlags.lock()
     ConfigFlags.dump()
diff --git a/Reconstruction/egamma/egammaTools/python/egammaLargeClusterMakerConfig.py b/Reconstruction/egamma/egammaTools/python/egammaLargeClusterMakerConfig.py
index 21abc16ab6c57c8ce2ad2c88c6629db84ab3a63f..e416085933d9598de678fad0df79f0bea66f53fe 100644
--- a/Reconstruction/egamma/egammaTools/python/egammaLargeClusterMakerConfig.py
+++ b/Reconstruction/egamma/egammaTools/python/egammaLargeClusterMakerConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 __doc__ = """ Configure egammaLargeClusterMaker,
                which chooses cells to store in the AOD"""
@@ -31,7 +31,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     Configurable.configurableRun3Behavior = True
 
-    ConfigFlags.Input.Files = defaultTestFiles.RDO
+    ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
     ConfigFlags.fillFromArgs()
     ConfigFlags.lock()
     ConfigFlags.dump()
diff --git a/Reconstruction/egamma/egammaTools/python/egammaOQFlagsBuilderConfig.py b/Reconstruction/egamma/egammaTools/python/egammaOQFlagsBuilderConfig.py
index ba0c718ea3178b99bf20db46d92146845d107f59..d1b17b8681b3ae846f47fef3aeed71bc9fadd417 100644
--- a/Reconstruction/egamma/egammaTools/python/egammaOQFlagsBuilderConfig.py
+++ b/Reconstruction/egamma/egammaTools/python/egammaOQFlagsBuilderConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 __doc__ = "Configure e/gamma object quality"
 
@@ -31,7 +31,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     Configurable.configurableRun3Behavior = True
 
-    ConfigFlags.Input.Files = defaultTestFiles.RDO
+    ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
     ConfigFlags.fillFromArgs()
     ConfigFlags.lock()
     ConfigFlags.dump()
diff --git a/Reconstruction/egamma/egammaTools/python/egammaSwToolConfig.py b/Reconstruction/egamma/egammaTools/python/egammaSwToolConfig.py
index 047122ad9ea8afbfffaeb31667c85210bd17cd57..0a91f12a7981b51a00aaf47e934677d865b7945a 100644
--- a/Reconstruction/egamma/egammaTools/python/egammaSwToolConfig.py
+++ b/Reconstruction/egamma/egammaTools/python/egammaSwToolConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 __doc__ = "Configure cluster correction"
 
@@ -64,7 +64,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     Configurable.configurableRun3Behavior = True
 
-    ConfigFlags.Input.Files = defaultTestFiles.RDO
+    ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
     ConfigFlags.fillFromArgs()
     ConfigFlags.lock()
     ConfigFlags.dump()
diff --git a/Reconstruction/egamma/egammaTrackTools/python/GSFTrackFitterConfig.py b/Reconstruction/egamma/egammaTrackTools/python/GSFTrackFitterConfig.py
index 5cbac0ec43347bcb60884bfd60a8d1ce9ff48d1c..c8a30d5f3c0a8c1eea9da76509a4f7561c375227 100644
--- a/Reconstruction/egamma/egammaTrackTools/python/GSFTrackFitterConfig.py
+++ b/Reconstruction/egamma/egammaTrackTools/python/GSFTrackFitterConfig.py
@@ -77,7 +77,7 @@ if __name__ == "__main__":
 
     Configurable.configurableRun3Behavior = True
 
-    ConfigFlags.Input.Files = defaultTestFiles.RDO
+    ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
     ConfigFlags.fillFromArgs()
     ConfigFlags.lock()
     ConfigFlags.dump()
diff --git a/Reconstruction/egamma/egammaTrackTools/python/egammaTrackToolsConfig.py b/Reconstruction/egamma/egammaTrackTools/python/egammaTrackToolsConfig.py
index c0ddf9c685c391695f3a2ff2cc41e18d17cdc64b..78f8a095479fda5537c94351e679fc11dc13fe04 100644
--- a/Reconstruction/egamma/egammaTrackTools/python/egammaTrackToolsConfig.py
+++ b/Reconstruction/egamma/egammaTrackTools/python/egammaTrackToolsConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 __doc__ = """Tool configuration to instantiate all
  egammaCaloTools with default configuration"""
@@ -96,7 +96,7 @@ if __name__ == "__main__":
     from AthenaConfiguration.TestDefaults import defaultTestFiles
     Configurable.configurableRun3Behavior = True
 
-    ConfigFlags.Input.Files = defaultTestFiles.RDO
+    ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
     ConfigFlags.fillFromArgs()
     ConfigFlags.lock()
     ConfigFlags.dump()
diff --git a/Simulation/Digitization/test/DigitizationConfigNew_test.py b/Simulation/Digitization/test/DigitizationConfigNew_test.py
index 2d38a429be4eb8869aaff1892af1153d79f0450e..30a80a3914506c2449b818a8ae7f0a62efb14dd6 100755
--- a/Simulation/Digitization/test/DigitizationConfigNew_test.py
+++ b/Simulation/Digitization/test/DigitizationConfigNew_test.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """Test various ComponentAccumulator Digitization configuration modules
 
-Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 """
 import sys
 from AthenaCommon.Logging import log
@@ -16,7 +16,7 @@ log.setLevel(DEBUG)
 Configurable.configurableRun3Behavior = True
 
 # Configure
-ConfigFlags.Input.Files = defaultTestFiles.HITS_SPECIAL
+ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
 ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-25-02"
 ConfigFlags.GeoModel.Align.Dynamic = False
diff --git a/Simulation/Digitization/test/DigitizationPUConfigNew_test.py b/Simulation/Digitization/test/DigitizationPUConfigNew_test.py
index 2a2a074ecf07a450f85876322e4002bbdb7b7126..5328851e95ba1dcfd9f97373a1d44629520777dd 100755
--- a/Simulation/Digitization/test/DigitizationPUConfigNew_test.py
+++ b/Simulation/Digitization/test/DigitizationPUConfigNew_test.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """ComponentAccumulator PileUp (PU) Digitization configuration test
 
-Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 """
 import sys
 from AthenaCommon.Logging import log
@@ -18,7 +18,7 @@ Configurable.configurableRun3Behavior = True
 
 ConfigFlags.Exec.MaxEvents = 4
 
-ConfigFlags.Input.Files = defaultTestFiles.HITS
+ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
 ConfigFlags.Output.RDOFileName = "mc16d_ttbar.CA.RDO.pool.root"
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-25-02"
 
@@ -55,12 +55,12 @@ ConfigFlags.Digitization.PU.NumberOfLowPtMinBias = 80.290021063135
 # TODO: temporary
 ConfigFlags.Digitization.TruthOutput = True
 
-cols = generateBackgroundInputCollections(ConfigFlags, defaultTestFiles.HITS_MINBIAS_HIGH,
-                       ConfigFlags.Digitization.PU.NumberOfHighPtMinBias, True)
+cols = generateBackgroundInputCollections(ConfigFlags, defaultTestFiles.HITS_RUN2_MINBIAS_HIGH,
+                                          ConfigFlags.Digitization.PU.NumberOfHighPtMinBias, True)
 ConfigFlags.Digitization.PU.HighPtMinBiasInputCols = cols
 
-cols = generateBackgroundInputCollections(ConfigFlags, defaultTestFiles.HITS_MINBIAS_LOW,
-                       ConfigFlags.Digitization.PU.NumberOfLowPtMinBias, True)
+cols = generateBackgroundInputCollections(ConfigFlags, defaultTestFiles.HITS_RUN2_MINBIAS_LOW,
+                                          ConfigFlags.Digitization.PU.NumberOfLowPtMinBias, True)
 ConfigFlags.Digitization.PU.LowPtMinBiasInputCols = cols
 
 setupPileUpFlags(ConfigFlags, 'RunDependentSimData.BunchTrains_MC20_2017', 'RunDependentSimData.PileUpProfile_run300000_MC20d')
diff --git a/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderToolConfig.py b/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderToolConfig.py
index 45f786f2670e5d91b4679b6822dbd756e779a3b7..0504de6724b0204e759c13ad1486fb14daa33e57 100644
--- a/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderToolConfig.py
+++ b/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderToolConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 #
 # File: FastCaloSim/python/AddNoiseCellBuilderTool.py
 # Created: Aug 2019, sss
@@ -43,7 +43,7 @@ if __name__ == "__main__":
     ConfigFlags.loadAllDynamicFlags()
 
     flags1 = ConfigFlags.clone()
-    flags1.Input.Files = defaultTestFiles.RDO
+    flags1.Input.Files = defaultTestFiles.HITS_RUN2
     flags1.lock()
     acc1 = AddNoiseCellBuilderToolCfg (flags1)
     only = ['AddNoiseCellBuilderTool',
diff --git a/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderTool_test.py b/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderTool_test.py
index 5e6462c64090e18accada57931d6176c6b3b7a2f..9e26c3f3460ec43f9a80b085896c9adf696f5841 100644
--- a/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderTool_test.py
+++ b/Simulation/FastShower/FastCaloSim/python/AddNoiseCellBuilderTool_test.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration.
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration.
 #
 # File: FastCaloSim/python/AddNoiseCellBuilderTool_test.py
 # Author: scott snyder
@@ -175,7 +175,7 @@ Configurable.configurableRun3Behavior=1
 from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 
-ConfigFlags.Input.Files = defaultTestFiles.RDO
+ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
 ConfigFlags.Input.TimeStamp = 1000
 ConfigFlags.Detector.GeometryLAr = True
 ConfigFlags.Detector.GeometryTile = True
diff --git a/Simulation/G4Atlas/G4AtlasTests/share/DCubeTestsConfig.py b/Simulation/G4Atlas/G4AtlasTests/share/DCubeTestsConfig.py
index 1a78a80af4b61766f505fee81649c9676b1272db..553445fd04c4a5f38ef77eebbd6e13920f84b989 100644
--- a/Simulation/G4Atlas/G4AtlasTests/share/DCubeTestsConfig.py
+++ b/Simulation/G4Atlas/G4AtlasTests/share/DCubeTestsConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 from AthenaCommon.Logging import logging
 from AthenaConfiguration.ComponentFactory import CompFactory
@@ -123,7 +123,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     ConfigFlags.Input.isMC = True
-    ConfigFlags.Input.Files = defaultTestFiles.HITS
+    ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
     ConfigFlags.Exec.MaxEvents = 3
     ConfigFlags.fillFromArgs()
     ConfigFlags.lock()
diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasConfig.py b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasConfig.py
index 7a8bc56f7efd35446c3ebfd27dd0a7ba2ace67f4..16e1d3a3553f34f63f903b989980e833a10b1557 100644
--- a/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasConfig.py
+++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasServices/python/ISF_FatrasConfig.py
@@ -817,7 +817,7 @@ if __name__ == "__main__":
     log.setLevel(DEBUG)
 
     ConfigFlags.Input.isMC = True
-    ConfigFlags.Input.Files = defaultTestFiles.HITS
+    ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
     ConfigFlags.Exec.MaxEvents = 3
     ConfigFlags.fillFromArgs()
     ConfigFlags.lock()
diff --git a/Simulation/Overlay/OverlayConfiguration/python/OverlayTestHelpers.py b/Simulation/Overlay/OverlayConfiguration/python/OverlayTestHelpers.py
index 1098e0c970d2b3f24ffdf2ffd16f1b72eb56e0a4..45527134e7090534d9e6c002cbae43e5b4cf1e81 100644
--- a/Simulation/Overlay/OverlayConfiguration/python/OverlayTestHelpers.py
+++ b/Simulation/Overlay/OverlayConfiguration/python/OverlayTestHelpers.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """Overlay test helpers
 
-Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 """
 
 from argparse import ArgumentParser
@@ -67,8 +67,8 @@ def defaultTestFlags(configFlags, args):
         configFlags.IOVDb.DatabaseInstance = "CONDBR2"
         configFlags.Overlay.DataOverlay = True
     else:
-        configFlags.Input.Files = defaultTestFiles.RDO_BKG
-        configFlags.Input.SecondaryFiles = defaultTestFiles.HITS
+        configFlags.Input.Files = defaultTestFiles.RDO_BKG_RUN2
+        configFlags.Input.SecondaryFiles = defaultTestFiles.HITS_RUN2
         configFlags.Output.RDOFileName = "mcOverlayRDO.pool.root"
         configFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-20-01"
         configFlags.Overlay.DataOverlay = False
diff --git a/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OfflineMC_test.py b/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OfflineMC_test.py
index 95c53157f0f11ece7bfcbfe2191ea28484ff24a7..fc60f1cb42ada3b27502e3a15003c8fc31402682 100644
--- a/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OfflineMC_test.py
+++ b/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OfflineMC_test.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """Run a test on Tile conditions algorithms configuration on MC offline
 
-Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 """
 
 if __name__ == "__main__":
@@ -17,7 +17,7 @@ if __name__ == "__main__":
     # test setup
     log.setLevel(DEBUG)
 
-    ConfigFlags.Input.Files = defaultTestFiles.RDO
+    ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
     ConfigFlags.Tile.RunType = 'PHY'
     ConfigFlags.lock()
 
diff --git a/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OnlineMC_test.py b/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OnlineMC_test.py
index 7bfe59b7f27ccf31707a9d3e489ea2b11a338057..f861894cab266c9b01f048709767f72e23d6a49e 100644
--- a/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OnlineMC_test.py
+++ b/TileCalorimeter/TileConditions/test/TileCondToolsTestConfig_OnlineMC_test.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 """Run a test on Tile conditions algorithms configuration on MC online
 
-Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 """
 
 if __name__ == "__main__":
@@ -17,7 +17,7 @@ if __name__ == "__main__":
     # test setup
     log.setLevel(DEBUG)
 
-    ConfigFlags.Input.Files = defaultTestFiles.RDO
+    ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
     ConfigFlags.Tile.RunType = 'PHY'
     ConfigFlags.Common.isOnline = True
     ConfigFlags.lock()
diff --git a/TileCalorimeter/TileSimAlgs/python/TileDigitizationConfig.py b/TileCalorimeter/TileSimAlgs/python/TileDigitizationConfig.py
index 58bb3649a41ee01f050e07ce19de04eef17eb2f9..7625aa8b53ce58adbb519c673fd0bb3d34cd057d 100644
--- a/TileCalorimeter/TileSimAlgs/python/TileDigitizationConfig.py
+++ b/TileCalorimeter/TileSimAlgs/python/TileDigitizationConfig.py
@@ -1,6 +1,6 @@
 """Combined Tile Digitization functions
 
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 """
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 from AthenaConfiguration.Enums import ProductionStep
@@ -77,7 +77,7 @@ if __name__ == "__main__":
     # Test setup
     log.setLevel(DEBUG)
 
-    ConfigFlags.Input.Files = defaultTestFiles.HITS
+    ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
     ConfigFlags.Tile.RunType = 'PHY'
     ConfigFlags.Output.RDOFileName = 'myRDO.pool.root'
     ConfigFlags.IOVDb.GlobalTag = 'OFLCOND-MC16-SDR-16'
diff --git a/TileCalorimeter/TileSimAlgs/python/TileDigitsMakerConfig.py b/TileCalorimeter/TileSimAlgs/python/TileDigitsMakerConfig.py
index b5f3bf6482036e75ac736044c077cfbf87f04cce..cb667e15bf8063fc29aa3cfc3efb31449d549ad6 100644
--- a/TileCalorimeter/TileSimAlgs/python/TileDigitsMakerConfig.py
+++ b/TileCalorimeter/TileSimAlgs/python/TileDigitsMakerConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 """Define method to construct configured Tile digits maker algorithm"""
 
@@ -165,7 +165,7 @@ if __name__ == "__main__":
     # Test setup
     log.setLevel(DEBUG)
 
-    ConfigFlags.Input.Files = defaultTestFiles.HITS
+    ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
     ConfigFlags.Tile.RunType = 'PHY'
     ConfigFlags.Output.RDOFileName = 'myRDO.pool.root'
     ConfigFlags.IOVDb.GlobalTag = 'OFLCOND-MC16-SDR-16'
diff --git a/TileCalorimeter/TileSimAlgs/python/TileHitToTTL1Config.py b/TileCalorimeter/TileSimAlgs/python/TileHitToTTL1Config.py
index e6d10b49d632f80c2d0290a821303e4f17ea98a4..d091093fb810035f2a24d57a3676a320a4d17ae1 100644
--- a/TileCalorimeter/TileSimAlgs/python/TileHitToTTL1Config.py
+++ b/TileCalorimeter/TileSimAlgs/python/TileHitToTTL1Config.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 """Define method to construct configured Tile hits to TTL1 algorithm"""
 
@@ -148,7 +148,7 @@ if __name__ == "__main__":
     # Test setup
     log.setLevel(DEBUG)
 
-    ConfigFlags.Input.Files = defaultTestFiles.HITS
+    ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
     ConfigFlags.IOVDb.GlobalTag = 'OFLCOND-MC16-SDR-16'
     ConfigFlags.Digitization.PileUp = False
     ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
diff --git a/TileCalorimeter/TileSimAlgs/python/TileHitVecToCntConfig.py b/TileCalorimeter/TileSimAlgs/python/TileHitVecToCntConfig.py
index a52f5fb4dfaf85b23d1bee0cea09f2823f123224..e70d36b36ab98ab40e2f2a847c8ba2f2078e6a70 100644
--- a/TileCalorimeter/TileSimAlgs/python/TileHitVecToCntConfig.py
+++ b/TileCalorimeter/TileSimAlgs/python/TileHitVecToCntConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 """Define method to construct configured private Tile hit vector to container tool"""
 
@@ -162,7 +162,7 @@ if __name__ == "__main__":
     # Test setup
     log.setLevel(DEBUG)
 
-    ConfigFlags.Input.Files = defaultTestFiles.HITS
+    ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
     ConfigFlags.Output.RDOFileName = 'myRDO.pool.root'
     ConfigFlags.IOVDb.GlobalTag = 'OFLCOND-MC16-SDR-16'
     ConfigFlags.Digitization.PileUp = False
diff --git a/TileCalorimeter/TileSimAlgs/python/TileMuonReceiverConfig.py b/TileCalorimeter/TileSimAlgs/python/TileMuonReceiverConfig.py
index f5959fc20fa55b672e1f1636a5c6dc7edee1933a..6358e2f49315bb5339d7a32a5b399aaeb6e8bacd 100644
--- a/TileCalorimeter/TileSimAlgs/python/TileMuonReceiverConfig.py
+++ b/TileCalorimeter/TileSimAlgs/python/TileMuonReceiverConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 """Define method to construct configured Tile pulse for muon receiver algorithm"""
 
@@ -138,7 +138,7 @@ if __name__ == "__main__":
     # Test setup
     log.setLevel(DEBUG)
 
-    ConfigFlags.Input.Files = defaultTestFiles.HITS
+    ConfigFlags.Input.Files = defaultTestFiles.HITS_RUN2
     ConfigFlags.Output.RDOFileName = 'myRDO.pool.root'
     ConfigFlags.IOVDb.GlobalTag = 'OFLCOND-MC16-SDR-16'
     ConfigFlags.Digitization.PileUp = False
diff --git a/TileCalorimeter/TileSimAlgs/python/TileMuonReceiverDecisionConfig.py b/TileCalorimeter/TileSimAlgs/python/TileMuonReceiverDecisionConfig.py
index e3ec2bf4f259882b2ea3fc008a4bdb275fbaf78a..0d24cdca01cfd4e13cbd2cee2c5e7b4d1a063801 100644
--- a/TileCalorimeter/TileSimAlgs/python/TileMuonReceiverDecisionConfig.py
+++ b/TileCalorimeter/TileSimAlgs/python/TileMuonReceiverDecisionConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 """Define method to construct configured Tile muon receiver decision algorithm"""
 
@@ -83,7 +83,7 @@ if __name__ == "__main__":
     # Test setup
     log.setLevel(DEBUG)
 
-    ConfigFlags.Input.Files = defaultTestFiles.RDO
+    ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
     ConfigFlags.Tile.RunType = 'PHY'
     ConfigFlags.Output.RDOFileName = 'myRDO.pool.root'
     ConfigFlags.IOVDb.GlobalTag = 'OFLCOND-MC16-SDR-16'
diff --git a/Tracking/TrkConfig/python/AtlasExtrapolatorConfig.py b/Tracking/TrkConfig/python/AtlasExtrapolatorConfig.py
index bc0932e052a62464b6077c6ccf75ec72bb56b095..1dc48f7361b938c351a8fb20600553978bc060ea 100644
--- a/Tracking/TrkConfig/python/AtlasExtrapolatorConfig.py
+++ b/Tracking/TrkConfig/python/AtlasExtrapolatorConfig.py
@@ -303,7 +303,7 @@ if __name__ == "__main__":
     from AthenaCommon.Logging import logging
     Configurable.configurableRun3Behavior = True
 
-    ConfigFlags.Input.Files = defaultTestFiles.RDO
+    ConfigFlags.Input.Files = defaultTestFiles.RDO_RUN2
     ConfigFlags.fillFromArgs()
     ConfigFlags.lock()
     ConfigFlags.dump()