diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/ReadConstituent.icc b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/ReadConstituent.icc
index a5bb9a9c0c668a20aa411953e8706b70a6ff5b6c..e4d89cba840dc3575b6cea64b6871a8999d9f45b 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/ReadConstituent.icc
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/ReadConstituent.icc
@@ -18,6 +18,7 @@ static const int MAX_nCon = 128;
 template <class CONT> inline
 ReadConstituent<CONT>::ReadConstituent(const std::string& name, ISvcLocator* pSvcLocator)
   : AthAlgorithm(name, pSvcLocator),
+    m_ntuplePtr(nullptr),
     m_ContainerName("")
 {
   // Declare the properties
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/ReadINav4MomAssocs.h b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/ReadINav4MomAssocs.h
index 85d48b54e62b854a2f3c784d8b2feecb13c1693c..772ccc39c89662e25f30da23ff5263aa317c0332 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/ReadINav4MomAssocs.h
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/ReadINav4MomAssocs.h
@@ -20,8 +20,7 @@
 // FrameWork includes
 #include "AthenaBaseComps/AthAlgorithm.h"
 
-// DataModel includes
-#include "DataModel/ClassName.h"
+#include "SGTools/ClassName.h"
 
 class ReadINav4MomAssocs : public AthAlgorithm
 { 
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/ReadParticle.icc b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/ReadParticle.icc
index d495a5d2e508faeed58b6f2174cdf6e1570ae4c5..9e82435dce6ed27d7d005c26008c091e3f824f67 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/ReadParticle.icc
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/ReadParticle.icc
@@ -15,6 +15,7 @@ static const int MAX_nParticle = 128;
 template <class PARTICLE> inline
 ReadParticle<PARTICLE>::ReadParticle(const std::string& name, ISvcLocator* pSvcLocator)
   : AthAlgorithm(name, pSvcLocator),
+    m_ntuplePtr(nullptr),
     m_ContainerName("")
 {
   // Declare the properties
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/WriteINav4MomAssocs.h b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/WriteINav4MomAssocs.h
index 2e1aba44a1cd088f1742abd0938bb5278ce27263..e2e3d8745e1581839ae10800a7644a944274e93c 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/WriteINav4MomAssocs.h
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/AnalysisTest/WriteINav4MomAssocs.h
@@ -21,8 +21,7 @@
 // FrameWork includes
 #include "AthenaBaseComps/AthAlgorithm.h"
 
-// DataModel includes
-#include "DataModel/ClassName.h"
+#include "SGTools/ClassName.h"
 
 // NqvFourMom includes
 #include "NavFourMom/INavigable4MomentumCollection.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/CMakeLists.txt b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/CMakeLists.txt
index 95808060cece70d90939b82aa00dd6b9990f4d39..eddf318f3e88aed144d0e9908f140421a7dd3e6e 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/CMakeLists.txt
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/CMakeLists.txt
@@ -7,7 +7,8 @@ atlas_subdir( AnalysisTest )
 
 # Declare the package's dependencies:
 atlas_depends_on_subdirs( PUBLIC
-                          Control/DataModel
+                          Control/SGTools
+                          Control/AthContainers
                           Control/StoreGate
                           Event/NavFourMom
                           GaudiKernel
@@ -20,6 +21,7 @@ atlas_depends_on_subdirs( PUBLIC
                           PRIVATE
                           AtlasTest/TestTools
                           Control/AthenaBaseComps
+                          Control/AthenaKernel
                           Event/EventKernel
                           Event/FourMom
                           Generators/GeneratorObjects
@@ -40,7 +42,7 @@ atlas_add_component( AnalysisTest
                      src/*.cxx
                      src/components/*.cxx
                      INCLUDE_DIRS ${HEPMC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${CPPUNIT_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${HEPMC_LIBRARIES} ${CLHEP_LIBRARIES} ${CPPUNIT_LIBRARIES} DataModel StoreGateLib SGtests NavFourMom GaudiKernel McParticleEvent muonEvent Particle egammaEvent tauEvent VxVertex TestTools AthenaBaseComps EventKernel FourMom GeneratorObjects AnalysisAssociation AnalysisUtilsLib AnalysisTriggerEvent McParticleUtils JetEvent )
+                     LINK_LIBRARIES ${HEPMC_LIBRARIES} ${CLHEP_LIBRARIES} ${CPPUNIT_LIBRARIES} SGTools AthContainers StoreGateLib SGtests NavFourMom GaudiKernel McParticleEvent muonEvent Particle egammaEvent tauEvent VxVertex TestTools AthenaBaseComps AthenaKernel EventKernel FourMom GeneratorObjects AnalysisAssociation AnalysisUtilsLib AnalysisTriggerEvent McParticleUtils JetEvent )
 
 # Install files from the package:
 atlas_install_headers( AnalysisTest )
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/cmt/requirements b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/cmt/requirements
index b7883770dbbdb1f152f63d2737f5f40d6d4d0b27..39fdb661252b5567b1ae1f758c5987c981ccfb8a 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/cmt/requirements
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/cmt/requirements
@@ -8,7 +8,8 @@ use GaudiInterface        GaudiInterface-*        External
 use TestTools             *                       AtlasTest 
 
 use StoreGate             StoreGate-*             Control
-use DataModel             DataModel-*             Control
+use SGTools               SGTools-*               Control
+use AthContainers         AthContainers-*         Control
 use AthenaBaseComps       AthenaBaseComps-*       Control
 
 use NavFourMom            NavFourMom-*            Event
@@ -26,6 +27,7 @@ private
 use AtlasCLHEP            *   External
 use AtlasHepMC            *   External
 use AthenaBaseComps       AthenaBaseComps-* Control
+use AthenaKernel          AthenaKernel-*    Control
 
 use EventKernel           *   Event
 use FourMom               *   Event
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/WriteINav4MomAssocs.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/WriteINav4MomAssocs.cxx
index 8605acd0481d5fcfc937bc1273d71b2129d9ad85..cc6878abf01acbafb7c9e73370e683ec8ff6a75e 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/WriteINav4MomAssocs.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/src/WriteINav4MomAssocs.cxx
@@ -28,6 +28,7 @@
 
 // AnalysisTest includes
 #include "AnalysisTest/WriteINav4MomAssocs.h"
+#include "AthenaKernel/Units.h"
 
 /////////////////////////////////////////////////////////////////// 
 /// Public methods: 
@@ -115,9 +116,9 @@ WriteINav4MomAssocs::buildAssocs( const INavigable4MomentumCollection * coll1,
     for (const INavigable4Momentum* m2 : *coll2) {
       assocs->addAssociation( coll1, m1, coll2, m2 );
       ATH_MSG_DEBUG ( "Assoc: [jet-ele] ene= " 
-                      << m1->e() / CLHEP::GeV
+                      << m1->e() / Athena::Units::GeV
                       << "\t"
-                      << m2->e() / CLHEP::GeV ) ;
+                      << m2->e() / Athena::Units::GeV ) ;
     }//> end loop over electrons
   }//> end loop over jets
 
@@ -125,7 +126,7 @@ WriteINav4MomAssocs::buildAssocs( const INavigable4MomentumCollection * coll1,
   for ( INav4MomAssocs::object_iterator objItr = assocs->beginObject();
 	objItr != objEnd;
 	++objItr ) {
-    ATH_MSG_INFO ( "--> e= " << (*objItr)->e() / CLHEP::GeV
+    ATH_MSG_INFO ( "--> e= " << (*objItr)->e() / Athena::Units::GeV
                    << "\tnAssocs= " << assocs->getNumberOfAssociations(objItr) ) ;
   }
 
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/test/AssocFilterTest_CppUnit.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/test/AssocFilterTest_CppUnit.cxx
index a922ef11ac6406672ebc0d55ea8f9c0031d6211c..86dac1c3d665741d3aace86c644baca562dbfc91 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/test/AssocFilterTest_CppUnit.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/test/AssocFilterTest_CppUnit.cxx
@@ -15,8 +15,7 @@
 // CLHEP includes
 #include "CLHEP/Units/SystemOfUnits.h"
 
-// DataModel includes
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 
 // EventKernel includes
 #include "EventKernel/I4Momentum.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/test/CategoryIdFilterTest_CppUnit.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/test/CategoryIdFilterTest_CppUnit.cxx
index 13e387e3c095ff6b69ba20e27cc501bace3722b3..642605b3dbf9323afce3d925d72995e8f05d89c2 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/test/CategoryIdFilterTest_CppUnit.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/test/CategoryIdFilterTest_CppUnit.cxx
@@ -17,8 +17,7 @@
 // CLHEP includes
 #include "CLHEP/Units/SystemOfUnits.h"
 
-// DataModel includes
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 
 // EventKernel includes
 #include "EventKernel/IParticle.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/test/IParticleAssocFilterTest_CppUnit.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/test/IParticleAssocFilterTest_CppUnit.cxx
index 1fabae7ff3d034a617f9134930a08a698a6514bb..62fc154f9626c015e81baced5b93ac1d26b11120 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/test/IParticleAssocFilterTest_CppUnit.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/test/IParticleAssocFilterTest_CppUnit.cxx
@@ -16,8 +16,7 @@
 // CLHEP includes
 #include "CLHEP/Units/SystemOfUnits.h"
 
-// DataModel includes
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 
 // FourMom includes
 #include "FourMom/P4PxPyPzE.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/test/McVtxFilterTest_CppUnit.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/test/McVtxFilterTest_CppUnit.cxx
index e1d9cb1a69078fe8fd1c9b253ddb90aca90d2393..9875fe42028fb4e9d4856282d11f0e0a6666318f 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/test/McVtxFilterTest_CppUnit.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/test/McVtxFilterTest_CppUnit.cxx
@@ -23,8 +23,7 @@
 #include "HepMC/GenVertex.h"
 #include "HepMC/GenParticle.h"
 
-// DataModel includes
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 
 
 // McParticleUtils includes
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/test/MomentumFilterTest_CppUnit.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/test/MomentumFilterTest_CppUnit.cxx
index 43e480f04789bb80cb9af51a79d8b9274806b9b9..48402da72651b03ed78ef194d494523915e295b0 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/test/MomentumFilterTest_CppUnit.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/test/MomentumFilterTest_CppUnit.cxx
@@ -17,8 +17,7 @@
 // CLHEP includes
 #include "CLHEP/Units/SystemOfUnits.h"
 
-// DataModel includes
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 
 // EventKernel
 #include "EventKernel/I4Momentum.h"
diff --git a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/test/PdgIdFilterTest_CppUnit.cxx b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/test/PdgIdFilterTest_CppUnit.cxx
index 2b7f8552ef7020a66c7c37d1aaebfe4d0d547cf8..e288d72509aba8df67f88e12fdd1e62c8e7ec60c 100644
--- a/PhysicsAnalysis/AnalysisCommon/AnalysisTest/test/PdgIdFilterTest_CppUnit.cxx
+++ b/PhysicsAnalysis/AnalysisCommon/AnalysisTest/test/PdgIdFilterTest_CppUnit.cxx
@@ -18,8 +18,7 @@
 #include "CLHEP/Units/SystemOfUnits.h"
 #include "HepMC/GenParticle.h"
 
-// DataModel includes
-#include "DataModel/DataVector.h"
+#include "AthContainers/DataVector.h"
 
 // EventKernel includes
 #include "EventKernel/IParticle.h"