diff --git a/AtlasTest/CITest/Athena.cmake b/AtlasTest/CITest/Athena.cmake
index 719f61789be9d77363e1ffd9a4a14ebd4f00d216..980ff577a35248cf2e8f5a64593cb461b1978f59 100644
--- a/AtlasTest/CITest/Athena.cmake
+++ b/AtlasTest/CITest/Athena.cmake
@@ -51,14 +51,14 @@ atlas_add_citest( OverlayRun3MC_Legacy
 #################################################################################
 
 atlas_add_citest( RecoRun2Data
-   SCRIPT RunWorkflowTests_Run2.py --CI -r -w DataReco -e '--maxEvents 25' )
+   SCRIPT RunWorkflowTests_Run2.py --CI -r -w DataReco -e '--CA True --maxEvents 25' )
 
-atlas_add_citest( RecoRun2Data_CAConfig
-   SCRIPT RunWorkflowTests_Run2.py --CI -r -w DataReco -e '--CA --maxEvents 25' --no-output-checks )
+atlas_add_citest( RecoRun2Data_Legacy
+   SCRIPT RunWorkflowTests_Run2.py --CI -r -w DataReco -e '--CA False --maxEvents 25' --no-output-checks )
 
 atlas_add_citest( RecoRun2Data_LegacyVsCA
    SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/test/RecoLegacyVsCA.sh RecoRun2Data q442
-   DEPENDS_SUCCESS RecoRun2Data RecoRun2Data_CAConfig )
+   DEPENDS_SUCCESS RecoRun2Data RecoRun2Data_Legacy )
 
 atlas_add_citest( DerivationRun2Data_PHYS
    SCRIPT RunWorkflowTests_Run2.py --CI -d -w Derivation --tag data_PHYS --threads 4
@@ -69,14 +69,14 @@ atlas_add_citest( DerivationRun2Data_PHYSLITE
    PROPERTIES PROCESSORS 4 )
 
 atlas_add_citest( RecoRun2MC
-   SCRIPT RunWorkflowTests_Run2.py --CI -r -w MCReco --threads 0 -e '--maxEvents 25' )
+   SCRIPT RunWorkflowTests_Run2.py --CI -r -w MCReco --threads 0 -e '--CA "all:True" "RDOtoRDOTrigger:False" --maxEvents 25' --no-output-checks )
 
