diff --git a/AsgExternal/Asg_Test/CMakeLists.txt b/AsgExternal/Asg_Test/CMakeLists.txt
index d5951cc2d425062756426e739568a3a575533b44..290fdef5fd224e8aadc5a041cd728e49e911ed5a 100644
--- a/AsgExternal/Asg_Test/CMakeLists.txt
+++ b/AsgExternal/Asg_Test/CMakeLists.txt
@@ -1,4 +1,4 @@
-# $Id: CMakeLists.txt 782126 2016-11-03 13:55:04Z krasznaa $
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # The name of the package:
 atlas_subdir( Asg_Test )
diff --git a/AsgExternal/Asg_Test/cmt/TestFileData.txt b/AsgExternal/Asg_Test/cmt/TestFileData.txt
index f40be8e214cac0a32f8117e274420879f21fff63..76debb62cc4b326a6c795cc0eb38d5eef6e47b5b 100644
--- a/AsgExternal/Asg_Test/cmt/TestFileData.txt
+++ b/AsgExternal/Asg_Test/cmt/TestFileData.txt
@@ -1 +1 @@
-/afs/cern.ch/atlas/project/PAT/xAODs/r9264/data16_13TeV.00311321.physics_Main.recon.AOD.r9264/AOD.11038520._000001.pool.root.1
+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CommonInputs/DAOD_PHYSVAL/data16_13TeV.00311321.physics_Main.DAOD_PHYSVAL.r9264_AthDerivation-21.2.1.0.root
diff --git a/AsgExternal/Asg_Test/cmt/TestFileMC.txt b/AsgExternal/Asg_Test/cmt/TestFileMC.txt
index 2487865f5dc49a50b9c44b8bd487276f785f4ab2..99c17876becc8ba7627a253e80b29d5058d5de11 100644
--- a/AsgExternal/Asg_Test/cmt/TestFileMC.txt
+++ b/AsgExternal/Asg_Test/cmt/TestFileMC.txt
@@ -1 +1 @@
-/afs/cern.ch/atlas/project/PAT/xAODs/r9315/mc16_13TeV.410501.PowhegPythia8EvtGen_A14_ttbar_hdamp258p75_nonallhad.merge.AOD.e5458_s3126_r9364_r9315/AOD.11182705._000001.pool.root.1
+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CommonInputs/DAOD_PHYSVAL/mc16_13TeV.410501.PowhegPythia8EvtGen_A14_ttbar_hdamp258p75_nonallhad.DAOD_PHYSVAL.e5458_s3126_r9364_r9315_AthDerivation-21.2.1.0.root
diff --git a/AsgExternal/Asg_Test/cmt/TestFileMCAFII.txt b/AsgExternal/Asg_Test/cmt/TestFileMCAFII.txt
index 7f2c6c3e2d296a393147294e7d3c75e52f2546dc..36a480b197713e06cc8070ef59b4037394a52f74 100644
--- a/AsgExternal/Asg_Test/cmt/TestFileMCAFII.txt
+++ b/AsgExternal/Asg_Test/cmt/TestFileMCAFII.txt
@@ -1 +1 @@
-/afs/cern.ch/user/a/asgbase/patspace/xAODs/a818/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.merge.AOD.e3698_a766_a818_r7676/AOD.07919492._000100.pool.root.1
+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CommonInputs/DAOD_PHYSVAL/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.DAOD_PHYSVAL.e4993_s3189_r9524_AthDerivation-21.2.1.0.root
diff --git a/AsgExternal/Asg_Test/cmt/setup_external.RootCore.csh b/AsgExternal/Asg_Test/cmt/setup_external.RootCore.csh
deleted file mode 100644
index 1bcceace02472cd6ed2b04439495750f07ffd9b8..0000000000000000000000000000000000000000
--- a/AsgExternal/Asg_Test/cmt/setup_external.RootCore.csh
+++ /dev/null
@@ -1,7 +0,0 @@
-Asg_Test_Dir=`dirname $1`
-setenv ROOTCORE_RELEASE_SERIES `cat $Asg_Test_Dir/ReleaseSeries.txt`
-setenv ASG_TEST_FILE_DATA `cat $Asg_Test_Dir/TestFileData.txt`
-setenv ASG_TEST_FILE_MC `cat $Asg_Test_Dir/TestFileMC.txt`
-setenv ASG_TEST_FILE_MC_AFII `cat $Asg_Test_Dir/TestFileMCAFII.txt`
-setenv ROOTCORE_TEST_FILE `cat $Asg_Test_Dir/TestFileMC.txt`
-setenv ROOTCORE_TEST_DATA "`dirname $ROOTCORE_TEST_FILE | xargs dirname`"
diff --git a/AsgExternal/Asg_Test/cmt/setup_external.RootCore.sh b/AsgExternal/Asg_Test/cmt/setup_external.RootCore.sh
deleted file mode 100644
index ae408270bad9194c699694c3928adb564db5ab98..0000000000000000000000000000000000000000
--- a/AsgExternal/Asg_Test/cmt/setup_external.RootCore.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-Asg_Test_Dir=`dirname $1`
-export ROOTCORE_RELEASE_SERIES=`cat $Asg_Test_Dir/ReleaseSeries.txt`
-export ASG_TEST_FILE_DATA=`cat $Asg_Test_Dir/TestFileData.txt`
-export ASG_TEST_FILE_MC=`cat $Asg_Test_Dir/TestFileMC.txt`
-export ASG_TEST_FILE_MC_AFII=`cat $Asg_Test_Dir/TestFileMCAFII.txt`
-export ROOTCORE_TEST_FILE=`cat $Asg_Test_Dir/TestFileMC.txt`
-export ROOTCORE_TEST_DATA="`dirname $ROOTCORE_TEST_FILE | xargs dirname`"