diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/BatchDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/BatchDriver.cxx
index a9cc9d6787a00ff55589578229ed006935aaf97c..f6d161f2aac10765e8009f498c4ec8cf549e6c28 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/BatchDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/BatchDriver.cxx
@@ -722,7 +722,7 @@ namespace EL
 
     ANA_MSG_DEBUG ("merging histograms in location " << data.submitDir);
 
-    RCU_ASSERT (config.njobs_old.size() == config.samples.size());
+    RCU_ASSERT (data.batchJob->njobs_old.size() == data.batchJob->samples.size());
     for (std::size_t sample = 0, end = data.batchJob->samples.size();
 	 sample != end; ++ sample)
     {
diff --git a/PhysicsAnalysis/D3PDTools/EventLoop/Root/TEventModule.cxx b/PhysicsAnalysis/D3PDTools/EventLoop/Root/TEventModule.cxx
index e154974ddc26af02d44b2e76155a94e95cc0ed40..6b3700c8c517cea5ae72e9f1736e4c569b8e100d 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoop/Root/TEventModule.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoop/Root/TEventModule.cxx
@@ -124,7 +124,7 @@ namespace EL
           (new xAOD::ReadStats (xAOD::IOStats::instance().stats()));
         stats->SetName (Job::optXAODReadStats.c_str());
         stats->Print ();
-        data.m_output->Add (stats.release());
+        data.addOutput (std::move (stats));
       }
       data.m_tevent = nullptr;
       data.m_tstore = nullptr;
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/Root/LinkDef.h b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/Root/LinkDef.h
index 023eb25a2e6f7158b35be07d87e6969e3c3d9e56..c51a224c1d781964b1dd0dc61421a2a0ed5f8ff3 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopAlgs/Root/LinkDef.h
+++ b/PhysicsAnalysis/D3PDTools/EventLoopAlgs/Root/LinkDef.h
@@ -17,8 +17,6 @@
 #pragma link off all functions;
 #pragma link C++ nestedclass;
 