-atlas_add_citest( RecoRun2MC_CAConfig
-   SCRIPT RunWorkflowTests_Run2.py --CI -r -w MCReco -e '--CA --maxEvents 25' --no-output-checks )
+atlas_add_citest( RecoRun2MC_Legacy
+   SCRIPT RunWorkflowTests_Run2.py --CI -r -w MCReco -e '--CA False --maxEvents 25' )
 
 atlas_add_citest( RecoRun2MC_LegacyVsCA
    SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/test/RecoLegacyVsCA.sh RecoRun2MC q443
-   DEPENDS_SUCCESS RecoRun2MC RecoRun2MC_CAConfig )
+   DEPENDS_SUCCESS RecoRun2MC RecoRun2MC_Legacy )
 
 atlas_add_citest( RecoRun2MC_PileUp
    SCRIPT RunWorkflowTests_Run2.py --CI -p -w MCPileUpReco -e '--maxEvents 5 --inputRDO_BKGFile=../../PileUpPresamplingRun2/run_d1730/myRDO.pool.root' --no-output-checks  # go two levels up as the test runs in a subfolder
@@ -91,19 +91,19 @@ atlas_add_citest( DerivationRun2MC_PHYSLITE
    PROPERTIES PROCESSORS 4 )
 
 atlas_add_citest( RecoRun3Data
-   SCRIPT RunWorkflowTests_Run3.py --CI -r -w DataReco -a q449 --threads 8 -e '--maxEvents 100' --run-only
+   SCRIPT RunWorkflowTests_Run3.py --CI -r -w DataReco -a q449 --threads 8 -e '--CA True --maxEvents 100 --preExec pass' --run-only
    PROPERTIES PROCESSORS 8 )
 
 atlas_add_citest( RecoRun3Data_Checks
-   SCRIPT RunWorkflowTests_Run3.py --CI -r -w DataReco -a q449 --threads 8 -e '--maxEvents 100' --checks-only --output-path ../RecoRun3Data
+   SCRIPT RunWorkflowTests_Run3.py --CI -r -w DataReco -a q449 --threads 8 -e '--CA True --maxEvents 100 --preExec pass' --checks-only --output-path ../RecoRun3Data
    DEPENDS_SUCCESS RecoRun3Data )
 
-atlas_add_citest( RecoRun3Data_CAConfig
-   SCRIPT RunWorkflowTests_Run3.py --CI -r -w DataReco -e '--CA --maxEvents 100 --preExec pass' --threads 8 --no-output-checks )
+atlas_add_citest( RecoRun3Data_Legacy
+   SCRIPT RunWorkflowTests_Run3.py --CI -r -w DataReco -e '--CA False --maxEvents 100' --threads 8 --no-output-checks )
 
 atlas_add_citest( RecoRun3Data_LegacyVsCA
    SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/test/RecoLegacyVsCA.sh RecoRun3Data q449
-   DEPENDS_SUCCESS RecoRun3Data RecoRun3Data_CAConfig )
+   DEPENDS_SUCCESS RecoRun3Data RecoRun3Data_Legacy )
 
 atlas_add_citest( RecoRun3Data_Bulk
    SCRIPT RunWorkflowTests_Run3.py --CI -r -w DataReco -a f1262 --threads 8 -e '--skipEvents 100 --maxEvents 500 --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_13p6TeV.00431493.physics_Main.daq.RAW._lb0525._SFO-16._0001.data --postExec="all:FPEAuditor.NStacktracesOnFPE=20"' --run-only --no-output-checks
@@ -131,14 +131,14 @@ atlas_add_citest( DerivationRun3Data_PHYSLITE
    PROPERTIES PROCESSORS 4 )
 
 atlas_add_citest( RecoRun3MC
-   SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/test/RecoRun3MC.sh )
+   SCRIPT RunWorkflowTests_Run3.py --CI -r -w MCReco -e '--CA "all:True" "RDOtoRDOTrigger:False" --maxEvents 25' )
 
