diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt b/AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt
index 84394dbcaf062f00880fe40ed12afcf451e61c56..ccbb8721470058140858f25abc64982610830cf9 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt
@@ -65,3 +65,151 @@ atlas_add_component( AthenaPoolTest
 atlas_install_headers( AthenaPoolTest )
 atlas_install_joboptions( share/*.py )
 
+
+function (athenapooltest_run_test testName jo pattern)
+  cmake_parse_arguments( ARG "" "DEPENDS" "" ${ARGN} )
+
+  configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/test/athenapooltest_test.sh.in
+                  ${CMAKE_CURRENT_BINARY_DIR}/athenapooltest_${testName}.sh
+                  @ONLY )
+  atlas_add_test( ${testName}
+                  SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/athenapooltest_${testName}.sh
+                  ENVIRONMENT PATH=${CMAKE_CURRENT_SOURCE_DIR}/test:$ENV{PATH}
+                  POST_EXEC_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/test/post_check_with_select.sh ${testName} ${pattern}"
+                  PROPERTIES TIMEOUT 600
+                   )
+  if( ARG_DEPENDS )
+    set_tests_properties( AthenaPoolTest_${testName}_ctest
+                          PROPERTIES DEPENDS AthenaPoolTest_${ARG_DEPENDS}_ctest )
+  endif()
+endfunction (athenapooltest_run_test)
+
+
+# Write/read out some simple objects:
+athenapooltest_run_test( AthenaPoolTestWrite AthenaPoolTestWrite
+                         "^..AthenaPoolTestD" )
+athenapooltest_run_test( AthenaPoolTestRead AthenaPoolTestRead
+                         "AthenaPoolTestD"
+                         DEPENDS AthenaPoolTestWrite )
+
+# Add on test of navigation still using simple objects:
+# AthenaPoolTestWrite - Step2 - rewrite part in another file
+athenapooltest_run_test( AthenaPoolTestStep2Write AthenaPoolTestStep2Write
+                         "^..AthenaPoolTestD"
+                         DEPENDS AthenaPoolTestRead )
+# AthenaPoolTestReadNav - read back from Step2 - part in one file,
+# part in another file
+athenapooltest_run_test( AthenaPoolTestReadNav AthenaPoolTestReadNav
+                         "AthenaPoolTestD"
+                         DEPENDS AthenaPoolTestStep2Write )
+
+# Copy the Step2 file
+#athenapooltest_run_test( AthenaPoolTestCopy AthenaPoolTestCopy
+#                         "^..Stream1" )
+# 
+# Remove the Step2 file and read the copy
+#athenapooltest_run_test( AthenaPoolTestReadAfterCopy AthenaPoolTestReadAfterCopy
+#                         "AthenaPoolTestD" )
+# 
+# Write/read out PileUpEventInfo:
+#athenapooltest_run_test( PileUpEventInfoWrite PileUpEventInfoWrite
+#                         "^..PileUpEventInfo" )
+#athenapooltest_run_test( PileUpEventInfoRead PileUpEventInfoRead
+#                         "^..PileUpEventInfo" )
+# 
+# 
+# 
+# Atlfast NOT YET WORKING
+#athenapooltest_run_test( AtlfastPoolWrite AtlfastPoolWriteOptions
+#                         "AtlfastPoolWrite" )
+#athenapooltest_run_test( AtlfastPoolRead AtlfastPoolReadOptions
+#                         "AtlfastPoolRead" )
+
+# Test write/read of indet rdos:
+athenapooltest_run_test( InDetRawDataWriter InDetRawDataWriter_jobOptions
+                         "InDetRawDataFak"
+                         DEPENDS AthenaPoolTestReadNav )
+athenapooltest_run_test( InDetRawDataRead InDetRawDataReader_jobOptions
+                         "InDetRawDataFak"
+                         DEPENDS InDetRawDataWriter )
+
+# Test write/read of LAr cell
+athenapooltest_run_test( LArCellContWriter LArCellContWriter_jobOptions
+                         "LArCellContFake"
+                         DEPENDS InDetRawDataRead )
+athenapooltest_run_test( LArCellContRead LArCellContReader_jobOptions
+                         "LArCellContFake"
+                         DEPENDS LArCellContWriter )
+
+# Test of explicit collection write/read
+#athenapooltest_run_test( LArCellContWriteReg LArCellContWriter_jobOptionsReg
+#                         "LArCellContFake" )
+#athenapooltest_run_test( LArCellContReadReg LArCellContReader_jobOptionsReg
+#                         "LArCellContFake" )
+# 
+# LFN test
+#athenapooltest_run_test( LArCellContWriteStep1 LArCellContWriter_jobOptionsStep1
+#                         "LArCellContFake" )
+#athenapooltest_run_test( LArCellContWriteStep2 LArCellContWriter_jobOptionsStep2
+#                         "LArCellContFake" )
+#athenapooltest_run_test( LArCellContReadByLFN LArCellContReader_jobOptionsByLFN
+#                         "LArCellContFake" )
+# 
+# 
+# write/read test of calo clusters
+#athenapooltest_run_test( CaloClusterWriter CaloClusterWriter_jobOptions
+#                         "^..CaloClusterFakeWriter"
+#                         DEPENDS LArCellContRead  )
+#athenapooltest_run_test( CaloClusterReader CaloClusterReader_jobOptions
+#                         "^..CaloClusterFakeWriter"
+#                         DEPENDS CaloClusterWriter  )
+# 
+# Test ElementLinks across files
+#athenapooltest_run_test( CaloClusterStep1Writer CaloClusterStep1Writer_jobOptions
+#                         "Fake" )
+#athenapooltest_run_test( CaloClusterStep2Writer CaloClusterStep2Writer_jobOptions
+#                         "Fake" )
+#athenapooltest_run_test( CaloCluster2Step2Reader CaloCluster2StepReader_jobOptions
+#                         "Fake" )
+# 
+# 
+# The following four tests are for writing explicit root collections with an extra ref 
+#   First write an implicit collection, then a second file and an explicit root collection
+#   Then read back with standard ref - Step1, or extra ref - Step2
+# 
+# AthenaPoolTestWrite - write out implicit collection with athena pool test data
+#athenapooltest_run_test( AthenaPoolTestWrite2 AthenaPoolTestWrite
+#                         "^..AthenaPoolTestD" )
+# LArCellContWriteRegStep2 - write out explicit collection with LArCellCont
+#athenapooltest_run_test( LArCellContWriteRegStep2 LArCellContWriter_jobOptionsRegStep2
+#                         "LArCellContFake" )
+# LArCellContWriteRegStep3 - write out explicit collection with LArCellCont 
+# in separate step
+#athenapooltest_run_test( LArCellContWriteRegStep3 LArCellContWriter_jobOptionsRegStep3
+#                         "LArCellContFake" )
+# LArCellContReadRegStep1 - read in LArCellCont
+#athenapooltest_run_test( LArCellContReadRegStep1 LArCellContReader_jobOptionsRegStep1
+#                         "LArCellContFake" )
+# LArCellContReadRegStep2 - read in athena pool test data
+#athenapooltest_run_test( LArCellContReadRegStep2 LArCellContReader_jobOptionsRegStep2
+#                         "LArCellContFake" )
+
+# Check for adding DetDescr tags to event info object:
+athenapooltest_run_test( EventInfoWrite EventInfoWrite
+                         "'^..[TE][av][ge][In][nt][fI][on][Mf][go][rW]'"
+                         DEPENDS LArCellContRead )
+athenapooltest_run_test( EventInfoWriteStep2 EventInfoWriteStep2
+                         "'^..[TE][av][ge][In][nt][fI][on][Mf][go][rW]'"
+                         DEPENDS EventInfoWrite )
+athenapooltest_run_test( EventInfoWriteStep3 EventInfoWriteStep3
+                         "'^..[TE][av][ge][In][nt][fI][on][Mf][go][rW]'"
+                         DEPENDS EventInfoWriteStep2 )
+athenapooltest_run_test( EventInfoWriteStep4 EventInfoWriteStep4
+                         "'^..[TE][av][ge][In][nt][fI][on][Mf][go][rW]'"
+                         DEPENDS EventInfoWriteStep3 )
+athenapooltest_run_test( EventInfoWriteStep5 EventInfoWriteStep5
+                         "'^..[TE][av][ge][In][nt][fI][on][Mf][go][rW]'"
+                         DEPENDS EventInfoWriteStep4 )
+athenapooltest_run_test( EventInfoRead EventInfoRead
+                         "'^..[TE][av][ge][In][nt][fI][on][Mf][go][rW]'"
+                         DEPENDS EventInfoWriteStep5 )
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/cmt/requirements b/AtlasTest/DatabaseTest/AthenaPoolTest/cmt/requirements
index 7fe42188c014a7fdc22dad3123ec07944fc24873..56050068aec32df59d2d875f1320ba6bd8247efc 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/cmt/requirements
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/cmt/requirements
@@ -237,4 +237,3 @@ macro_append EventInfoWriteStep5_test_dependencies " EventInfoWriteStep4_test "
 # EventInfoRead
 apply_pattern athenarun_test name="EventInfoRead" pre_script="../test/pre_check.sh EventInfoRead " options="AthenaPoolTest/EventInfoRead.py" post_script="../test/post_check_with_select.sh EventInfoRead ^..[TE][av][ge][In][nt][fI][on][Mf][go][rW] " 
 macro_append EventInfoRead_test_dependencies " EventInfoWriteStep5_test "
-
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/test/AthenaPoolTestCopy.ref b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestCopy.ref
similarity index 100%
rename from AtlasTest/DatabaseTest/AthenaPoolTest/test/AthenaPoolTestCopy.ref
rename to AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestCopy.ref
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/test/AthenaPoolTestRead.ref b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestRead.ref
similarity index 95%
rename from AtlasTest/DatabaseTest/AthenaPoolTest/test/AthenaPoolTestRead.ref
rename to AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestRead.ref
index 9c5476d52dc37e8f912df1a14c6cd7519e33ba7c..a132a199565d939d94ce13660eb4a9d8c27afb32 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/test/AthenaPoolTestRead.ref
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestRead.ref
@@ -1,32 +1,33 @@
-Thu Mar 24 19:18:04 CET 2016
+Fri Jul 22 21:44:56 CEST 2016
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [AtlasOffline-21.0.0] [x86_64-slc6-gcc49-dbg] [21.X.Y-VAL/rel_2] -- built on [2016-03-21 22:42]
+Py:Athena            INFO using release [WorkDir-22.0.0] [x86_64-slc6-gcc49-dbg] [private/private] -- built on [2016-07-22 20:52]
 Py:Athena            INFO including file "AthenaCommon/Bootstrap.py"
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
-Warning in <TInterpreter::ReadRootmapFile>: class  CaloSampling found in CaloEventDict.so  is already in libISF_FastCaloSimParametrizationLib.so 
+Warning in <TInterpreter::ReadRootmapFile>: class  Event found in libG4AtlasControlDict.so  is already in libtest_GPyTestDict.so 
+Warning in <TInterpreter::ReadRootmapFile>: class  UCharDbArray found in libStorageSvcDict.so  is already in libRootCnvDict.so 
 Py:Athena            INFO executing ROOT6Setup
 [?1034hPy:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "AthenaPoolTest/AthenaPoolTestRead.py"
-Py:ConfigurableDb    INFO Read module info for 5049 configurables from 10 genConfDb files
-Py:ConfigurableDb WARNING Found 1 duplicates among the 10 genConfDb files :
-Py:ConfigurableDb WARNING --------------------------------------------------
-Py:ConfigurableDb WARNING   -<component name>: <module> - [ <duplicates> ]
-Py:ConfigurableDb WARNING --------------------------------------------------
-Py:ConfigurableDb WARNING   -TrigHLTJetHypo: TrigHLTJetHypo.TrigHLTJetHypoConf - ['TrigJetHypo.TrigJetHypoConf']
-Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
+Py:ConfigurableDb    INFO Read module info for 5102 configurables from 11 genConfDb files
+Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 Py:Athena            INFO including file "AthenaPoolTest/NoStats_jobOptions.py"
 Py:Athena            INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level=0
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v3r4)
-                                          running on lxplus0008.cern.ch on Thu Mar 24 19:18:11 2016
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v4r1)
+                                          running on lxplus064.cern.ch on Fri Jul 22 21:45:04 2016
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
-ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level=0
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 StatusCodeSvc        INFO initialize
+AthenaPoolTestD...  DEBUG Property update for OutputLevel : new value = 2
+AthenaPoolTestD...  DEBUG input handles: 0
+AthenaPoolTestD...  DEBUG output handles: 0
+AthenaPoolTestD...  DEBUG Data Deps for AthenaPoolTestDataReader
+PoolSvc              INFO Initializing PoolSvc - package version PoolSvc-00-25-03
 PoolSvc              INFO io_register[PoolSvc](xmlcatalog_file:PoolFileCatalog.xml) [ok]
 PoolSvc              INFO Set connectionsvc retry/timeout/IDLE timeout to  'ConnectionRetrialPeriod':300/ 'ConnectionRetrialTimeOut':3600/ 'ConnectionTimeOut':5 seconds with connection cleanup disabled
 PoolSvc              INFO Frontier compression level set to 5
@@ -39,24 +40,24 @@ RootCollection Info Opening Collection File SimplePoolFile.root in mode: READ
 RootCollection Info File SimplePoolFile.root opened
 DbSession Info     Open     DbSession    
 Domain[ROOT_All] Info >   Access   DbDomain     READ      [ROOT_All] 
-Domain[ROOT_All] Info ->  Access   DbDatabase   READ      [ROOT_All] 47914F77-A972-2B49-9A4D-9A4D12A28F4C
+Domain[ROOT_All] Info ->  Access   DbDatabase   READ      [ROOT_All] EBDE8392-83A3-2245-8C0D-AB1CE1DEABDD
 Domain[ROOT_All] Info                           SimplePoolFile.root
-RootDatabase.open Success SimplePoolFile.root File version:60414
+RootDatabase.open Success SimplePoolFile.root File version:60602
 ImplicitCollection Info Opened the implicit collection with connection string "PFN:SimplePoolFile.root"
 ImplicitCollection Info and a name "POOLContainer(DataHeader)"
 PoolSvc              INFO Failed to find container MetaDataHdrDataHeader to get Token.
 HistogramPersis...WARNING Histograms saving not required.
 ApplicationMgr       INFO Application Manager Initialized successfully
 SimplePoolFile.root Info Database being retired...
-Domain[ROOT_All] Info ->  Deaccess DbDatabase   READ      [ROOT_All] 47914F77-A972-2B49-9A4D-9A4D12A28F4C
+Domain[ROOT_All] Info ->  Deaccess DbDatabase   READ      [ROOT_All] EBDE8392-83A3-2245-8C0D-AB1CE1DEABDD
 Domain[ROOT_All] Info >   Deaccess DbDomain     READ      [ROOT_All] 
 RootCollection Info Opening Collection File SimplePoolFile.root in mode: READ
 RootCollection Info File SimplePoolFile.root opened
 DbSession Info     Open     DbSession    
 Domain[ROOT_All] Info >   Access   DbDomain     READ      [ROOT_All] 
-Domain[ROOT_All] Info ->  Access   DbDatabase   READ      [ROOT_All] 47914F77-A972-2B49-9A4D-9A4D12A28F4C
+Domain[ROOT_All] Info ->  Access   DbDatabase   READ      [ROOT_All] EBDE8392-83A3-2245-8C0D-AB1CE1DEABDD
 Domain[ROOT_All] Info                           SimplePoolFile.root
-RootDatabase.open Success SimplePoolFile.root File version:60414
+RootDatabase.open Success SimplePoolFile.root File version:60602
 ImplicitCollection Info Opened the implicit collection with connection string "PFN:SimplePoolFile.root"
 ImplicitCollection Info and a name "POOLContainer(DataHeader)"
 ApplicationMgr       INFO Application Manager Started successfully
@@ -270,7 +271,7 @@ AthenaPoolTestD...  DEBUG Event type: user type Overlaid
 AthenaPoolTestD...  DEBUG Trigger info: status 7 extLvl1ID 8 lvl1Type  9 lvl1Info  14 15 lvl2Info 10 11 EventFilterInfo 12 13 EventFilterInfo  i 0 name StreamA type TypeA ObeyLumi 1 i 1 name StreamB type TypeB ObeyLumi 0
 AthenaPoolTestD...  DEBUG SubEventInfos
 AthenaPoolTestD...  DEBUG None found
-PoolSvc              INFO Database (SimplePoolFile.root) attribute [BYTES_READ]: 33409
+PoolSvc              INFO Database (SimplePoolFile.root) attribute [BYTES_READ]: 33395
 PoolSvc              INFO Database (SimplePoolFile.root) attribute [READ_CALLS]: 19
 AthenaPoolTestD...  DEBUG Executing AthenaPoolTestDataReader
 AthenaPoolTestD...  DEBUG Collection of A's
@@ -479,15 +480,15 @@ AthenaPoolTestD...  DEBUG Event type: user type Overlaid
 AthenaPoolTestD...  DEBUG Trigger info: status 7 extLvl1ID 8 lvl1Type  9 lvl1Info  14 15 lvl2Info 10 11 EventFilterInfo 12 13 EventFilterInfo  i 0 name StreamA type TypeA ObeyLumi 1 i 1 name StreamB type TypeB ObeyLumi 0
 AthenaPoolTestD...  DEBUG SubEventInfos
 AthenaPoolTestD...  DEBUG None found
-PoolSvc              INFO Database (SimplePoolFile.root) attribute [BYTES_READ]: 33409
+PoolSvc              INFO Database (SimplePoolFile.root) attribute [BYTES_READ]: 33395
 PoolSvc              INFO Database (SimplePoolFile.root) attribute [READ_CALLS]: 19
 SimplePoolFile.root Info Database being retired...
-Domain[ROOT_All] Info ->  Deaccess DbDatabase   READ      [ROOT_All] 47914F77-A972-2B49-9A4D-9A4D12A28F4C
+Domain[ROOT_All] Info ->  Deaccess DbDatabase   READ      [ROOT_All] EBDE8392-83A3-2245-8C0D-AB1CE1DEABDD
 Domain[ROOT_All] Info >   Deaccess DbDomain     READ      [ROOT_All] 
 ApplicationMgr       INFO Application Manager Stopped successfully
 AthenaPoolTestD...  DEBUG Calling destructor
-PoolSvc              INFO I/O finalization...
 PoolXMLFileCatalog Info XercesC termination number 0
+PoolSvc              INFO I/O finalization...
 ApplicationMgr       INFO Application Manager Finalized successfully
 ApplicationMgr       INFO Application Manager Terminated successfully
 Py:Athena            INFO leaving with code 0: "successful run"
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/test/AthenaPoolTestReadAfterCopy.ref b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestReadAfterCopy.ref
similarity index 100%
rename from AtlasTest/DatabaseTest/AthenaPoolTest/test/AthenaPoolTestReadAfterCopy.ref
rename to AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestReadAfterCopy.ref
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/test/AthenaPoolTestReadNav.ref b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestReadNav.ref
similarity index 95%
rename from AtlasTest/DatabaseTest/AthenaPoolTest/test/AthenaPoolTestReadNav.ref
rename to AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestReadNav.ref
index 53021849d3e9377b9b1abc2d43a3b94c5d4ba208..5612d8ee2276f8b3092d98cdfe7b975d14980f89 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/test/AthenaPoolTestReadNav.ref
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestReadNav.ref
@@ -1,36 +1,36 @@
-Thu Mar 24 19:18:55 CET 2016
+Fri Jul 22 22:10:24 CEST 2016
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [AtlasOffline-21.0.0] [x86_64-slc6-gcc49-dbg] [21.X.Y-VAL/rel_2] -- built on [2016-03-21 22:42]
+Py:Athena            INFO using release [WorkDir-22.0.0] [x86_64-slc6-gcc49-dbg] [private/private] -- built on [2016-07-22 22:06]
 Py:Athena            INFO including file "AthenaCommon/Bootstrap.py"
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
-Warning in <TInterpreter::ReadRootmapFile>: class  CaloSampling found in CaloEventDict.so  is already in libISF_FastCaloSimParametrizationLib.so 
+Warning in <TInterpreter::ReadRootmapFile>: class  Event found in libG4AtlasControlDict.so  is already in libtest_GPyTestDict.so 
+Warning in <TInterpreter::ReadRootmapFile>: class  UCharDbArray found in libStorageSvcDict.so  is already in libRootCnvDict.so 
 Py:Athena            INFO executing ROOT6Setup
 [?1034hPy:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "AthenaPoolTest/AthenaPoolTestReadNav.py"
-Py:ConfigurableDb    INFO Read module info for 5049 configurables from 10 genConfDb files
-Py:ConfigurableDb WARNING Found 1 duplicates among the 10 genConfDb files :
-Py:ConfigurableDb WARNING --------------------------------------------------
-Py:ConfigurableDb WARNING   -<component name>: <module> - [ <duplicates> ]
-Py:ConfigurableDb WARNING --------------------------------------------------
-Py:ConfigurableDb WARNING   -TrigHLTJetHypo: TrigHLTJetHypo.TrigHLTJetHypoConf - ['TrigJetHypo.TrigJetHypoConf']
-Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
+Py:ConfigurableDb    INFO Read module info for 5102 configurables from 11 genConfDb files
+Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 Py:Athena            INFO including file "AthenaPoolTest/NoStats_jobOptions.py"
 Py:Athena            INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level=0
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v3r4)
-                                          running on lxplus0008.cern.ch on Thu Mar 24 19:19:01 2016
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v4r1)
+                                          running on lxplus064.cern.ch on Fri Jul 22 22:10:33 2016
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
-ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level=0
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 StatusCodeSvc        INFO initialize
-RootDatabase.open Success SimplePoolFile1.root File version:60414
+AthenaPoolTestD...  DEBUG Property update for OutputLevel : new value = 2
+AthenaPoolTestD...  DEBUG input handles: 0
+AthenaPoolTestD...  DEBUG output handles: 0
+AthenaPoolTestD...  DEBUG Data Deps for AthenaPoolTestDataReader
+RootDatabase.open Success SimplePoolFile1.root File version:60602
 HistogramPersis...WARNING Histograms saving not required.
 ApplicationMgr       INFO Application Manager Initialized successfully
-RootDatabase.open Success SimplePoolFile1.root File version:60414
+RootDatabase.open Success SimplePoolFile1.root File version:60602
 ApplicationMgr       INFO Application Manager Started successfully
 AthenaPoolTestD...  DEBUG Executing AthenaPoolTestDataReader
 AthenaPoolTestD...  DEBUG Collection of A's
@@ -68,7 +68,7 @@ AthenaPoolTestD...  DEBUG Read:      AthenaPoolTestB::printWhoYouAre B - c, d 25
 AthenaPoolTestD...  DEBUG Should be: AthenaPoolTestB::printWhoYouAre B - c, d 25 26 fa, da 7 13
 AthenaPoolTestD...  DEBUG Read:      AthenaPoolTestB::printWhoYouAre B - c, d 26 27 fa, da 7 13
 AthenaPoolTestD...  DEBUG Should be: AthenaPoolTestB::printWhoYouAre B - c, d 26 27 fa, da 7 13
-RootDatabase.open Success SimplePoolFile.root File version:60414
+RootDatabase.open Success SimplePoolFile.root File version:60602
 AthenaPoolTestD...  DEBUG Collection of C's
 AthenaPoolTestD...  DEBUG Read:      AthenaPoolTestC::printWhoYouAre C - a, b, c, d 0 0 3 4
 AthenaPoolTestD...  DEBUG Should be: AthenaPoolTestC::printWhoYouAre C - a, b, c, d 0 0 3 4
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/test/AthenaPoolTestStep2Write.ref b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestStep2Write.ref
similarity index 96%
rename from AtlasTest/DatabaseTest/AthenaPoolTest/test/AthenaPoolTestStep2Write.ref
rename to AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestStep2Write.ref
index 1184c132d0e97d4de2d638bf0260495053454b50..84df68e272754b9a4b1f62dc789e5655b97ea3f5 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/test/AthenaPoolTestStep2Write.ref
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestStep2Write.ref
@@ -1,40 +1,40 @@
-Thu Mar 24 19:18:30 CET 2016
+Fri Jul 22 21:59:54 CEST 2016
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [AtlasOffline-21.0.0] [x86_64-slc6-gcc49-dbg] [21.X.Y-VAL/rel_2] -- built on [2016-03-21 22:42]
+Py:Athena            INFO using release [WorkDir-22.0.0] [x86_64-slc6-gcc49-dbg] [private/private] -- built on [2016-07-22 21:57]
 Py:Athena            INFO including file "AthenaCommon/Bootstrap.py"
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
-Warning in <TInterpreter::ReadRootmapFile>: class  CaloSampling found in CaloEventDict.so  is already in libISF_FastCaloSimParametrizationLib.so 
+Warning in <TInterpreter::ReadRootmapFile>: class  Event found in libG4AtlasControlDict.so  is already in libtest_GPyTestDict.so 
+Warning in <TInterpreter::ReadRootmapFile>: class  UCharDbArray found in libStorageSvcDict.so  is already in libRootCnvDict.so 
 Py:Athena            INFO executing ROOT6Setup
 [?1034hPy:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "AthenaPoolTest/AthenaPoolTestStep2Write.py"
-Py:ConfigurableDb    INFO Read module info for 5049 configurables from 10 genConfDb files
-Py:ConfigurableDb WARNING Found 1 duplicates among the 10 genConfDb files :
-Py:ConfigurableDb WARNING --------------------------------------------------
-Py:ConfigurableDb WARNING   -<component name>: <module> - [ <duplicates> ]
-Py:ConfigurableDb WARNING --------------------------------------------------
-Py:ConfigurableDb WARNING   -TrigHLTJetHypo: TrigHLTJetHypo.TrigHLTJetHypoConf - ['TrigJetHypo.TrigJetHypoConf']
-Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
+Py:ConfigurableDb    INFO Read module info for 5102 configurables from 11 genConfDb files
+Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 Py:Athena            INFO including file "EventAthenaPool/EventAthenaPoolItemList_joboptions.py"
 Py:Athena            INFO including file "AthenaPoolTestAthenaPool/AthenaPoolTestAthenaPoolItemList_joboptions.py"
-['EventInfo#*', 'EventStreamInfo#*', 'MergedEventInfo#*', 'PileUpEventInfo#*', 'AthenaPoolTestMap#*', 'AthenaPoolTestMatrix#*', 'FauxTriggerMap#*', 'IAthenaPoolTestCollection#*', 'PixelRDOElemLinkVec#*', 'TestGaudiProperty#*', 'TrigPath#*', 'dummy_A#*', 'dummy_E#*']
+['EventInfo#*', 'EventStreamInfo#*', 'MergedEventInfo#*', 'PileUpEventInfo#*', 'IAthenaPoolTestCollection#*', 'AthenaPoolTestMatrix#*', 'AthenaPoolTestMap#*', 'FauxTriggerMap#*', 'dummy_A#*', 'dummy_E#*', 'TrigPath#*', 'TestGaudiProperty#*', 'PixelRDOElemLinkVec#*']
 ['EventInfo#*', 'EventInfo#*', 'IAthenaPoolTestCollection#AthenaPoolTestCollection_1', 'IAthenaPoolTestCollection#AthenaPoolTestCollection_2', 'IAthenaPoolTestCollection#AthenaPoolTestCollection_3', 'AthenaPoolTestMatrix#*']
 Py:Athena            INFO including file "AthenaPoolTest/NoStats_jobOptions.py"
 Py:Athena            INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level=0
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v3r4)
-                                          running on lxplus0008.cern.ch on Thu Mar 24 19:18:38 2016
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v4r1)
+                                          running on lxplus064.cern.ch on Fri Jul 22 22:00:02 2016
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
-ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level=0
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 StatusCodeSvc        INFO initialize
-RootDatabase.open Success SimplePoolFile.root File version:60414
+AthenaPoolTestD...  DEBUG Property update for OutputLevel : new value = 2
+AthenaPoolTestD...  DEBUG input handles: 0
+AthenaPoolTestD...  DEBUG output handles: 0
+AthenaPoolTestD...  DEBUG Data Deps for AthenaPoolTestDataWriter
+RootDatabase.open Success SimplePoolFile.root File version:60602
 HistogramPersis...WARNING Histograms saving not required.
 ApplicationMgr       INFO Application Manager Initialized successfully
-RootDatabase.open Success SimplePoolFile.root File version:60414
+RootDatabase.open Success SimplePoolFile.root File version:60602
 ApplicationMgr       INFO Application Manager Started successfully
 AthenaPoolTestD...  DEBUG Executing AthenaPoolTestDataWriter
 AthenaPoolTestD...  DEBUG Collection of A's
@@ -275,7 +275,7 @@ AthenaPoolTestD...  DEBUG Time, index 25 0
 AthenaPoolTestD...  DEBUG Event ID: [1,4294967296:0] 
 AthenaPoolTestD...  DEBUG Event type: user type McEvent
 AthenaPoolTestD...  DEBUG Pileup time, index type 25 0
-RootDatabase.open Success SimplePoolFile1.root File version:60414
+RootDatabase.open Success SimplePoolFile1.root File version:60602
 AthenaPoolTestD...  DEBUG Executing AthenaPoolTestDataWriter
 AthenaPoolTestD...  DEBUG Collection of A's
 AthenaPoolTestD...  DEBUG AthenaPoolTestA::printWhoYouAre A - a, b 1 2
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/test/AthenaPoolTestWrite.ref b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestWrite.ref
similarity index 94%
rename from AtlasTest/DatabaseTest/AthenaPoolTest/test/AthenaPoolTestWrite.ref
rename to AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestWrite.ref
index 827b77c854660f72abc377f296f598fba0e314ce..41170d613f6ef310b4ea86bfadbdd7ad3d490002 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/test/AthenaPoolTestWrite.ref
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestWrite.ref
@@ -1,40 +1,42 @@
-Thu Mar 24 19:17:49 CET 2016
+Fri Jul 22 21:41:14 CEST 2016
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [AtlasOffline-21.0.0] [x86_64-slc6-gcc49-dbg] [21.X.Y-VAL/rel_2] -- built on [2016-03-21 22:42]
+Py:Athena            INFO using release [WorkDir-22.0.0] [x86_64-slc6-gcc49-dbg] [private/private] -- built on [2016-07-22 20:52]
 Py:Athena            INFO including file "AthenaCommon/Bootstrap.py"
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
-Warning in <TInterpreter::ReadRootmapFile>: class  CaloSampling found in CaloEventDict.so  is already in libISF_FastCaloSimParametrizationLib.so 
+Warning in <TInterpreter::ReadRootmapFile>: class  Event found in libG4AtlasControlDict.so  is already in libtest_GPyTestDict.so 
+Warning in <TInterpreter::ReadRootmapFile>: class  UCharDbArray found in libStorageSvcDict.so  is already in libRootCnvDict.so 
 Py:Athena            INFO executing ROOT6Setup
 [?1034hPy:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "AthenaPoolTest/AthenaPoolTestWrite.py"
 Py:Athena            INFO 'gbl.AthenaServices.SetFatalHandler(flag)' is DEPRECATED
 Py:Athena            INFO instead, please consider using:
 Py:Athena            INFO  svcMgr.CoreDumpSvc.FatalHandler = flag
-Py:ConfigurableDb    INFO Read module info for 5049 configurables from 10 genConfDb files
-Py:ConfigurableDb WARNING Found 1 duplicates among the 10 genConfDb files :
-Py:ConfigurableDb WARNING --------------------------------------------------
-Py:ConfigurableDb WARNING   -<component name>: <module> - [ <duplicates> ]
-Py:ConfigurableDb WARNING --------------------------------------------------
-Py:ConfigurableDb WARNING   -TrigHLTJetHypo: TrigHLTJetHypo.TrigHLTJetHypoConf - ['TrigJetHypo.TrigJetHypoConf']
-Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
+Py:ConfigurableDb    INFO Read module info for 5102 configurables from 11 genConfDb files
+Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 Py:Athena            INFO including file "EventAthenaPool/EventAthenaPoolItemList_joboptions.py"
 Py:Athena            INFO including file "AthenaPoolTestAthenaPool/AthenaPoolTestAthenaPoolItemList_joboptions.py"
-['EventInfo#*', 'EventStreamInfo#*', 'MergedEventInfo#*', 'PileUpEventInfo#*', 'AthenaPoolTestMap#*', 'AthenaPoolTestMatrix#*', 'FauxTriggerMap#*', 'IAthenaPoolTestCollection#*', 'PixelRDOElemLinkVec#*', 'TestGaudiProperty#*', 'TrigPath#*', 'dummy_A#*', 'dummy_E#*']
-['EventInfo#*', 'EventInfo#*', 'EventStreamInfo#*', 'MergedEventInfo#*', 'PileUpEventInfo#*', 'AthenaPoolTestMap#*', 'AthenaPoolTestMatrix#*', 'FauxTriggerMap#*', 'IAthenaPoolTestCollection#*', 'PixelRDOElemLinkVec#*', 'TestGaudiProperty#*', 'TrigPath#*', 'dummy_A#*', 'dummy_E#*']
+['EventInfo#*', 'EventStreamInfo#*', 'MergedEventInfo#*', 'PileUpEventInfo#*', 'IAthenaPoolTestCollection#*', 'AthenaPoolTestMatrix#*', 'AthenaPoolTestMap#*', 'FauxTriggerMap#*', 'dummy_A#*', 'dummy_E#*', 'TrigPath#*', 'TestGaudiProperty#*', 'PixelRDOElemLinkVec#*']
+['EventInfo#*', 'EventInfo#*', 'EventStreamInfo#*', 'MergedEventInfo#*', 'PileUpEventInfo#*', 'IAthenaPoolTestCollection#*', 'AthenaPoolTestMatrix#*', 'AthenaPoolTestMap#*', 'FauxTriggerMap#*', 'dummy_A#*', 'dummy_E#*', 'TrigPath#*', 'TestGaudiProperty#*', 'PixelRDOElemLinkVec#*']
 Py:Athena            INFO including file "AthenaPoolTest/NoStats_jobOptions.py"
 Py:Athena            INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level=0
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v3r4)
-                                          running on lxplus0008.cern.ch on Thu Mar 24 19:17:57 2016
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v4r1)
+                                          running on lxplus064.cern.ch on Fri Jul 22 21:41:23 2016
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
-ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level=0
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 StatusCodeSvc        INFO initialize
+AthenaPoolTestD...  DEBUG Property update for OutputLevel : new value = 2
+AthenaPoolTestD...  DEBUG input handles: 0
+AthenaPoolTestD...  DEBUG output handles: 0
+AthenaPoolTestD...  DEBUG Data Deps for AthenaPoolTestDataWriter
 HistogramPersis...WARNING Histograms saving not required.
+EventSelector       DEBUG Property update for OutputLevel : new value = 2
+EventSelector        INFO  Enter McEventSelector Initialization 
 EventSelector       DEBUG  McEventSelector Initialized Properly ... 
 ApplicationMgr       INFO Application Manager Initialized successfully
 ApplicationMgr       INFO Application Manager Started successfully
@@ -259,7 +261,7 @@ AthenaPoolTestD...  DEBUG Time, index 25 0
 AthenaPoolTestD...  DEBUG Event ID: [1,4294967296:0] 
 AthenaPoolTestD...  DEBUG Event type: user type McEvent
 AthenaPoolTestD...  DEBUG Pileup time, index type 25 0
-RootDatabase.open Success SimplePoolFile.root File version:60414
+RootDatabase.open Success SimplePoolFile.root File version:60602
 EventSelector       DEBUG ............. Next Event .............
 EventSelector       DEBUG ............. createAddress .............
 AthenaPoolTestD...  DEBUG Executing AthenaPoolTestDataWriter
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/test/AthenaPoolTestWrite2.ref b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestWrite2.ref
similarity index 100%
rename from AtlasTest/DatabaseTest/AthenaPoolTest/test/AthenaPoolTestWrite2.ref
rename to AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestWrite2.ref
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/test/AtlfastPoolWriteOptions.ref b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AtlfastPoolWriteOptions.ref
similarity index 100%
rename from AtlasTest/DatabaseTest/AthenaPoolTest/test/AtlfastPoolWriteOptions.ref
rename to AtlasTest/DatabaseTest/AthenaPoolTest/share/AtlfastPoolWriteOptions.ref
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/test/CaloCluster2StepReader.ref b/AtlasTest/DatabaseTest/AthenaPoolTest/share/CaloCluster2StepReader.ref
similarity index 100%
rename from AtlasTest/DatabaseTest/AthenaPoolTest/test/CaloCluster2StepReader.ref
rename to AtlasTest/DatabaseTest/AthenaPoolTest/share/CaloCluster2StepReader.ref
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/test/CaloClusterReader.ref b/AtlasTest/DatabaseTest/AthenaPoolTest/share/CaloClusterReader.ref
similarity index 100%
rename from AtlasTest/DatabaseTest/AthenaPoolTest/test/CaloClusterReader.ref
rename to AtlasTest/DatabaseTest/AthenaPoolTest/share/CaloClusterReader.ref
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/test/CaloClusterStep1Writer.ref b/AtlasTest/DatabaseTest/AthenaPoolTest/share/CaloClusterStep1Writer.ref
similarity index 100%
rename from AtlasTest/DatabaseTest/AthenaPoolTest/test/CaloClusterStep1Writer.ref
rename to AtlasTest/DatabaseTest/AthenaPoolTest/share/CaloClusterStep1Writer.ref
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/test/CaloClusterStep2Writer.ref b/AtlasTest/DatabaseTest/AthenaPoolTest/share/CaloClusterStep2Writer.ref
similarity index 100%
rename from AtlasTest/DatabaseTest/AthenaPoolTest/test/CaloClusterStep2Writer.ref
rename to AtlasTest/DatabaseTest/AthenaPoolTest/share/CaloClusterStep2Writer.ref
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoRead.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoRead.py
index 6bba34f73baf1ffe7e8b8685cbd69e2c2ad273f5..7aa6a1c6ec941955613322cc3176aebaa2561b03 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoRead.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoRead.py
@@ -36,7 +36,7 @@ from RecExConfig.RecFlags import rec
 rec.doAOD     = False
 rec.doTrigger = False
 rec.doWriteTAG  = False
-DetDescrVersion = "ATLAS-GEO-17-00-00"
+#DetDescrVersion = "ATLAS-GEO-17-00-00"
 include( "RecExCond/RecExCommon_flags.py" )
 
 # Set local flags - only need LAr DetDescr
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWrite.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWrite.py
index 1aa9acd170046661a2df70d93f7efbb28ff68392..2db82ee7759f58d79679b1e4638e7a6e6b9415c3 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWrite.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWrite.py
@@ -37,7 +37,7 @@ from RecExConfig.RecFlags import rec
 rec.doAOD     = False
 rec.doTrigger = False
 rec.doWriteTAG  = False
-DetDescrVersion = "ATLAS-GEO-17-00-00"
+#DetDescrVersion = "ATLAS-GEO-17-00-00"
 include( "RecExCond/RecExCommon_flags.py" )
 
 #DetFlags.detdescr.ID_setOff()
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep2.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep2.py
index 9c55e02460fa3f41ee55eb44c9ac4b779c540f26..143475d9b78cac57744256ba4b7361a82c677e70 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep2.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep2.py
@@ -44,7 +44,7 @@ from RecExConfig.RecFlags import rec
 rec.doAOD     = False
 rec.doTrigger = False
 rec.doWriteTAG  = False
-DetDescrVersion = "ATLAS-GEO-17-00-00"
+#DetDescrVersion = "ATLAS-GEO-17-00-00"
 include( "RecExCond/RecExCommon_flags.py" )
 # Set local flags - only need LAr DetDescr
 #DetFlags.detdescr.ID_setOff()
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep3.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep3.py
index cfae68095d332d0f4d1f07d238a1e456f339d1f3..45a7d2a8e3d6d8579fc1ae7537080ce6414a20db 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep3.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep3.py
@@ -45,7 +45,7 @@ from RecExConfig.RecFlags import rec
 rec.doAOD     = False
 rec.doTrigger = False
 rec.doWriteTAG  = False
-DetDescrVersion = "ATLAS-GEO-17-00-00"
+#DetDescrVersion = "ATLAS-GEO-17-00-00"
 include( "RecExCond/RecExCommon_flags.py" )
 
 # Set local flags - only need LAr DetDescr
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep4.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep4.py
index de197433edf0d20b30e3b151b3756ff2db904769..fa1314e41c5b0dc98e1b4ec73a5d4730c5770370 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep4.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep4.py
@@ -45,7 +45,7 @@ from RecExConfig.RecFlags import rec
 rec.doAOD     = False
 rec.doTrigger = False
 rec.doWriteTAG  = False
-DetDescrVersion = "ATLAS-GEO-17-00-00"
+#DetDescrVersion = "ATLAS-GEO-17-00-00"
 include( "RecExCond/RecExCommon_flags.py" )
 
 # Set local flags - only need LAr DetDescr
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep5.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep5.py
index df19a4a56ee968988aaca6abc5a1c140232c3b11..20af63ff13120863330d1b04cb1e0b44a2603926 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep5.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep5.py
@@ -45,7 +45,7 @@ from RecExConfig.RecFlags import rec
 rec.doAOD     = False
 rec.doTrigger = False
 rec.doWriteTAG  = False
-DetDescrVersion = "ATLAS-GEO-17-00-00"
+#DetDescrVersion = "ATLAS-GEO-17-00-00"
 include( "RecExCond/RecExCommon_flags.py" )
 
 # Set local flags - only need LAr DetDescr
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/test/LArCellContRead.ref b/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContRead.ref
similarity index 92%
rename from AtlasTest/DatabaseTest/AthenaPoolTest/test/LArCellContRead.ref
rename to AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContRead.ref
index 6967ca3a29df7a255bd6639fb93a61903ebe935c..1f40a45c4f1f04ed06f623cdb6331c85fc7603ed 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/test/LArCellContRead.ref
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContRead.ref
@@ -1,20 +1,16 @@
-Thu Mar 24 20:58:18 CET 2016
+Fri Jul 22 23:29:56 CEST 2016
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [AtlasOffline-21.0.0] [x86_64-slc6-gcc49-dbg] [21.X.Y-VAL/rel_2] -- built on [2016-03-21 22:42]
+Py:Athena            INFO using release [WorkDir-22.0.0] [x86_64-slc6-gcc49-dbg] [private/private] -- built on [2016-07-22 23:19]
 Py:Athena            INFO including file "AthenaCommon/Bootstrap.py"
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
-Warning in <TInterpreter::ReadRootmapFile>: class  CaloSampling found in CaloEventDict.so  is already in libISF_FastCaloSimParametrizationLib.so 
+Warning in <TInterpreter::ReadRootmapFile>: class  Event found in libG4AtlasControlDict.so  is already in libtest_GPyTestDict.so 
+Warning in <TInterpreter::ReadRootmapFile>: class  UCharDbArray found in libStorageSvcDict.so  is already in libRootCnvDict.so 
 Py:Athena            INFO executing ROOT6Setup
 [?1034hPy:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "AthenaPoolTest/LArCellContReader_jobOptions.py"
-Py:ConfigurableDb    INFO Read module info for 5049 configurables from 10 genConfDb files
-Py:ConfigurableDb WARNING Found 1 duplicates among the 10 genConfDb files :
-Py:ConfigurableDb WARNING --------------------------------------------------
-Py:ConfigurableDb WARNING   -<component name>: <module> - [ <duplicates> ]
-Py:ConfigurableDb WARNING --------------------------------------------------
-Py:ConfigurableDb WARNING   -TrigHLTJetHypo: TrigHLTJetHypo.TrigHLTJetHypoConf - ['TrigJetHypo.TrigJetHypoConf']
-Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
+Py:ConfigurableDb    INFO Read module info for 5102 configurables from 11 genConfDb files
+Py:ConfigurableDb    INFO No duplicates have been found: that's good !
 Py:Athena            INFO including file "RecExCond/AllDet_detDescr.py"
 Py:Athena            INFO including file "RecExCond/RecExCommon_DetFlags.py"
 Py:RecExCommon_DetFlags    INFO DetFlags already defined.by user : user should have fully configured it already! 
@@ -29,9 +25,10 @@ Py:MuonRec           INFO Changing default enableErrorTuning = True
 Py:MuonRec           INFO Changing default writeSDOs = True
 Py:MuonRec           INFO Changing default calibNtupleTrigger = False
 Py:Athena            INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-EventInfoMgtInit: Got release version  AtlasOffline-rel_2
+SetGeometryVersion.py obtained major release version 22
+EventInfoMgtInit: Got release version  AtlasOffline-rel_5
 Py:IOVDbSvc.CondDB    INFO Setting up conditions DB access to instance OFLP200
-Data source lookup using /afs/cern.ch/atlas/software/builds/nightlies/devval/AtlasCore/rel_2/InstallArea/XML/AtlasAuthentication/dblookup.xml file
+Data source lookup using /afs/cern.ch/atlas/software/builds/nightlies/devval/AtlasCore/rel_5/InstallArea/x86_64-slc6-gcc49-dbg/XML/AtlasAuthentication/dblookup.xml file
 Py:Athena            INFO including file "CaloIdCnv/CaloIdCnv_joboptions.py"
 Py:Athena            INFO including file "CaloConditions/CaloConditions_jobOptions.py"
 Py:Athena            INFO including file "CaloConditions/LArTTCellMap_ATLAS_jobOptions.py"
@@ -49,42 +46,49 @@ Py:JobPropertyContainer::    INFO  setting folder /LAR/Identifier/CalibIdMap wit
 Py:JobPropertyContainer::    INFO  setting folder /LAR/Identifier/FebRodMap with tag LARIdentifierFebRodMap-005
 Py:Athena            INFO including file "AthenaPoolTest/NoStats_jobOptions.py"
 Py:Athena            INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level=0
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v3r4)
-                                          running on lxplus0008.cern.ch on Thu Mar 24 20:58:26 2016
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v4r1)
+                                          running on lxplus064.cern.ch on Fri Jul 22 23:30:05 2016
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
-ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level=0
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 StatusCodeSvc        INFO initialize
-RootDatabase.open Success SimplePoolFile.root File version:60414
+PoolSvc           WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml via PathResolver, check your DATAPATH variable
+RootDatabase.open Success SimplePoolFile.root File version:60602
 RalSessionMgr Warning Use COOL_DISABLE_CORALCONNECTIONPOOLCLEANUP
-CORAL/Services/ConnectionService Warning Failed to connect to service sqlite200/ALLP200.db (coral::Exception): 'CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/user/s/ssnyder/atlas-work3d/AtlasTest/DatabaseTest/AthenaPoolTest/run/sqlite200 is not writable" )' - do NOT retry
-CORAL/Services/ConnectionService Warning Failure while attempting to connect to "sqlite_file:sqlite200/ALLP200.db": CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/user/s/ssnyder/atlas-work3d/AtlasTest/DatabaseTest/AthenaPoolTest/run/sqlite200 is not writable" )
-CORAL/Services/ConnectionService Warning Failed to connect to service sqlite200/ALLP200.db (coral::Exception): 'CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/user/s/ssnyder/atlas-work3d/AtlasTest/DatabaseTest/AthenaPoolTest/run/sqlite200 is not writable" )' - do NOT retry
-CORAL/Services/ConnectionService Warning Failure while attempting to connect to "sqlite_file:sqlite200/ALLP200.db": CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/user/s/ssnyder/atlas-work3d/AtlasTest/DatabaseTest/AthenaPoolTest/run/sqlite200 is not writable" )
-CORAL/Services/ConnectionService Warning Failed to connect to service geomDB/geomDB_sqlite (coral::Exception): 'CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/user/s/ssnyder/atlas-work3d/AtlasTest/DatabaseTest/AthenaPoolTest/run/geomDB is not writable" )' - do NOT retry
-CORAL/Services/ConnectionService Warning Failure while attempting to connect to "sqlite_file:geomDB/geomDB_sqlite": CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/user/s/ssnyder/atlas-work3d/AtlasTest/DatabaseTest/AthenaPoolTest/run/geomDB is not writable" )
+CORAL/Services/ConnectionService Warning Failed to connect to service sqlite200/ALLP200.db (coral::Exception): 'CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/work/s/ssnyder/builds/atlas-work3e/build-x86_64-slc6-gcc49-dbg/AtlasTest/DatabaseTest/AthenaPoolTest/unitTestRun/sqlite200 is not writable" )' - do NOT retry
+CORAL/Services/ConnectionService Warning Failure while attempting to connect to "sqlite_file:sqlite200/ALLP200.db": CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/work/s/ssnyder/builds/atlas-work3e/build-x86_64-slc6-gcc49-dbg/AtlasTest/DatabaseTest/AthenaPoolTest/unitTestRun/sqlite200 is not writable" )
+CORAL/Services/ConnectionService Warning Failed to connect to service sqlite200/ALLP200.db (coral::Exception): 'CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/work/s/ssnyder/builds/atlas-work3e/build-x86_64-slc6-gcc49-dbg/AtlasTest/DatabaseTest/AthenaPoolTest/unitTestRun/sqlite200 is not writable" )' - do NOT retry
+CORAL/Services/ConnectionService Warning Failure while attempting to connect to "sqlite_file:sqlite200/ALLP200.db": CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/work/s/ssnyder/builds/atlas-work3e/build-x86_64-slc6-gcc49-dbg/AtlasTest/DatabaseTest/AthenaPoolTest/unitTestRun/sqlite200 is not writable" )
+CORAL/Services/ConnectionService Warning Failed to connect to service geomDB/geomDB_sqlite (coral::Exception): 'CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/work/s/ssnyder/builds/atlas-work3e/build-x86_64-slc6-gcc49-dbg/AtlasTest/DatabaseTest/AthenaPoolTest/unitTestRun/geomDB is not writable" )' - do NOT retry
+CORAL/Services/ConnectionService Warning Failure while attempting to connect to "sqlite_file:geomDB/geomDB_sqlite": CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/work/s/ssnyder/builds/atlas-work3e/build-x86_64-slc6-gcc49-dbg/AtlasTest/DatabaseTest/AthenaPoolTest/unitTestRun/geomDB is not writable" )
+warn  [frontier.c:1014]: Request 15 on chan 3 failed at Fri Jul 22 23:30:59 2016: -9 [fn-socket.c:125]: connect to 128.142.152.230 timed out after 5 seconds
+warn  [frontier.c:1114]: Trying next proxy [188.184.129.19] with same server atlasfrontier-ai.cern.ch
 ============== EMEC Construction ===============
   multi-layered version of absorbers activated, mlabs == 1
 ================================================
 ============== EMEC Construction ===============
   multi-layered version of absorbers activated, mlabs == 1
 ================================================
+LArCellContFake...  DEBUG Property update for OutputLevel : new value = 2
 LArCellContFake...   INFO LArCellContFakeReader::initialize()
-CORAL/Services/ConnectionService Warning Failed to connect to service geomDB/geomDB_sqlite (coral::Exception): 'CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/user/s/ssnyder/atlas-work3d/AtlasTest/DatabaseTest/AthenaPoolTest/run/geomDB is not writable" )' - do NOT retry
-CORAL/Services/ConnectionService Warning Failure while attempting to connect to "sqlite_file:geomDB/geomDB_sqlite": CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/user/s/ssnyder/atlas-work3d/AtlasTest/DatabaseTest/AthenaPoolTest/run/geomDB is not writable" )
+CORAL/Services/ConnectionService Warning Failed to connect to service geomDB/geomDB_sqlite (coral::Exception): 'CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/work/s/ssnyder/builds/atlas-work3e/build-x86_64-slc6-gcc49-dbg/AtlasTest/DatabaseTest/AthenaPoolTest/unitTestRun/geomDB is not writable" )' - do NOT retry
+CORAL/Services/ConnectionService Warning Failure while attempting to connect to "sqlite_file:geomDB/geomDB_sqlite": CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/work/s/ssnyder/builds/atlas-work3e/build-x86_64-slc6-gcc49-dbg/AtlasTest/DatabaseTest/AthenaPoolTest/unitTestRun/geomDB is not writable" )
 DetectorStore     WARNING retrieve(default): No valid proxy for default object 
  of type TileDetDescrManager(CLID 2941)
 CaloMgrDetDescrCnvWARNING Could not get the TileDetectorManager. No Calo Elements will be built for Tile
+LArCellContFake...  DEBUG input handles: 0
+LArCellContFake...  DEBUG output handles: 0
+LArCellContFake...  DEBUG Data Deps for LArCellContFakeReader
 HistogramPersis...WARNING Histograms saving not required.
 ApplicationMgr       INFO Application Manager Initialized successfully
-RootDatabase.open Success SimplePoolFile.root File version:60414
+RootDatabase.open Success SimplePoolFile.root File version:60602
 ApplicationMgr       INFO Application Manager Started successfully
-CORAL/Services/ConnectionService Warning Failed to connect to service sqlite200/ALLP200.db (coral::Exception): 'CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/user/s/ssnyder/atlas-work3d/AtlasTest/DatabaseTest/AthenaPoolTest/run/sqlite200 is not writable" )' - do NOT retry
-CORAL/Services/ConnectionService Warning Failure while attempting to connect to "sqlite_file:sqlite200/ALLP200.db": CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/user/s/ssnyder/atlas-work3d/AtlasTest/DatabaseTest/AthenaPoolTest/run/sqlite200 is not writable" )
+CORAL/Services/ConnectionService Warning Failed to connect to service sqlite200/ALLP200.db (coral::Exception): 'CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/work/s/ssnyder/builds/atlas-work3e/build-x86_64-slc6-gcc49-dbg/AtlasTest/DatabaseTest/AthenaPoolTest/unitTestRun/sqlite200 is not writable" )' - do NOT retry
+CORAL/Services/ConnectionService Warning Failure while attempting to connect to "sqlite_file:sqlite200/ALLP200.db": CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/work/s/ssnyder/builds/atlas-work3e/build-x86_64-slc6-gcc49-dbg/AtlasTest/DatabaseTest/AthenaPoolTest/unitTestRun/sqlite200 is not writable" )
 RootDatabase.open Success /afs/cern.ch/atlas/conditions/poolcond/vol0/cond09_mc.000016.gen.COND/cond09_mc.000016.gen.COND._0001.pool.root File version:52200
 RootDatabase.open Success /afs/cern.ch/atlas/conditions/poolcond/vol0/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
 LArCellContFake...  DEBUG LArCellContFakeReader::execute()
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/test/LArCellContReadByLFN.ref b/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContReadByLFN.ref
similarity index 100%
rename from AtlasTest/DatabaseTest/AthenaPoolTest/test/LArCellContReadByLFN.ref
rename to AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContReadByLFN.ref
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/test/LArCellContReadReg.ref b/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContReadReg.ref
similarity index 100%
rename from AtlasTest/DatabaseTest/AthenaPoolTest/test/LArCellContReadReg.ref
rename to AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContReadReg.ref
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/test/LArCellContReadRegStep1.ref b/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContReadRegStep1.ref
similarity index 100%
rename from AtlasTest/DatabaseTest/AthenaPoolTest/test/LArCellContReadRegStep1.ref
rename to AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContReadRegStep1.ref
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/test/LArCellContReadRegStep2.ref b/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContReadRegStep2.ref
similarity index 100%
rename from AtlasTest/DatabaseTest/AthenaPoolTest/test/LArCellContReadRegStep2.ref
rename to AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContReadRegStep2.ref
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/test/LArCellContWriteReg.ref b/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriteReg.ref
similarity index 100%
rename from AtlasTest/DatabaseTest/AthenaPoolTest/test/LArCellContWriteReg.ref
rename to AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriteReg.ref
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/test/LArCellContWriteRegStep2.ref b/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriteRegStep2.ref
similarity index 100%
rename from AtlasTest/DatabaseTest/AthenaPoolTest/test/LArCellContWriteRegStep2.ref
rename to AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriteRegStep2.ref
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/test/LArCellContWriteRegStep3.ref b/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriteRegStep3.ref
similarity index 100%
rename from AtlasTest/DatabaseTest/AthenaPoolTest/test/LArCellContWriteRegStep3.ref
rename to AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriteRegStep3.ref
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/test/LArCellContWriteStep1.ref b/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriteStep1.ref
similarity index 100%
rename from AtlasTest/DatabaseTest/AthenaPoolTest/test/LArCellContWriteStep1.ref
rename to AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriteStep1.ref
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/test/LArCellContWriteStep2.ref b/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriteStep2.ref
similarity index 100%
rename from AtlasTest/DatabaseTest/AthenaPoolTest/test/LArCellContWriteStep2.ref
rename to AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriteStep2.ref
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/test/LArCellContWriter.ref b/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter.ref
similarity index 92%
rename from AtlasTest/DatabaseTest/AthenaPoolTest/test/LArCellContWriter.ref
rename to AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter.ref
index 32305857909cb55298ec827cc00ca5713ca6a787..729d4c1497411f64dbd314f5a72ae69f530e6ea9 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/test/LArCellContWriter.ref
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter.ref
@@ -1,10 +1,11 @@
-Thu Mar 24 20:57:47 CET 2016
+Fri Jul 22 23:15:25 CEST 2016
 Preloading tcmalloc_minimal.so
 Py:Athena            INFO including file "AthenaCommon/Preparation.py"
-Py:Athena            INFO using release [AtlasOffline-21.0.0] [x86_64-slc6-gcc49-dbg] [21.X.Y-VAL/rel_2] -- built on [2016-03-21 22:42]
+Py:Athena            INFO using release [WorkDir-22.0.0] [x86_64-slc6-gcc49-dbg] [private/private] -- built on [2016-07-22 22:59]
 Py:Athena            INFO including file "AthenaCommon/Bootstrap.py"
 Py:Athena            INFO including file "AthenaCommon/Atlas.UnixStandardJob.py"
-Warning in <TInterpreter::ReadRootmapFile>: class  CaloSampling found in CaloEventDict.so  is already in libISF_FastCaloSimParametrizationLib.so 
+Warning in <TInterpreter::ReadRootmapFile>: class  Event found in libG4AtlasControlDict.so  is already in libtest_GPyTestDict.so 
+Warning in <TInterpreter::ReadRootmapFile>: class  UCharDbArray found in libStorageSvcDict.so  is already in libRootCnvDict.so 
 Py:Athena            INFO executing ROOT6Setup
 [?1034hPy:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "AthenaPoolTest/LArCellContWriter_jobOptions.py"
@@ -22,16 +23,12 @@ Py:MuonRec           INFO Changing default enableErrorTuning = True
 Py:MuonRec           INFO Changing default writeSDOs = True
 Py:MuonRec           INFO Changing default calibNtupleTrigger = False
 Py:Athena            INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
-Py:ConfigurableDb    INFO Read module info for 5049 configurables from 10 genConfDb files
-Py:ConfigurableDb WARNING Found 1 duplicates among the 10 genConfDb files :
-Py:ConfigurableDb WARNING --------------------------------------------------
-Py:ConfigurableDb WARNING   -<component name>: <module> - [ <duplicates> ]
-Py:ConfigurableDb WARNING --------------------------------------------------
-Py:ConfigurableDb WARNING   -TrigHLTJetHypo: TrigHLTJetHypo.TrigHLTJetHypoConf - ['TrigJetHypo.TrigJetHypoConf']
-Py:ConfigurableDb WARNING Fix your cmt/requirements file !!
-EventInfoMgtInit: Got release version  AtlasOffline-rel_2
+SetGeometryVersion.py obtained major release version 22
+Py:ConfigurableDb    INFO Read module info for 5102 configurables from 11 genConfDb files
+Py:ConfigurableDb    INFO No duplicates have been found: that's good !
+EventInfoMgtInit: Got release version  AtlasOffline-rel_5
 Py:IOVDbSvc.CondDB    INFO Setting up conditions DB access to instance OFLP200
-Data source lookup using /afs/cern.ch/atlas/software/builds/nightlies/devval/AtlasCore/rel_2/InstallArea/XML/AtlasAuthentication/dblookup.xml file
+Data source lookup using /afs/cern.ch/atlas/software/builds/nightlies/devval/AtlasCore/rel_5/InstallArea/x86_64-slc6-gcc49-dbg/XML/AtlasAuthentication/dblookup.xml file
 Py:Athena            INFO including file "CaloIdCnv/CaloIdCnv_joboptions.py"
 Py:Athena            INFO including file "CaloConditions/CaloConditions_jobOptions.py"
 Py:Athena            INFO including file "CaloConditions/LArTTCellMap_ATLAS_jobOptions.py"
@@ -49,40 +46,45 @@ Py:JobPropertyContainer::    INFO  setting folder /LAR/Identifier/CalibIdMap wit
 Py:JobPropertyContainer::    INFO  setting folder /LAR/Identifier/FebRodMap with tag LARIdentifierFebRodMap-005
 Py:Athena            INFO including file "AthenaPoolTest/NoStats_jobOptions.py"
 Py:Athena            INFO including file "AthenaCommon/runbatch.py"
-ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level=0
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 ApplicationMgr    SUCCESS 
 ====================================================================================================================================
-                                                   Welcome to ApplicationMgr (GaudiCoreSvc v3r4)
-                                          running on lxplus0008.cern.ch on Thu Mar 24 20:57:54 2016
+                                                   Welcome to ApplicationMgr (GaudiCoreSvc v4r1)
+                                          running on lxplus064.cern.ch on Fri Jul 22 23:15:35 2016
 ====================================================================================================================================
 ApplicationMgr       INFO Successfully loaded modules : AthenaServices
 ApplicationMgr       INFO Application Manager Configured successfully
-ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level=0
+ApplicationMgr       INFO Updating Gaudi::PluginService::SetDebug(level) to level= 'PluginDebugLevel':0
 StatusCodeSvc        INFO initialize
+PoolSvc           WARNING Unable to locate catalog for prfile:poolcond/PoolCat_oflcond.xml via PathResolver, check your DATAPATH variable
 RalSessionMgr Warning Use COOL_DISABLE_CORALCONNECTIONPOOLCLEANUP
-CORAL/Services/ConnectionService Warning Failed to connect to service sqlite200/ALLP200.db (coral::Exception): 'CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/user/s/ssnyder/atlas-work3d/AtlasTest/DatabaseTest/AthenaPoolTest/run/sqlite200 is not writable" )' - do NOT retry
-CORAL/Services/ConnectionService Warning Failure while attempting to connect to "sqlite_file:sqlite200/ALLP200.db": CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/user/s/ssnyder/atlas-work3d/AtlasTest/DatabaseTest/AthenaPoolTest/run/sqlite200 is not writable" )
-CORAL/Services/ConnectionService Warning Failed to connect to service sqlite200/ALLP200.db (coral::Exception): 'CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/user/s/ssnyder/atlas-work3d/AtlasTest/DatabaseTest/AthenaPoolTest/run/sqlite200 is not writable" )' - do NOT retry
-CORAL/Services/ConnectionService Warning Failure while attempting to connect to "sqlite_file:sqlite200/ALLP200.db": CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/user/s/ssnyder/atlas-work3d/AtlasTest/DatabaseTest/AthenaPoolTest/run/sqlite200 is not writable" )
-CORAL/Services/ConnectionService Warning Failed to connect to service geomDB/geomDB_sqlite (coral::Exception): 'CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/user/s/ssnyder/atlas-work3d/AtlasTest/DatabaseTest/AthenaPoolTest/run/geomDB is not writable" )' - do NOT retry
-CORAL/Services/ConnectionService Warning Failure while attempting to connect to "sqlite_file:geomDB/geomDB_sqlite": CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/user/s/ssnyder/atlas-work3d/AtlasTest/DatabaseTest/AthenaPoolTest/run/geomDB is not writable" )
+CORAL/Services/ConnectionService Warning Failed to connect to service sqlite200/ALLP200.db (coral::Exception): 'CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/work/s/ssnyder/builds/atlas-work3e/build-x86_64-slc6-gcc49-dbg/AtlasTest/DatabaseTest/AthenaPoolTest/unitTestRun/sqlite200 is not writable" )' - do NOT retry
+CORAL/Services/ConnectionService Warning Failure while attempting to connect to "sqlite_file:sqlite200/ALLP200.db": CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/work/s/ssnyder/builds/atlas-work3e/build-x86_64-slc6-gcc49-dbg/AtlasTest/DatabaseTest/AthenaPoolTest/unitTestRun/sqlite200 is not writable" )
+CORAL/Services/ConnectionService Warning Failed to connect to service sqlite200/ALLP200.db (coral::Exception): 'CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/work/s/ssnyder/builds/atlas-work3e/build-x86_64-slc6-gcc49-dbg/AtlasTest/DatabaseTest/AthenaPoolTest/unitTestRun/sqlite200 is not writable" )' - do NOT retry
+CORAL/Services/ConnectionService Warning Failure while attempting to connect to "sqlite_file:sqlite200/ALLP200.db": CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/work/s/ssnyder/builds/atlas-work3e/build-x86_64-slc6-gcc49-dbg/AtlasTest/DatabaseTest/AthenaPoolTest/unitTestRun/sqlite200 is not writable" )
+CORAL/Services/ConnectionService Warning Failed to connect to service geomDB/geomDB_sqlite (coral::Exception): 'CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/work/s/ssnyder/builds/atlas-work3e/build-x86_64-slc6-gcc49-dbg/AtlasTest/DatabaseTest/AthenaPoolTest/unitTestRun/geomDB is not writable" )' - do NOT retry
+CORAL/Services/ConnectionService Warning Failure while attempting to connect to "sqlite_file:geomDB/geomDB_sqlite": CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/work/s/ssnyder/builds/atlas-work3e/build-x86_64-slc6-gcc49-dbg/AtlasTest/DatabaseTest/AthenaPoolTest/unitTestRun/geomDB is not writable" )
 ============== EMEC Construction ===============
   multi-layered version of absorbers activated, mlabs == 1
 ================================================
 ============== EMEC Construction ===============
   multi-layered version of absorbers activated, mlabs == 1
 ================================================
+LArCellContFake...  DEBUG Property update for OutputLevel : new value = 2
 LArCellContFake...   INFO LArCellContFakeWriter::initialize()
-CORAL/Services/ConnectionService Warning Failed to connect to service geomDB/geomDB_sqlite (coral::Exception): 'CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/user/s/ssnyder/atlas-work3d/AtlasTest/DatabaseTest/AthenaPoolTest/run/geomDB is not writable" )' - do NOT retry
-CORAL/Services/ConnectionService Warning Failure while attempting to connect to "sqlite_file:geomDB/geomDB_sqlite": CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/user/s/ssnyder/atlas-work3d/AtlasTest/DatabaseTest/AthenaPoolTest/run/geomDB is not writable" )
+CORAL/Services/ConnectionService Warning Failed to connect to service geomDB/geomDB_sqlite (coral::Exception): 'CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/work/s/ssnyder/builds/atlas-work3e/build-x86_64-slc6-gcc49-dbg/AtlasTest/DatabaseTest/AthenaPoolTest/unitTestRun/geomDB is not writable" )' - do NOT retry
+CORAL/Services/ConnectionService Warning Failure while attempting to connect to "sqlite_file:geomDB/geomDB_sqlite": CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/work/s/ssnyder/builds/atlas-work3e/build-x86_64-slc6-gcc49-dbg/AtlasTest/DatabaseTest/AthenaPoolTest/unitTestRun/geomDB is not writable" )
 DetectorStore     WARNING retrieve(default): No valid proxy for default object 
  of type TileDetDescrManager(CLID 2941)
 CaloMgrDetDescrCnvWARNING Could not get the TileDetectorManager. No Calo Elements will be built for Tile
+LArCellContFake...  DEBUG input handles: 0
+LArCellContFake...  DEBUG output handles: 0
+LArCellContFake...  DEBUG Data Deps for LArCellContFakeWriter
 HistogramPersis...WARNING Histograms saving not required.
 ApplicationMgr       INFO Application Manager Initialized successfully
 ApplicationMgr       INFO Application Manager Started successfully
-CORAL/Services/ConnectionService Warning Failed to connect to service sqlite200/ALLP200.db (coral::Exception): 'CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/user/s/ssnyder/atlas-work3d/AtlasTest/DatabaseTest/AthenaPoolTest/run/sqlite200 is not writable" )' - do NOT retry
-CORAL/Services/ConnectionService Warning Failure while attempting to connect to "sqlite_file:sqlite200/ALLP200.db": CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/user/s/ssnyder/atlas-work3d/AtlasTest/DatabaseTest/AthenaPoolTest/run/sqlite200 is not writable" )
+CORAL/Services/ConnectionService Warning Failed to connect to service sqlite200/ALLP200.db (coral::Exception): 'CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/work/s/ssnyder/builds/atlas-work3e/build-x86_64-slc6-gcc49-dbg/AtlasTest/DatabaseTest/AthenaPoolTest/unitTestRun/sqlite200 is not writable" )' - do NOT retry
+CORAL/Services/ConnectionService Warning Failure while attempting to connect to "sqlite_file:sqlite200/ALLP200.db": CORAL/RelationalPlugins/sqlite ( CORAL : "Connection::connect" from "/afs/cern.ch/work/s/ssnyder/builds/atlas-work3e/build-x86_64-slc6-gcc49-dbg/AtlasTest/DatabaseTest/AthenaPoolTest/unitTestRun/sqlite200 is not writable" )
 RootDatabase.open Success /afs/cern.ch/atlas/conditions/poolcond/vol0/cond09_mc.000016.gen.COND/cond09_mc.000016.gen.COND._0001.pool.root File version:52200
 RootDatabase.open Success /afs/cern.ch/atlas/conditions/poolcond/vol0/cond08_mc.000003.gen.COND/cond08_mc.000003.gen.COND._0064.pool.root File version:52200
 LArCellContFake...  DEBUG LArCellContFakeWriter::execute()
@@ -97,7 +99,7 @@ LArCellContFake...  DEBUG CaloCell: id [4.1.1.1.0.3.4.0] energy  15 time    40 q
 LArCellContFake...  DEBUG CaloCell: id [4.1.1.1.0.4.3.0] energy  20 time    0 quality 0 provenance 0 eta     0.014545 phi     0.33884
 LArCellContFake...  DEBUG CaloCell: id [4.1.1.1.0.4.4.0] energy  20 time    40 quality 8 provenance 8200 eta     0.014547 phi     0.43721
 LArCellContFake...  DEBUG LArCellContFakeWriter::printCells() end
-RootDatabase.open Success SimplePoolFile.root File version:60414
+RootDatabase.open Success SimplePoolFile.root File version:60602
 LArCellContFake...  DEBUG LArCellContFakeWriter::execute()
 LArCellContFake...  DEBUG Created CaloCellContainer
 LArCellContFake...   INFO LArCellContFakeWriter::printRDOs()
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/test/PileUpEventInfoRead.ref b/AtlasTest/DatabaseTest/AthenaPoolTest/share/PileUpEventInfoRead.ref
similarity index 100%
rename from AtlasTest/DatabaseTest/AthenaPoolTest/test/PileUpEventInfoRead.ref
rename to AtlasTest/DatabaseTest/AthenaPoolTest/share/PileUpEventInfoRead.ref
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/test/PileUpEventInfoWrite.ref b/AtlasTest/DatabaseTest/AthenaPoolTest/share/PileUpEventInfoWrite.ref
similarity index 100%
rename from AtlasTest/DatabaseTest/AthenaPoolTest/test/PileUpEventInfoWrite.ref
rename to AtlasTest/DatabaseTest/AthenaPoolTest/share/PileUpEventInfoWrite.ref
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/src/CaloClusterFakeReader.cxx b/AtlasTest/DatabaseTest/AthenaPoolTest/src/CaloClusterFakeReader.cxx
index 4675e347fdb8adb3b34c78e8172ca9c56a923dfd..5a2c16c7078bc6ded2d3d0d725553b0bc4fa6188 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/src/CaloClusterFakeReader.cxx
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/src/CaloClusterFakeReader.cxx
@@ -29,7 +29,6 @@
 // Gaudi includes
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/AlgFactory.h"
-#include "GaudiKernel/PropertyMgr.h"
 #include "GaudiKernel/SmartDataPtr.h"
 
 // test includes
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/src/InDetRawDataFakeCreator.h b/AtlasTest/DatabaseTest/AthenaPoolTest/src/InDetRawDataFakeCreator.h
index 25cd37592d2b3329449841c4a310e02395f8ad67..bc2e2ab8458acca57295e08c11ba27c79c51efac 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/src/InDetRawDataFakeCreator.h
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/src/InDetRawDataFakeCreator.h
@@ -94,7 +94,7 @@ InDetRawDataFakeCreator::createPixelRawDataColl(IdentifierHash hashId,
 	<< MSG::hex << pixelId->wafer_id(hashId) << MSG::dec << " "
 	<< pixelId->show_to_string(waferId) << " "
 	<< pixelId->show_to_string(pixelId->wafer_id(hashId)) << " " 
-	<< endreq;
+	<< endmsg;
 
     int deltaPhi = pixelId->phi_index_max(waferId)/6;
     int deltaEta = pixelId->eta_index_max(waferId)/6;
@@ -103,7 +103,7 @@ InDetRawDataFakeCreator::createPixelRawDataColl(IdentifierHash hashId,
 	<< pixelId->eta_index_max(waferId) << " "
 	<< deltaPhi << " " 
 	<< deltaEta << " " 
-	<< endreq;
+	<< endmsg;
 
     int phi = deltaPhi;
     // loop on 16 digits
@@ -125,12 +125,12 @@ InDetRawDataFakeCreator::createPixelRawDataColl(IdentifierHash hashId,
 
 	    } else {
 		log << MSG::ERROR << "Could not create Pixel1RawData object !" 
-		    << endreq;
+		    << endmsg;
 	    }
 	    // Print out contents of RDO
 	    log << MSG::VERBOSE << "Created RDO: " 
 		<< pixelId->show_to_string(rdo->identify()) << " " 
-		<< MSG::hex << rdo->getWord() << endreq;
+		<< MSG::hex << rdo->getWord() << endmsg;
 	}
     }
 
@@ -156,7 +156,7 @@ InDetRawDataFakeCreator::createSCT_RawDataColl(IdentifierHash hashId,
     log << MSG::VERBOSE << "strip max, dstrip: " 
 	<< sctId->strip_max(waferId) << " " 
 	<< deltaStrip << " " 
-	<< endreq;
+	<< endmsg;
 
     int strip = deltaStrip;
     // loop on 4 digits
@@ -173,12 +173,12 @@ InDetRawDataFakeCreator::createSCT_RawDataColl(IdentifierHash hashId,
 
 	} else {
 	    log << MSG::ERROR << "Could not create SCT1_RawData object !" 
-		<< endreq;
+		<< endmsg;
 	}
 	// Print out contents of RDO
 	log << MSG::VERBOSE << "Created RDO: " 
 	    << sctId->show_to_string(rdo->identify()) << " " 
-	    << MSG::hex << rdo->getWord() << endreq;
+	    << MSG::hex << rdo->getWord() << endmsg;
     }
 
     return (rdocoll);
@@ -204,7 +204,7 @@ InDetRawDataFakeCreator::createTRT_RawDataColl(IdentifierHash hashId,
     log << MSG::VERBOSE << "straw max, dstraw: " 
 	<< trtId->straw_max(strLayId) << " " 
 	<< deltaStraw << " " 
-	<< endreq;
+	<< endmsg;
 
     int straw = deltaStraw;
     // loop on 16 digits
@@ -219,12 +219,12 @@ InDetRawDataFakeCreator::createTRT_RawDataColl(IdentifierHash hashId,
 
 	} else {
 	    log << MSG::ERROR << "Could not create TRT_LoLumRawData object !" 
-		<< endreq;
+		<< endmsg;
 	}
 	// Print out contents of RDO
 	log << MSG::VERBOSE << "Created RDO: " 
 	    << trtId->show_to_string(rdo->identify()) << " " 
-	    << MSG::hex << rdo->getWord() << endreq;
+	    << MSG::hex << rdo->getWord() << endmsg;
     }
     return (rdocoll);
 }
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/src/LArCellContFakeCreator.h b/AtlasTest/DatabaseTest/AthenaPoolTest/src/LArCellContFakeCreator.h
index 540c670b94a9c592a62261a60d7818df03191ceb..3f08d28003a815bb178374e4a74f16522da0c9ab 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/src/LArCellContFakeCreator.h
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/src/LArCellContFakeCreator.h
@@ -68,7 +68,7 @@ LArCellContFakeCreator::createCaloCellContainer(const CaloCell_ID* calocellId,
     CaloCellContainer* caloCont = new CaloCellContainer();
 
 
-    log << MSG::DEBUG << "Created CaloCellContainer" << endreq;
+    log << MSG::DEBUG << "Created CaloCellContainer" << endmsg;
 
     // add  10 cells to container
     for (int eta = 1; eta < 5; ++eta) {
@@ -78,7 +78,7 @@ LArCellContFakeCreator::createCaloCellContainer(const CaloCell_ID* calocellId,
 	    IdentifierHash idHash     = calocellId->calo_cell_hash (id);
 	    const CaloDetDescrElement* elem = caloMgr->get_element (idHash);
 	    
-	    //log << MSG::DEBUG << "Found elem" << elem << endreq;
+	    //log << MSG::DEBUG << "Found elem" << elem << endmsg;
 
 	    double energy    = 5.0*eta;
 	    double time      = 0.0;
@@ -95,7 +95,7 @@ LArCellContFakeCreator::createCaloCellContainer(const CaloCell_ID* calocellId,
 	    LArCell* cell = new LArCell(elem, energy, time, quality, prov, gain);
 	    caloCont->push_back(cell);
 
-	    //log << MSG::DEBUG << "Created CaloCellContainer" << endreq;
+	    //log << MSG::DEBUG << "Created CaloCellContainer" << endmsg;
 
 	}
     }
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/src/LArCellContFakeWriter.cxx b/AtlasTest/DatabaseTest/AthenaPoolTest/src/LArCellContFakeWriter.cxx
index e61b7a9a217433a4981b191839dfa24fecb06cc3..9249276259ed2a77ce7934cbfc4af4ed37ab894d 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/src/LArCellContFakeWriter.cxx
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/src/LArCellContFakeWriter.cxx
@@ -29,7 +29,6 @@
 // Gaudi includes
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/AlgFactory.h"
-#include "GaudiKernel/PropertyMgr.h"
 #include "GaudiKernel/SmartDataPtr.h"
 
 // test includes
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/src/TrkTrackFakeReader.cxx b/AtlasTest/DatabaseTest/AthenaPoolTest/src/TrkTrackFakeReader.cxx
index 0bf49adfe8fd46d41ac3c3e4b6e831eace05705d..fb8f1ff4ce3b8c5e8a45d27f5c19e8a3ec7414d1 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/src/TrkTrackFakeReader.cxx
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/src/TrkTrackFakeReader.cxx
@@ -99,10 +99,10 @@ StatusCode TrkTrackFakeReader::finalize()
 
 void TrkTrackFakeReader::compareTracks(const Trk::Track* ref, const Trk::Track* readTrk) {
       // if (**it!=*track) {
-      //   log<<MSG::ERROR<<"Tracks differ!"<<endreq;
+      //   log<<MSG::ERROR<<"Tracks differ!"<<endmsg;
       //   
-      //   log<<MSG::INFO<<"Reference track: "<<(*track)<<endreq;
-      //   log<<MSG::INFO<<"Track from ESD: "<<(**it)<<endreq;
+      //   log<<MSG::INFO<<"Reference track: "<<(*track)<<endmsg;
+      //   log<<MSG::INFO<<"Track from ESD: "<<(**it)<<endmsg;
       // }
   // Get the messaging service, print where you are
   MsgStream log(msgSvc(), name());
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/src/TrkTrackFakeWriter.cxx b/AtlasTest/DatabaseTest/AthenaPoolTest/src/TrkTrackFakeWriter.cxx
index 225fa96ebdda9c15bbba6500a4078fe0e95540fe..12432898156a495a7c2c33b666077e2f63575c24 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/src/TrkTrackFakeWriter.cxx
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/src/TrkTrackFakeWriter.cxx
@@ -24,7 +24,6 @@
 // Gaudi includes
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/AlgFactory.h"
-#include "GaudiKernel/PropertyMgr.h"
 #include "GaudiKernel/SmartDataPtr.h"
 
 // include Tracking EDM
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/test/athenapooltest_test.sh.in b/AtlasTest/DatabaseTest/AthenaPoolTest/test/athenapooltest_test.sh.in
new file mode 100755
index 0000000000000000000000000000000000000000..99928480ad3801d8d84bf7dbc0e8d29668e5ea65
--- /dev/null
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/test/athenapooltest_test.sh.in
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+# Turn off pool verbose printing
+export POOL_OUTMSG_LEVEL=4
+
+athena.py AthenaPoolTest/@jo@.py
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/test/post_check_with_select.sh b/AtlasTest/DatabaseTest/AthenaPoolTest/test/post_check_with_select.sh
index 985d77f8869134770a46dfe0d557d768968b3275..9e4ff18c6bdcf1a03019dc676498c0c9b6729a19 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/test/post_check_with_select.sh
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/test/post_check_with_select.sh
@@ -21,7 +21,7 @@ select=$2
 #    if [ "$status" = 0 ]
 #	then 
 	echo " post.sh> OK: ${test} exited normally. Output is in $joblog "
-	reflog=../test/${test}.ref
+	reflog=../share/${test}.ref
 	if [ -r $reflog ]
 	    then
             # If select string is non-zero, use it for the comparison,
@@ -29,6 +29,7 @@ select=$2
 	    if [ -n "${select}" ]
 		then
 		echo "Selecting on: ${select}"
+		diff  -a -b -B  $joblog $reflog >> xlog
 		diff  -a -b -B  $joblog $reflog |\
 		    # select only the differing lines
 	        egrep -a '^[<>] ' |\
@@ -44,6 +45,7 @@ select=$2
 		egrep -a -v 'package version' |\
 		    # spurious warning for EventSelector
 		egrep -a -v 'Service already offline' |\
+		egrep -a -v 'Property update|input handles|output handles|Data Deps|in queryInterface|Default to ConversionSvc' |\
 		    # Must remove excess print for CaloShowerContainer
 		egrep -a -v 'CaloShowerContainer' 
 
@@ -107,7 +109,7 @@ select=$2
 	    if [ $diffStatus = 0 ] 
 		then
 		echo " post.sh> ERROR: $joblog and $reflog differ "
-#		exit 1
+		exit 1
 	    else
 		echo " post.sh> OK: $joblog and $reflog identical "
 	    fi