-#pragma link C++ class SH::MetaData<float>+;
-#pragma link C++ class SH::MetaVector<float>+;
 #pragma link C++ class EL::AlgSelect+;
 #pragma link C++ class EL::DuplicateChecker+;
 #pragma link C++ class EL::NTupleSvc+;
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopGrid/Root/PrunDriver.cxx b/PhysicsAnalysis/D3PDTools/EventLoopGrid/Root/PrunDriver.cxx
index cac5e3aa10c1c063256adbb569dab98b89e46698..bc7604b51d19a1f9830a88aa105b8b2fd8e43177 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopGrid/Root/PrunDriver.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopGrid/Root/PrunDriver.cxx
@@ -554,7 +554,7 @@ doManagerStep (Detail::ManagerData& data) const
 ::StatusCode EL::PrunDriver::doRetrieve (Detail::ManagerData& data) const 
 {
   RCU_READ_INVARIANT(this);
-  RCU_REQUIRE(not location.empty());  
+  RCU_REQUIRE(not data.submitDir.empty());  
 
   TmpCd tmpDir(data.submitDir);
 
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopTest/CMakeLists.txt b/PhysicsAnalysis/D3PDTools/EventLoopTest/CMakeLists.txt
index 92322572dfe7ec82ad764089016fac11d7577547..36da086c04a44f51abac2cd9f54a960e4bf03bf3 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopTest/CMakeLists.txt
+++ b/PhysicsAnalysis/D3PDTools/EventLoopTest/CMakeLists.txt
@@ -36,7 +36,7 @@ function( _add_gtest cxx_name )
    atlas_add_test (${test_name}
       SOURCES test/${test_name}.cxx
       INCLUDE_DIRS ${GMOCK_INCLUDE_DIRS}
-      LINK_LIBRARIES ${GMOCK_LIBRARIES} RootCoreUtils AsgTools AsgTesting
+      LINK_LIBRARIES ${GMOCK_LIBRARIES} RootCoreUtils AsgTools AsgTestingLib
       SampleHandler EventLoopTestLib xAODRootAccess ${EXTRA_ARGS})
    set_tests_properties (EventLoopTest_${test_name}_ctest PROPERTIES LABELS "EventLoopTest;EventLoop;SampleHandler;AnaAlgorithm" )
 endfunction( _add_gtest )
@@ -54,6 +54,7 @@ foreach( source ${_tests} )
   if (${_index} GREATER -1)
     add_executable ("EventLoopTestLib_${util}" ${source})
     target_link_libraries ("EventLoopTestLib_${util}" EventLoopTestLib EventLoopGrid)
+    add_dependencies( Package_EventLoopTest EventLoopTestLib_${util} )
   else (${_index} GREATER -1)
     _add_gtest( test/${util}.cxx)
   endif (${_index} GREATER -1)
diff --git a/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestFixture.cxx b/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestFixture.cxx
index 36612324451218ee320a69aeb504c4e032ac2717..c2aad48ce445db989537c4a7ccdf9d53a78daa0d 100644
--- a/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestFixture.cxx
+++ b/PhysicsAnalysis/D3PDTools/EventLoopTest/Root/UnitTestFixture.cxx
@@ -106,7 +106,7 @@ namespace EL
       if (result.empty())
       {
 	std::unique_ptr<SH::SampleLocal> myresult (new SH::SampleLocal ("multi"));
-	for (unsigned jter = 0; jter != 100; ++ jter)
+	for (unsigned jter = 0; jter != 10; ++ jter)
 	{
 	  std::vector<unsigned> entries;
 	  for (unsigned iter = 0; iter != 10000; ++ iter)
@@ -268,7 +268,7 @@ namespace EL
 
   TEST_P (UnitTestFixture, empty_eventCount)
   {
-    ASSERT_EQ (eventCount ("empty"), 0u);
+    EXPECT_EQ (eventCount ("empty"), 0u);
   }
 
 
@@ -276,14 +276,14 @@ namespace EL
   TEST_P (UnitTestFixture, empty_callbacks)
   {
     TH1 *callbacks = getCallbacks ("empty");
-    ASSERT_EQ (0, callbacks->GetBinContent (1 + UnitTestAlg1::CB_CHANGE_INPUT_FIRST));
-    ASSERT_EQ (0, callbacks->GetBinContent (1 + UnitTestAlg1::CB_CHANGE_INPUT_OTHER));
-    ASSERT_EQ (0, callbacks->GetBinContent (1 + UnitTestAlg1::CB_INITIALIZE));
-    ASSERT_LE (1, callbacks->GetBinContent (1 + UnitTestAlg1::CB_HIST_INITIALIZE));
-    ASSERT_EQ (0, callbacks->GetBinContent (1 + UnitTestAlg1::CB_EXECUTE));
-    ASSERT_EQ (1, callbacks->GetBinContent (1 + UnitTestAlg1::CB_FILE_EXECUTE));
-    ASSERT_EQ (0, callbacks->GetBinContent (1 + UnitTestAlg1::CB_FINALIZE));
-    ASSERT_LE (1, callbacks->GetBinContent (1 + UnitTestAlg1::CB_HIST_FINALIZE));
+    EXPECT_EQ (0, callbacks->GetBinContent (1 + UnitTestAlg1::CB_CHANGE_INPUT_FIRST));
+    EXPECT_EQ (0, callbacks->GetBinContent (1 + UnitTestAlg1::CB_CHANGE_INPUT_OTHER));
+    EXPECT_EQ (0, callbacks->GetBinContent (1 + UnitTestAlg1::CB_INITIALIZE));
+    EXPECT_LE (1, callbacks->GetBinContent (1 + UnitTestAlg1::CB_HIST_INITIALIZE));
+    EXPECT_EQ (0, callbacks->GetBinContent (1 + UnitTestAlg1::CB_EXECUTE));
+    EXPECT_EQ (1, callbacks->GetBinContent (1 + UnitTestAlg1::CB_FILE_EXECUTE));
+    EXPECT_EQ (0, callbacks->GetBinContent (1 + UnitTestAlg1::CB_FINALIZE));
+    EXPECT_LE (1, callbacks->GetBinContent (1 + UnitTestAlg1::CB_HIST_FINALIZE));
   }
 
 
@@ -297,7 +297,7 @@ namespace EL
 
   TEST_P (UnitTestFixture, single_eventCount)
   {
-    ASSERT_EQ (eventCount ("single"), 10000u);
+    EXPECT_EQ (eventCount ("single"), 10000u);
   }
 
 
@@ -305,14 +305,14 @@ namespace EL
   TEST_P (UnitTestFixture, single_callbacks)
   {
     TH1 *callbacks = getCallbacks ("single");
-    ASSERT_LE (1, callbacks->GetBinContent (1 + UnitTestAlg1::CB_CHANGE_INPUT_FIRST));
-    ASSERT_LE (0, callbacks->GetBinContent (1 + UnitTestAlg1::CB_CHANGE_INPUT_OTHER));
-    ASSERT_LE (1, callbacks->GetBinContent (1 + UnitTestAlg1::CB_INITIALIZE));
-    ASSERT_LE (1, callbacks->GetBinContent (1 + UnitTestAlg1::CB_HIST_INITIALIZE));
-    ASSERT_EQ (10000, callbacks->GetBinContent (1 + UnitTestAlg1::CB_EXECUTE));
-    ASSERT_EQ (1, callbacks->GetBinContent (1 + UnitTestAlg1::CB_FILE_EXECUTE));
-    ASSERT_LE (1, callbacks->GetBinContent (1 + UnitTestAlg1::CB_FINALIZE));
-    ASSERT_LE (1, callbacks->GetBinContent (1 + UnitTestAlg1::CB_HIST_FINALIZE));
+    EXPECT_LE (1, callbacks->GetBinContent (1 + UnitTestAlg1::CB_CHANGE_INPUT_FIRST));
+    EXPECT_LE (0, callbacks->GetBinContent (1 + UnitTestAlg1::CB_CHANGE_INPUT_OTHER));
+    EXPECT_LE (1, callbacks->GetBinContent (1 + UnitTestAlg1::CB_INITIALIZE));
+    EXPECT_LE (1, callbacks->GetBinContent (1 + UnitTestAlg1::CB_HIST_INITIALIZE));
+    EXPECT_EQ (10000, callbacks->GetBinContent (1 + UnitTestAlg1::CB_EXECUTE));
+    EXPECT_EQ (1, callbacks->GetBinContent (1 + UnitTestAlg1::CB_FILE_EXECUTE));
+    EXPECT_LE (1, callbacks->GetBinContent (1 + UnitTestAlg1::CB_FINALIZE));
+    EXPECT_LE (1, callbacks->GetBinContent (1 + UnitTestAlg1::CB_HIST_FINALIZE));
   }
 
 
@@ -326,7 +326,7 @@ namespace EL
 
   TEST_P (UnitTestFixture, multi_eventCount)
   {
-    ASSERT_EQ (eventCount ("multi"), 1000000u);
+    EXPECT_EQ (eventCount ("multi"), 100000u);
   }
 
 
@@ -334,14 +334,14 @@ namespace EL
   TEST_P (UnitTestFixture, multi_callbacks)
   {
     TH1 *callbacks = getCallbacks ("multi");
-    ASSERT_LE (1, callbacks->GetBinContent (1 + UnitTestAlg1::CB_CHANGE_INPUT_FIRST));
-    ASSERT_LE (0, callbacks->GetBinContent (1 + UnitTestAlg1::CB_CHANGE_INPUT_OTHER));
-    ASSERT_LE (1, callbacks->GetBinContent (1 + UnitTestAlg1::CB_INITIALIZE));
-    ASSERT_LE (1, callbacks->GetBinContent (1 + UnitTestAlg1::CB_HIST_INITIALIZE));
-    ASSERT_EQ (1000000, callbacks->GetBinContent (1 + UnitTestAlg1::CB_EXECUTE));
-    ASSERT_EQ (100, callbacks->GetBinContent (1 + UnitTestAlg1::CB_FILE_EXECUTE));
-    ASSERT_LE (1, callbacks->GetBinContent (1 + UnitTestAlg1::CB_FINALIZE));
-    ASSERT_LE (1, callbacks->GetBinContent (1 + UnitTestAlg1::CB_HIST_FINALIZE));
+    EXPECT_LE (1, callbacks->GetBinContent (1 + UnitTestAlg1::CB_CHANGE_INPUT_FIRST));
+    EXPECT_LE (0, callbacks->GetBinContent (1 + UnitTestAlg1::CB_CHANGE_INPUT_OTHER));
+    EXPECT_LE (1, callbacks->GetBinContent (1 + UnitTestAlg1::CB_INITIALIZE));
+    EXPECT_LE (1, callbacks->GetBinContent (1 + UnitTestAlg1::CB_HIST_INITIALIZE));
+    EXPECT_EQ (100000, callbacks->GetBinContent (1 + UnitTestAlg1::CB_EXECUTE));
+    EXPECT_EQ (10, callbacks->GetBinContent (1 + UnitTestAlg1::CB_FILE_EXECUTE));
+    EXPECT_LE (1, callbacks->GetBinContent (1 + UnitTestAlg1::CB_FINALIZE));
+    EXPECT_LE (1, callbacks->GetBinContent (1 + UnitTestAlg1::CB_HIST_FINALIZE));
   }
 
 
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/CMakeLists.txt b/PhysicsAnalysis/D3PDTools/RootCoreUtils/CMakeLists.txt
index c6d303315f1986bdeaf93006ae4e2693e57fffa5..c46e0d96798eac33aba647dd65cae80a6ecaba0c 100644
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/CMakeLists.txt
+++ b/PhysicsAnalysis/D3PDTools/RootCoreUtils/CMakeLists.txt
@@ -23,12 +23,6 @@ atlas_add_library( RootCoreUtils
 atlas_add_executable( rcu_locate util/rcu_locate.cxx
    LINK_LIBRARIES RootCoreUtils )
 
-# Test(s) in the package:
-atlas_add_test( test_message_svc
-   SOURCES test/test_message_svc.cxx
-   LINK_LIBRARIES RootCoreUtils
-   PROPERTIES WILL_FAIL TRUE )
-
 atlas_add_test( ut_expression
    SOURCES test/ut_expression.cxx
    LINK_LIBRARIES RootCoreUtils )
diff --git a/PhysicsAnalysis/D3PDTools/RootCoreUtils/test/test_message_svc.cxx b/PhysicsAnalysis/D3PDTools/RootCoreUtils/test/test_message_svc.cxx
deleted file mode 100644
index 6fed56f20780af0782140eb859529abff40409d9..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/D3PDTools/RootCoreUtils/test/test_message_svc.cxx
+++ /dev/null
@@ -1,38 +0,0 @@
-//          
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-// Please feel free to contact me (krumnack@iastate.edu) for bug
-// reports, feature suggestions, praise and complaints.
-
-
-//
-// includes
-//
-
-#undef NDEBUG
-#include <RootCoreUtils/Global.h>
-
-#include <iostream>
-#include <RootCoreUtils/Assert.h>
-#include <RootCoreUtils/PrintMsg.h>
-
-//
-// method implementations
-//
-
-int main ()
-{
-  RCU_PRINT_MSG ("print message");
-  RCU_WARN_MSG ("warn message");
-  RCU_ERROR_MSG ("error message");
-  try
-  {
-    RCU_THROW_MSG ("throw message");
-  } catch (std::exception& e)
-  {
-    std::cout << "caught: " << e.what() << std::endl;
-  }
-  RCU_ASSERT (false);
-}
diff --git a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/LinkDef.h b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/LinkDef.h
index 0592d054f291bdeef42f73de2b2955371549ec96..8fde140026414e7bf689e5d15f20fb37cd415d7a 100644
--- a/PhysicsAnalysis/D3PDTools/SampleHandler/Root/LinkDef.h
+++ b/PhysicsAnalysis/D3PDTools/SampleHandler/Root/LinkDef.h
@@ -62,6 +62,8 @@
 #pragma link C++ class SH::ScanDir-;
 #pragma link C++ class SH::TagList+;
 #pragma link C++ class SH::Meta+;
+#pragma link C++ class SH::MetaData<float>+;
+#pragma link C++ class SH::MetaVector<float>+;
 #pragma link C++ class SH::MetaData<double>+;
 #pragma link C++ class SH::MetaData<std::string>+;
 #pragma link C++ class SH::MetaData<bool>+;
diff --git a/Projects/AnalysisBase/package_filters.txt b/Projects/AnalysisBase/package_filters.txt
index 931a1535ab3f936b75bf73f524f6ff75915f0b2c..e26d881fb81520c18c8a4a91373c3fefe42bb94d 100644
--- a/Projects/AnalysisBase/package_filters.txt
+++ b/Projects/AnalysisBase/package_filters.txt
@@ -22,6 +22,7 @@
 + Event/xAOD/.*
 + Generators/TruthUtils
 + MuonSpectrometer/MuonStationIndex
++ PhysicsAnalysis/D3PDTools/.*
 + Tools/PathResolver
 + Trigger/TrigConfiguration/TrigConfBase
 + Trigger/TrigConfiguration/TrigConfL1Data