-atlas_add_citest( RecoRun3MC_CAConfig
-   SCRIPT RunWorkflowTests_Run3.py --CI -r -w MCReco -e '--CA --maxEvents 25' --no-output-checks )
+atlas_add_citest( RecoRun3MC_Legacy
+   SCRIPT RunWorkflowTests_Run3.py --CI -r -w MCReco -e '--CA False --maxEvents 25' --no-output-checks )
 
 atlas_add_citest( RecoRun3MC_LegacyVsCA
    SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/test/RecoLegacyVsCA.sh RecoRun3MC q445
-   DEPENDS_SUCCESS RecoRun3MC RecoRun3MC_CAConfig )
+   DEPENDS_SUCCESS RecoRun3MC RecoRun3MC_Legacy )
 
 atlas_add_citest( RecoRun3MC_PileUp
    SCRIPT RunWorkflowTests_Run3.py --CI -p -w MCPileUpReco -e '--maxEvents 5 --inputRDO_BKGFile=../../PileUpPresamplingRun3/run_d1760/myRDO.pool.root' --no-output-checks  # go two levels up as the test runs in a subfolder
@@ -206,14 +206,14 @@ atlas_add_citest( CPAlgorithmsRun3Data_PHYSLITE
 atlas_add_citest( DataQuality_r21ESD
    SCRIPT Run3DQTestingDriver.py 'Input.Files=["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/q431/21.0/myESD.pool.root"]' Output.HISTFileName='DataQuality_r21ESD_HIST.root' DQ.Steering.doHLTMon=False --threads=1 )
 
-atlas_add_citest( DataQuality_Run3MC
-   SCRIPT Run3DQTestingDriver.py 'Input.Files=["../RecoRun3MC/run_q445/myAOD.pool.root"]' DQ.Environment=AOD --threads=1
-   DEPENDS_SUCCESS RecoRun3MC )
-
 atlas_add_citest( DataQuality_r21ESD_Postprocessing
    SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/test/DataQuality_r21ESD_Postprocessing.sh
    DEPENDS_SUCCESS DataQuality_r21ESD )
 
+atlas_add_citest( DataQuality_Run3MC
+   SCRIPT Run3DQTestingDriver.py 'Input.Files=["../RecoRun3MC/run_q445/myAOD.pool.root"]' DQ.Environment=AOD DQ.Steering.doHLTMon=False --threads=1
+   DEPENDS_SUCCESS RecoRun3MC )
+
 atlas_add_citest( DataQuality_Run3Data_AODtoHIST
    SCRIPT Reco_tf.py --AMI=q449 --inputAODFile="../RecoRun3Data/run_q449/myAOD.pool.root" --outputHISTFile=DataQuality_Run3Data_AODtoHIST.root  --athenaopts='--threads=1'
    DEPENDS_SUCCESS RecoRun3Data )
diff --git a/AtlasTest/CITest/test/RecoLegacyVsCA.sh b/AtlasTest/CITest/test/RecoLegacyVsCA.sh
index c6773dfeefd1b16609bf34dad0ed34672d39fd9e..218a0676032d025f85d8da0f21fe14deb5a19dbf 100755
--- a/AtlasTest/CITest/test/RecoLegacyVsCA.sh
+++ b/AtlasTest/CITest/test/RecoLegacyVsCA.sh
@@ -4,8 +4,12 @@ set -e
 
 # Compare reco outputs of legacy and CA config
 xAODDigest.py --extravars "../${1}/run_${2}/myAOD.pool.root" "${1}_${2}_digest_legacy.txt"
-xAODDigest.py --extravars "../${1}_CAConfig/run_${2}/myAOD.pool.root" "${1}_${2}_digest_CA.txt"
+xAODDigest.py --extravars "../${1}_Legacy/run_${2}/myAOD.pool.root" "${1}_${2}_digest_CA.txt"
 
 comparexAODDigest.py "${1}_${2}_digest_legacy.txt" "${1}_${2}_digest_CA.txt" 
 
-acmd.py diff-root "../${1}/run_${2}/myAOD.pool.root" "../${1}_CAConfig/run_${2}/myAOD.pool.root" --nan-equal --error-mode resilient --ignore-leaves index_ref TrigNavigationAux EventInfoAux MuonTruthParticlesAuxDyn --order-trees --entries 10 --mode semi-detailed
+acmd.py diff-root "../${1}_Legacy/run_${2}/myAOD.pool.root" "../${1}/run_${2}/myAOD.pool.root" \
+  --nan-equal --error-mode resilient --ignore-leaves index_ref \
+  TrigNavigationAux EventInfoAux \
+  MuonTruthParticlesAuxDyn \
+  --order-trees --entries 10 --mode semi-detailed
diff --git a/AtlasTest/CITest/test/RecoRun3MC.sh b/AtlasTest/CITest/test/RecoRun3MC.sh
deleted file mode 100755
index 2bbdf8343389e5cdc967b9b8841f81a5ade06d5e..0000000000000000000000000000000000000000
--- a/AtlasTest/CITest/test/RecoRun3MC.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
-
-# Run-3 MC but with AODFULL so it can be used as input to the HLT DQ monitoring.
-# Once ATLASDQ-879 is fixed, this script can be deleted and the test defintion
-# (without the --preExec) moved to Athena.cmake.
-
-RunWorkflowTests_Run3.py --CI -r -w MCReco -e '--maxEvents 25 --preExec="all:from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Trigger.AODEDMSet=\"AODFULL\""'
diff --git a/Tools/PROCTools/data/q442_AOD_content.ref b/Tools/PROCTools/data/q442_AOD_content.ref
index b021cba024b98adac10e2b71674b166a889e167d..7693f4de2f0d9daf6c75fa82748eea6d4b52a55c 100644
--- a/Tools/PROCTools/data/q442_AOD_content.ref
+++ b/Tools/PROCTools/data/q442_AOD_content.ref
@@ -183,7 +183,6 @@ EventInfoAuxDyn.mcEventNumber
 EventInfoAuxDyn.mcEventWeights
 EventInfoAuxDyn.streamTagDets
 EventInfoAuxDyn.streamTagRobs
-EventInfo_p4
 EventNumber
 EventTime
 EventTimeNanoSec
@@ -221,6 +220,7 @@ ExtrapolatedStauTrackParticles
 ExtrapolatedStauTrackParticlesAux.
 FileMetaData
 FileMetaDataAux.
+FileMetaDataAuxDyn.amiTag
 FileMetaDataAuxDyn.beamEnergy
 FileMetaDataAuxDyn.beamType
 FileMetaDataAuxDyn.conditionsTag
@@ -658,8 +658,6 @@ InDetTrackParticlesAuxDyn.nBC_meas
 InDetTrackParticlesAuxDyn.trackLink
 InDetTrackParticlesClusterAssociations
 InDetTrackParticlesClusterAssociationsAux.
-IncompleteLumiBlocks
-IncompleteLumiBlocksAux.
 IsCalibration
 IsSimulation
 IsTestBeam
diff --git a/Tools/PROCTools/data/q445_AOD_content.ref b/Tools/PROCTools/data/q445_AOD_content.ref
index ae366d78c5a4551b8a3881ad23b1ceb2e972ec2f..b35ea128d564ab1d707f03e0fd8ed4af3c35b6a1 100644
--- a/Tools/PROCTools/data/q445_AOD_content.ref
+++ b/Tools/PROCTools/data/q445_AOD_content.ref
@@ -1,13 +1,3 @@
-AFPProtonContainer
-AFPProtonContainerAux.
-AFPSiHitsClusterContainer
-AFPSiHitsClusterContainerAux.
-AFPToFTrackContainer
-AFPToFTrackContainerAux.
-AFPTrackContainer
-AFPTrackContainerAux.
-AFPVertexContainer
-AFPVertexContainerAux.
 AllCalo
 BunchConfKey
 BunchId
@@ -196,7 +186,6 @@ EventInfoAuxDyn.onlineBeamTiltXZ
 EventInfoAuxDyn.onlineBeamTiltYZ
 EventInfoAuxDyn.streamTagDets
 EventInfoAuxDyn.streamTagRobs
-EventInfo_p4
 EventNumber
 EventTime
 EventTimeNanoSec
@@ -1740,7 +1729,6 @@ MSOnlyExtrapolatedMuonTrackParticlesAuxDyn.truthType
 MSonlyTracklets
 MSonlyTrackletsAux.
 McChannel
-MuonCandidates_FS_ROIs
 MuonClusterCollection
 MuonClusterCollectionAux.
 MuonClusterCollectionAuxDyn.CellLink
@@ -2025,8 +2013,6 @@ StausAuxDyn.truthParticleLink
 StausAuxDyn.truthType
 StausAuxDyn.z0_staco
 StreamAOD
-SuspectLumiBlocks
-SuspectLumiBlocksAux.
 TauFinalPi0s
 TauFinalPi0sAux.
 TauFinalPi0sAuxDyn.pi0PFOLinks
diff --git a/Tools/PROCTools/data/q449_AOD_content.ref b/Tools/PROCTools/data/q449_AOD_content.ref
index d94a0cf502f853ad173ca618bcc20046dfb0d59a..a812dbb7cd7d62a9233ec9c341affa052529df2e 100644
--- a/Tools/PROCTools/data/q449_AOD_content.ref
+++ b/Tools/PROCTools/data/q449_AOD_content.ref
@@ -207,7 +207,6 @@ EventInfoAuxDyn.mcEventNumber
 EventInfoAuxDyn.mcEventWeights
 EventInfoAuxDyn.streamTagDets
 EventInfoAuxDyn.streamTagRobs
-EventInfo_p4
 EventNumber
 EventTime
 EventTimeNanoSec
@@ -270,6 +269,7 @@ ExtrapolatedStauTrackParticles
 ExtrapolatedStauTrackParticlesAux.
 FileMetaData
 FileMetaDataAux.
+FileMetaDataAuxDyn.amiTag
 FileMetaDataAuxDyn.beamEnergy
 FileMetaDataAuxDyn.beamType
 FileMetaDataAuxDyn.conditionsTag
@@ -1525,8 +1525,6 @@ JetETMissNeutralParticleFlowObjectsAuxDyn.SECOND_R
 JetETMissNeutralParticleFlowObjectsAuxDyn.TIMING
 L1TopoErrorFlags_Legacy
 L1TopoErrorFlags_LegacyAux.
-L1TopoRawData
-L1TopoRawDataAux.
 L1_cTauRoI
 L1_cTauRoIAux.
 L1_eEMRoI
@@ -1968,8 +1966,6 @@ StausAuxDyn.qOverP_staco
 StausAuxDyn.theta_staco
 StausAuxDyn.z0_staco
 StreamAOD
-SuspectLumiBlocks
-SuspectLumiBlocksAux.
 TauFinalPi0s
 TauFinalPi0sAux.
 TauFinalPi0sAuxDyn.pi0PFOLinks
diff --git a/Tools/PyUtils/bin/meta-reader.py b/Tools/PyUtils/bin/meta-reader.py
index 6c598284378a73878f6d1620d131c87143e218f8..0e449d0701e9bb713cf2b1092a341445eaf214bc 100755
--- a/Tools/PyUtils/bin/meta-reader.py
+++ b/Tools/PyUtils/bin/meta-reader.py
@@ -44,7 +44,7 @@ def _tree_print(content, indent=2, pad=0, list_max_items=-1, dict_sort=None, asc
 				continue
 
 			if hide_trigger and key in [
-				'TriggerMenu', 'TriggerMenuJson_HLT', 'TriggerMenuJson_HLTMonitoring', 'TriggerMenuJson_HLTPS', 'TriggerMenuJson_L1', 'TriggerMenuJson_L1PS',
+				'TriggerMenu', 'TriggerMenuJson_BG', 'TriggerMenuJson_HLT', 'TriggerMenuJson_HLTMonitoring', 'TriggerMenuJson_HLTPS', 'TriggerMenuJson_L1', 'TriggerMenuJson_L1PS',
 				'/TRIGGER/HLT/Groups', '/TRIGGER/HLT/HltConfigKeys', '/TRIGGER/HLT/Menu', '/TRIGGER/HLT/PrescaleKey', '/TRIGGER/HLT/Prescales',
 				'/TRIGGER/LVL1/ItemDef', '/TRIGGER/LVL1/Lvl1ConfigKey', '/TRIGGER/LVL1/Menu', '/TRIGGER/LVL1/Prescales', '/TRIGGER/LVL1/Thresholds',
 			]:
diff --git a/Tools/PyUtils/python/MetaReader.py b/Tools/PyUtils/python/MetaReader.py
index 2fa9dec0952c1c5b62d34e2eff26a34c653cb021..cd7e8ce448eb8d1ff6c7668e2cc3f27584c7e7ec 100644
--- a/Tools/PyUtils/python/MetaReader.py
+++ b/Tools/PyUtils/python/MetaReader.py
@@ -956,11 +956,7 @@ def _extract_fields_triggermenujson(interface, aux):
                 result['HLTChains'] = [ _convert_value(chain) for chain in decoded['chains'] ] 
             elif decoded['filetype'] == 'l1menu':
                 result['L1Items'] = [ _convert_value(item) for item in decoded['items'] ] 
-            elif decoded['filetype'] == 'hltprescale':
-                return result
-            elif decoded['filetype'] == 'l1prescale':
-                return result
-            elif decoded['filetype'] == 'hltmonitoringsummary':
+            elif decoded['filetype'] in ['bunchgroupset', 'hltprescale', 'l1prescale', 'hltmonitoringsummary']:
                 return result
 
             else:
diff --git a/Tools/WorkflowTestRunner/python/References.py b/Tools/WorkflowTestRunner/python/References.py
index 9be73fb9a0fe81205675de076090ab9867a7e9f3..b009b5922437e45427a5571bfd622c9f84c15940 100644
--- a/Tools/WorkflowTestRunner/python/References.py
+++ b/Tools/WorkflowTestRunner/python/References.py
@@ -22,8 +22,8 @@ references_map = {
     "d1726": "v11",
     "d1759": "v21",
     # Reco
-    "q442": "v11",
+    "q442": "v12",
     "q443": "v14",
-    "q445": "v16",
-    "q449": "v20",
+    "q445": "v17",
+    "q449": "v21",
 }
diff --git a/Tools/WorkflowTestRunner/python/StandardTests.py b/Tools/WorkflowTestRunner/python/StandardTests.py
index 785c92c7fead5d81b67145791586a0890697b63d..6150703b185ce3bf3f6f1b1448fac32c04019d3a 100644
--- a/Tools/WorkflowTestRunner/python/StandardTests.py
+++ b/Tools/WorkflowTestRunner/python/StandardTests.py
@@ -44,11 +44,14 @@ class QTest(WorkflowTest):
         #     self.output_checks.append(FrozenTier0PolicyCheck(setup, "RDO", 10))
         self.output_checks.append(FrozenTier0PolicyCheck(setup, "AOD", 60))
         self.output_checks.append(FrozenTier0PolicyCheck(setup, "ESD", 20))
+        if "CA" not in extra_args or "--CA True" in extra_args:
+            self.output_checks.append(MetadataCheck(setup, "AOD"))
+            self.output_checks.append(MetadataCheck(setup, "ESD"))
 
         self.digest_checks = []
-        if "--CA" not in extra_args:
+        if not setup.disable_output_checks:
             self.digest_checks.append(AODContentCheck(setup))
-            self.digest_checks.append(AODDigestCheck(setup))
+        self.digest_checks.append(AODDigestCheck(setup))
 
         super().__init__(ID, run, type, steps, setup)
 
diff --git a/Tools/WorkflowTestRunner/scripts/RunWorkflowTests_Run2.py b/Tools/WorkflowTestRunner/scripts/RunWorkflowTests_Run2.py
index 270b5478f75b2bf1e00e624901f79c2b4b9f2e4a..cb57db934f32f6731eb5bdcbdedaff5a9ffe4e57 100755
--- a/Tools/WorkflowTestRunner/scripts/RunWorkflowTests_Run2.py
+++ b/Tools/WorkflowTestRunner/scripts/RunWorkflowTests_Run2.py
@@ -47,10 +47,7 @@ def main():
         tests_to_run.append(DerivationTest(test_id, run, WorkflowType.Derivation, ["Derivation"], setup, options.extra_args))
     else:
         if not options.workflow or options.workflow is WorkflowType.MCReco:
-            if "--CA" in options.extra_args:
-                tests_to_run.append(QTest("q443", run, WorkflowType.MCReco, ["HITtoRDO", "RAWtoALL"], setup, options.extra_args + " --steering no"))
-            else:
-                tests_to_run.append(QTest("q443", run, WorkflowType.MCReco, ["HITtoRDO", "RDOtoRDOTrigger", "RAWtoALL"], setup, options.extra_args))
+            tests_to_run.append(QTest("q443", run, WorkflowType.MCReco, ["HITtoRDO", "RDOtoRDOTrigger", "RAWtoALL"], setup, options.extra_args))
         if not options.workflow or options.workflow is WorkflowType.DataReco:
             tests_to_run.append(QTest("q442", run, WorkflowType.DataReco, ["RAWtoALL", "DQHistogramMerge"], setup, options.extra_args))
 
diff --git a/Tools/WorkflowTestRunner/scripts/RunWorkflowTests_Run3.py b/Tools/WorkflowTestRunner/scripts/RunWorkflowTests_Run3.py
index d62139a993a2049a2d5f409f9c3f0b04d8f882d5..8d63a0f6f4f5659132eabe2bd5236b37ae199d1d 100755
--- a/Tools/WorkflowTestRunner/scripts/RunWorkflowTests_Run3.py
+++ b/Tools/WorkflowTestRunner/scripts/RunWorkflowTests_Run3.py
@@ -54,10 +54,7 @@ def main():
     else:
         if not options.workflow or options.workflow is WorkflowType.MCReco:
             ami_tag = "q445" if not options.ami_tag else options.ami_tag
-            if "--CA" in options.extra_args:
-                tests_to_run.append(QTest(ami_tag, run, WorkflowType.MCReco, ["HITtoRDO", "RAWtoALL"], setup, options.extra_args + " --steering no"))
-            else:
-                tests_to_run.append(QTest(ami_tag, run, WorkflowType.MCReco, ["HITtoRDO", "RDOtoRDOTrigger", "RAWtoALL"], setup, options.extra_args))
+            tests_to_run.append(QTest(ami_tag, run, WorkflowType.MCReco, ["HITtoRDO", "RDOtoRDOTrigger", "RAWtoALL"], setup, options.extra_args))
         if not options.workflow or options.workflow is WorkflowType.DataReco:
             ami_tag = "q449" if not options.ami_tag else options.ami_tag
             tests_to_run.append(QTest(ami_tag, run, WorkflowType.DataReco, ["RAWtoALL", "DQHistogramMerge"], setup, options.extra_args))