diff --git a/Event/xAOD/xAODTrackingAthenaPool/CMakeLists.txt b/Event/xAOD/xAODTrackingAthenaPool/CMakeLists.txt
index 37a2b654c08a557261b2e0691c6877294808222f..dd31c801fa8220ba98d3f937e6fb01e77865c414 100644
--- a/Event/xAOD/xAODTrackingAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODTrackingAthenaPool/CMakeLists.txt
@@ -35,6 +35,7 @@ atlas_add_poolcnv_library( xAODTrackingAthenaPoolPoolCnv
 
 # Install files from the package.
 atlas_install_joboptions( share/*.py )
+atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 
 # Set up (a) test(s) for the converter(s):
 find_package( AthenaPoolUtilitiesTest )
@@ -42,16 +43,16 @@ find_package( AthenaPoolUtilitiesTest )
 if( ATHENAPOOLUTILITIESTEST_FOUND )
   set( XAODTRACKINGATHENAPOOL_REFERENCE_TAG
        xAODTrackingAthenaPoolReference-02-01-00 )
-  run_tpcnv_legacy_test( xAODTrackingAthenaPool_20.1.7.2   AOD-20.1.7.2-full
+  run_tpcnv_test( xAODTrackingAthenaPool_20.1.7.2   AOD-20.1.7.2-full
                    REQUIRED_LIBRARIES xAODTrackingAthenaPoolPoolCnv
                    REFERENCE_TAG ${XAODTRACKINGATHENAPOOL_REFERENCE_TAG} )
-  run_tpcnv_legacy_test( xAODTrackingAthenaPool_20.7.2.2   AOD-20.7.2.2-full
+  run_tpcnv_test( xAODTrackingAthenaPool_20.7.2.2   AOD-20.7.2.2-full
                    REQUIRED_LIBRARIES xAODTrackingAthenaPoolPoolCnv
                    REFERENCE_TAG ${XAODTRACKINGATHENAPOOL_REFERENCE_TAG} )
-  run_tpcnv_legacy_test( xAODTrackingAthenaPool_21.0.79   AOD-21.0.79-full
+  run_tpcnv_test( xAODTrackingAthenaPool_21.0.79   AOD-21.0.79-full
                    REQUIRED_LIBRARIES xAODTrackingAthenaPoolPoolCnv
                    REFERENCE_TAG ${XAODTRACKINGATHENAPOOL_REFERENCE_TAG} )
-  run_tpcnv_legacy_test( xAODTrackingAthenaPool_master-20190911   AOD-master-20190911-full
+  run_tpcnv_test( xAODTrackingAthenaPool_master-20190911   AOD-master-20190911-full
                    REQUIRED_LIBRARIES xAODTrackingAthenaPoolPoolCnv
                    REFERENCE_TAG ${XAODTRACKINGATHENAPOOL_REFERENCE_TAG} )
 else()
diff --git a/Event/xAOD/xAODTrackingAthenaPool/share/xAODTrackingAthenaPool_21.0.79.ref b/Event/xAOD/xAODTrackingAthenaPool/share/xAODTrackingAthenaPool_21.0.79.ref
index a3ec9ce7fc2131a41d5b0f5bc3da07d1771b18eb..b36f62aa60821799d052ad19860ac2a8dd200050 100644
--- a/Event/xAOD/xAODTrackingAthenaPool/share/xAODTrackingAthenaPool_21.0.79.ref
+++ b/Event/xAOD/xAODTrackingAthenaPool/share/xAODTrackingAthenaPool_21.0.79.ref
@@ -510,8 +510,6 @@ IOVDbSvc             INFO Disconnecting from COOLOFL_TRT/OFLP200
 Domain[ROOT_All]     INFO ->  Access   DbDatabase   READ      [ROOT_All] C634B46D-ECB2-A045-91CC-00A82369D887
 Domain[ROOT_All]     INFO                           /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000070.gen.COND/cond12_data.000029.gen.COND._0001.pool.root
 RootDatabase.open    INFO /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000070.gen.COND/cond12_data.000029.gen.COND._0001.pool.root File version:53005
-PixelDetectorMa...WARNING Cannot set AlignableTransform for identifier  [2.1.0.0.0.-4.256.0] at level 2
-PixelDetectorMa...WARNING Subsequent WARNINGS will be printed at DEBUG level.
 PixelDetectorMa...   INFO Processing IBLDist alignment container with key (/Indet/IBLDist) and alignment folder pointing to /Indet/Align
 Domain[ROOT_All]     INFO ->  Access   DbDatabase   READ      [ROOT_All] D67CA215-C5CB-DF11-954C-000423DC2158
 Domain[ROOT_All]     INFO                           /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000019.gen.COND/cond09_mc.000019.gen.COND._0010.pool.root
diff --git a/Event/xAOD/xAODTrackingAthenaPool/share/xAODTrackingAthenaPool_master-20190911.ref b/Event/xAOD/xAODTrackingAthenaPool/share/xAODTrackingAthenaPool_master-20190911.ref
index 4e33097dd9a7ef3e91c73e4c9e0328655807fa03..0b57015c875dd7b4fcb2f128e0ad951cf2140319 100644
--- a/Event/xAOD/xAODTrackingAthenaPool/share/xAODTrackingAthenaPool_master-20190911.ref
+++ b/Event/xAOD/xAODTrackingAthenaPool/share/xAODTrackingAthenaPool_master-20190911.ref
@@ -510,8 +510,6 @@ IOVDbSvc             INFO Disconnecting from COOLOFL_TRT/OFLP200
 Domain[ROOT_All]     INFO ->  Access   DbDatabase   READ      [ROOT_All] C634B46D-ECB2-A045-91CC-00A82369D887
 Domain[ROOT_All]     INFO                           /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000070.gen.COND/cond12_data.000029.gen.COND._0001.pool.root
 RootDatabase.open    INFO /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000070.gen.COND/cond12_data.000029.gen.COND._0001.pool.root File version:53005
-PixelDetectorMa...WARNING Cannot set AlignableTransform for identifier  [2.1.0.0.0.-4.256.0] at level 2
-PixelDetectorMa...WARNING Subsequent WARNINGS will be printed at DEBUG level.
 PixelDetectorMa...   INFO Processing IBLDist alignment container with key (/Indet/IBLDist) and alignment folder pointing to /Indet/Align
 Domain[ROOT_All]     INFO ->  Access   DbDatabase   READ      [ROOT_All] D67CA215-C5CB-DF11-954C-000423DC2158
 Domain[ROOT_All]     INFO                           /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000019.gen.COND/cond09_mc.000019.gen.COND._0010.pool.root
diff --git a/Event/xAOD/xAODTrackingAthenaPool/test/xAODTrackingAthenaPool_20.1.7.2_test.py b/Event/xAOD/xAODTrackingAthenaPool/test/xAODTrackingAthenaPool_20.1.7.2_test.py
new file mode 100755
index 0000000000000000000000000000000000000000..50278082af8ac5c446181e744f2e450fdd949ae5
--- /dev/null
+++ b/Event/xAOD/xAODTrackingAthenaPool/test/xAODTrackingAthenaPool_20.1.7.2_test.py
@@ -0,0 +1,65 @@
+#!/usr/bin/env python
+"""
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""
+
+from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
+
+if __name__ == "__main__":
+
+    infile = 'aod/AOD-20.1.7.2/AOD-20.1.7.2-full.pool.root'
+    keys = [
+        #xAOD::TrackParticle
+
+
+        'CombinedMuonTrackParticles',
+        'CombinedStauTrackParticles',
+        'ExtrapolatedMuonTrackParticles',
+        'ExtrapolatedStauTrackParticles',
+        'GSFTrackParticles',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_FTF',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_IDTrig',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bphysics_FTF',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bphysics_IDTrig',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_EFID',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_EFID',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_FTF',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_IDTrig',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_TauCore_FTF',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_TauIso_FTF',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_EFID',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_FTF',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_IDTrig',
+        'HLT_xAOD__TrackParticleContainer_MuTagIMO_EF_CombTrackParticles',
+        'HLT_xAOD__TrackParticleContainer_MuTagIMO_EF_ExtrapTrackParticles',
+        'HLT_xAOD__TrackParticleContainer_MuonEFInfo_CombTrackParticles',
+        'HLT_xAOD__TrackParticleContainer_MuonEFInfo_ExtrapTrackParticles',
+        'HLT_xAOD__TrackParticleContainer_eMuonEFInfo_CombTrackParticles',
+        'HLT_xAOD__TrackParticleContainer_eMuonEFInfo_ExtrapTrackParticles',
+        'InDetForwardTrackParticles',
+        'InDetPixelPrdAssociationTrackParticles',
+        'InDetTrackParticles',
+        'MSonlyTracklets',
+        'MuonSpectrometerTrackParticles',
+
+        #xAOD::VertexAuxContainer_v1
+        'BTagging_AntiKt10LCTopoSecVtx',
+        'BTagging_AntiKt10TruthWZSecVtx',
+        'BTagging_AntiKt2TrackSecVtx',
+        'BTagging_AntiKt3TrackSecVtx',
+        'BTagging_AntiKt4EMTopoSecVtx',
+        'BTagging_AntiKt4LCTopoSecVtx',
+        'BTagging_AntiKt4TrackSecVtx',
+        'BTagging_AntiKt4TruthWZSecVtx',
+        'GSFConversionVertices',
+        'HLT_xAOD__VertexContainer_BjetSecondaryVertexFex',
+        'HLT_xAOD__VertexContainer_EFHistoPrmVtx',
+        'HLT_xAOD__VertexContainer_SecondaryVertex',
+        'HLT_xAOD__VertexContainer_xPrimVx',
+        'MSDisplacedVertex',
+        'PrimaryVertices',
+        'TauSecondaryVertices',
+             ]
+
+    TPCnvTest(infile, keys)
diff --git a/Event/xAOD/xAODTrackingAthenaPool/test/xAODTrackingAthenaPool_20.7.2.2_test.py b/Event/xAOD/xAODTrackingAthenaPool/test/xAODTrackingAthenaPool_20.7.2.2_test.py
new file mode 100755
index 0000000000000000000000000000000000000000..e475adc1880d5a6bc0494ea9d976629c93a8d813
--- /dev/null
+++ b/Event/xAOD/xAODTrackingAthenaPool/test/xAODTrackingAthenaPool_20.7.2.2_test.py
@@ -0,0 +1,63 @@
+#!/usr/bin/env python
+"""
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""
+
+from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
+
+if __name__ == "__main__":
+
+    infile = 'aod/AOD-20.7.2.2/AOD-20.7.2.2-full.pool.root'
+    keys = [
+        #xAOD::TrackParticleAuxContainer_v2
+        'CombinedMuonTrackParticles',
+        'CombinedStauTrackParticles',
+        'ExtrapolatedMuonTrackParticles',
+        'ExtrapolatedStauTrackParticles',
+        'GSFTrackParticles',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_FTF',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_IDTrig',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bphysics_FTF',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bphysics_IDTrig',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_EFID',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_EFID',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_FTF',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_IDTrig',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_TauCore_FTF',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_TauIso_FTF',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_EFID',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_FTF',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_IDTrig',
+        'HLT_xAOD__TrackParticleContainer_MuTagIMO_EF_CombTrackParticles',
+        'HLT_xAOD__TrackParticleContainer_MuTagIMO_EF_ExtrapTrackParticles',
+        'HLT_xAOD__TrackParticleContainer_MuonEFInfo_CombTrackParticles',
+        'HLT_xAOD__TrackParticleContainer_MuonEFInfo_ExtrapTrackParticles',
+        'HLT_xAOD__TrackParticleContainer_eMuonEFInfo_CombTrackParticles',
+        'HLT_xAOD__TrackParticleContainer_eMuonEFInfo_ExtrapTrackParticles',
+        'InDetForwardTrackParticles',
+        'InDetPixelPrdAssociationTrackParticles',
+        'InDetTrackParticles',
+        'MSonlyTracklets',
+        'MuonSpectrometerTrackParticles',
+
+        #xAOD::VertexAuxContainer_v1
+        'BTagging_AntiKt10LCTopoSecVtx',
+        'BTagging_AntiKt10TruthWZSecVtx',
+        'BTagging_AntiKt2TrackSecVtx',
+        'BTagging_AntiKt3TrackSecVtx',
+        'BTagging_AntiKt4EMTopoSecVtx',
+        'BTagging_AntiKt4LCTopoSecVtx',
+        'BTagging_AntiKt4TrackSecVtx',
+        'BTagging_AntiKt4TruthWZSecVtx',
+        'GSFConversionVertices',
+        'HLT_xAOD__VertexContainer_BjetSecondaryVertexFex',
+        'HLT_xAOD__VertexContainer_EFHistoPrmVtx',
+        'HLT_xAOD__VertexContainer_SecondaryVertex',
+        'HLT_xAOD__VertexContainer_xPrimVx',
+        'MSDisplacedVertex',
+        'PrimaryVertices',
+        'TauSecondaryVertices',
+             ]
+
+    TPCnvTest(infile, keys)
diff --git a/Event/xAOD/xAODTrackingAthenaPool/test/xAODTrackingAthenaPool_21.0.79_test.py b/Event/xAOD/xAODTrackingAthenaPool/test/xAODTrackingAthenaPool_21.0.79_test.py
new file mode 100755
index 0000000000000000000000000000000000000000..225a65d461c80d956ea18072cbd7ea0161c197b2
--- /dev/null
+++ b/Event/xAOD/xAODTrackingAthenaPool/test/xAODTrackingAthenaPool_21.0.79_test.py
@@ -0,0 +1,63 @@
+#!/usr/bin/env python
+"""
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""
+
+from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
+
+if __name__ == "__main__":
+
+    infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
+    keys = [
+        #xAOD::TrackParticleAuxContainer_v3
+        'CombinedMuonTrackParticles',
+        'CombinedStauTrackParticles',
+        'ExtrapolatedMuonTrackParticles',
+        'ExtrapolatedStauTrackParticles',
+        'GSFTrackParticles',
+        'HLT_xAOD__TrackParticleContainer_GSFTrigTrackParticles',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_FTK',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_FTKRefit',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_FTKRefit_IDTrig',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_FTK_IDTrig',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_IDTrig',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_BphysHighPt_IDTrig',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bphysics_IDTrig',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_IDTrig',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_FullScan_FTK',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_FullScan_FTKRefit',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_FTK',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_FTKRefit',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_FTKRefit_IDTrig',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_FTK_IDTrig',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_IDTrig',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_FTK',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_FTKRefit',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_FTKRefit_IDTrig',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_FTK_IDTrig',
+        'HLT_xAOD__TrackParticleContainer_MuonEFInfo_CombTrackParticles',
+        'HLT_xAOD__TrackParticleContainer_MuonEFInfo_CombTrackParticles_FullScan',
+        'HLT_xAOD__TrackParticleContainer_MuonEFInfo_ExtrapTrackParticles',
+        'HLT_xAOD__TrackParticleContainer_MuonEFInfo_ExtrapTrackParticles_FullScan',
+        'InDetForwardTrackParticles',
+        'InDetPixelPrdAssociationTrackParticles',
+        'MSOnlyExtrapolatedMuonTrackParticles',
+        'MSonlyTracklets',
+        'MuonSpectrometerTrackParticles',
+
+        #xAOD::VertexAuxContainer_v1
+        'BTagging_AntiKt4EMTopoSecVtx',
+        'GSFConversionVertices',
+        'HLT_xAOD__VertexContainer_BjetSecondaryVertexFex',
+        'HLT_xAOD__VertexContainer_EFHistoPrmVtx',
+        'HLT_xAOD__VertexContainer_PrimVertexFTK',
+        'HLT_xAOD__VertexContainer_PrimVertexFTKRaw',
+        'HLT_xAOD__VertexContainer_PrimVertexFTKRefit',
+        'HLT_xAOD__VertexContainer_SecondaryVertex',
+        'HLT_xAOD__VertexContainer_xPrimVx',
+        'MSDisplacedVertex',
+        'PrimaryVertices',
+        'TauSecondaryVertices',
+             ]
+
+    TPCnvTest(infile, keys)
diff --git a/Event/xAOD/xAODTrackingAthenaPool/test/xAODTrackingAthenaPool_master-20190911_test.py b/Event/xAOD/xAODTrackingAthenaPool/test/xAODTrackingAthenaPool_master-20190911_test.py
new file mode 100755
index 0000000000000000000000000000000000000000..94f4a7a03792047695c91832c26ee900cd32d385
--- /dev/null
+++ b/Event/xAOD/xAODTrackingAthenaPool/test/xAODTrackingAthenaPool_master-20190911_test.py
@@ -0,0 +1,64 @@
+#!/usr/bin/env python
+"""
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""
+
+from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
+
+if __name__ == "__main__":
+
+    infile = 'aod/AOD-master-20190911/AOD-master-20190911-full.pool.root'
+    keys = [
+        #xAOD::TrackParticleAuxContainer_v4
+        'CombinedMuonTrackParticles',
+        'CombinedStauTrackParticles',
+        'ExtrapolatedMuonTrackParticles',
+        'ExtrapolatedStauTrackParticles',
+        'GSFTrackParticles',
+        'HLT_xAOD__TrackParticleContainer_GSFTrigTrackParticles',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_FTK',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_FTKRefit',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_FTKRefit_IDTrig',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_FTK_IDTrig',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_IDTrig',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_BphysHighPt_IDTrig',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bphysics_IDTrig',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_IDTrig',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_FullScan_FTK',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_FullScan_FTKRefit',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_FTK',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_FTKRefit',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_FTKRefit_IDTrig',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_FTK_IDTrig',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_IDTrig',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_FTK',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_FTKRefit',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_FTKRefit_IDTrig',
+        'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_FTK_IDTrig',
+        'HLT_xAOD__TrackParticleContainer_MuonEFInfo_CombTrackParticles',
+        'HLT_xAOD__TrackParticleContainer_MuonEFInfo_CombTrackParticles_FullScan',
+        'HLT_xAOD__TrackParticleContainer_MuonEFInfo_ExtrapTrackParticles',
+        'HLT_xAOD__TrackParticleContainer_MuonEFInfo_ExtrapTrackParticles_FullScan',
+        'InDetDisappearingTrackParticles',
+        'InDetForwardTrackParticles',
+        'InDetTrackParticles',
+        'MSOnlyExtrapolatedMuonTrackParticles',
+        'MSonlyTracklets',
+        'MuonSpectrometerTrackParticles',
+
+        #xAOD::VertexAuxContainer_v1
+        'BTagging_AntiKt4EMTopoSecVtx',
+        'GSFConversionVertices',
+        'HLT_xAOD__VertexContainer_BjetSecondaryVertexFex',
+        'HLT_xAOD__VertexContainer_EFHistoPrmVtx',
+        'HLT_xAOD__VertexContainer_PrimVertexFTK',
+        'HLT_xAOD__VertexContainer_PrimVertexFTKRaw',
+        'HLT_xAOD__VertexContainer_PrimVertexFTKRefit',
+        'HLT_xAOD__VertexContainer_SecondaryVertex',
+        'HLT_xAOD__VertexContainer_xPrimVx',
+        'MSDisplacedVertex',
+        'PrimaryVertices',
+        'TauSecondaryVertices',
+             ]
+
+    TPCnvTest(infile, keys)