diff --git a/Database/APR/Tests/CMakeLists.txt b/Database/APR/Tests/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6a60156385b6ea8801a48c2bfe1f49e7b4aac14b
--- /dev/null
+++ b/Database/APR/Tests/CMakeLists.txt
@@ -0,0 +1,78 @@
+# $Id: CMakeLists.txt 740758 2016-04-16 07:11:28Z krasznaa $
+################################################################################
+# Package: Tests
+################################################################################
+
+# Declare the package name:
+atlas_subdir( Tests )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs(
+   PRIVATE
+   Database/APR/FileCatalog
+   Database/APR/PersistencySvc
+   Database/APR/StorageSvc
+   Database/PersistentDataModel
+   AtlasTest/TestTools )
+
+# External dependencies:
+find_package( CppUnit )
+
+# Extend the include directories for all components:
+include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/TestDictionary )
+
+# Component(s) in the package:
+atlas_add_dictionary( test_TestDictionaryDict
+   TestDictionary/dict_all.h TestDictionary/classes.xml
+   NO_ROOTMAP_MERGE )
+
+# Helper function setting up the tests of the package:
+function( _add_test name )
+   # Parse the optional argument(s):
+   cmake_parse_arguments( ARG "" "DICTHEADER" "DEPENDS" ${ARGN} )
+   # Create a dictionary if one was requested:
+   if( ARG_DICTHEADER )
+     atlas_add_dictionary( test_${name}Dict
+       ${ARG_DICTHEADER} ${name}/classes.xml
+       NO_ROOTMAP_MERGE )
+   endif()
+   # Set up the test properties based on the optional argument(s):
+   set( properties )
+   if( ARG_DEPENDS )
+     list( APPEND properties PROPERTIES DEPENDS "${ARG_DEPENDS}" )
+   endif()
+   # Set up the test:
+   atlas_add_test( "${name}_test"
+      SOURCES ${name}/*.cpp
+      INCLUDE_DIRS ${CPPUNIT_INCLUDE_DIRS}
+      LINK_LIBRARIES ${CPPUNIT_LIBRARIES} FileCatalog PersistencySvc StorageSvc
+      PersistentDataModel TestTools
+      PRE_EXEC_SCRIPT "rm -f pool*.root *xml"
+      POST_EXEC_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/test/post.sh ${name}_test"
+      ${properties} )
+endfunction( _add_test )
+
+# Declare the test(s) of the package:
+_add_test( StorageSvc_BasicFunctionality )
+_add_test( StorageSvc_MultipleIterators
+  DEPENDS Tests_StorageSvc_BasicFunctionality_test_ctest )
+_add_test( StorageSvc_ParallelReadWrite
+  DEPENDS Tests_StorageSvc_MultipleIterators_test_ctest )
+_add_test( StorageSvc_TransientMembers
+  DICTHEADER StorageSvc_TransientMembers/TestClassWithTransients.h
+  DEPENDS Tests_StorageSvc_ParallelReadWrite_test_ctest )
+
+_add_test( PersistencySvc_Functionality
+  DEPENDS Tests_StorageSvc_TransientMembers_test_ctest )
+_add_test( PersistencySvc_FileCatalogOperations
+  DEPENDS Tests_PersistencySvc_Functionality_test_ctest )
+_add_test( PersistencySvc_FileOpenWithoutCatalog
+  DEPENDS Tests_PersistencySvc_FileCatalogOperations_test_ctest )
+_add_test( PersistencySvc_Parameters
+  DEPENDS Tests_PersistencySvc_FileOpenWithoutCatalog_test_ctest )
+_add_test( PersistencySvc_NoClassID
+  DICTHEADER PersistencySvc_NoClassID/MyTestClass.h
+  DEPENDS Tests_PersistencySvc_Parameters_test_ctest )
+
+# Clean up:
+unset( _add_test )
diff --git a/Database/APR/Tests/FileCatalog_Functionality/FCtest.cpp b/Database/APR/Tests/FileCatalog_Functionality/FCtest.cpp
old mode 100755
new mode 100644
index 04173fe715e6c82bb5e81ac28422324d136fcfb9..44ad4fd4c26636908a270b26e02f5f6d312867ec
--- a/Database/APR/Tests/FileCatalog_Functionality/FCtest.cpp
+++ b/Database/APR/Tests/FileCatalog_Functionality/FCtest.cpp
@@ -2,7 +2,7 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-//$Id: FCtest.cpp 590727 2014-04-01 21:30:48Z gemmeren $
+//$Id: FCtest.cpp 740758 2016-04-16 07:11:28Z krasznaa $
 /*
   @file a test driver for FileCatalog.
   @author: Zhen Xie
diff --git a/Database/APR/Tests/PersistencySvc_FileCatalogOperations/TestDriver.cpp b/Database/APR/Tests/PersistencySvc_FileCatalogOperations/TestDriver.cpp
old mode 100755
new mode 100644
index 02e01046762bffd376f772af64c197ab549b00f0..775b0d76ecfedd65564f5a23d65141b802de1aa9
--- a/Database/APR/Tests/PersistencySvc_FileCatalogOperations/TestDriver.cpp
+++ b/Database/APR/Tests/PersistencySvc_FileCatalogOperations/TestDriver.cpp
@@ -10,6 +10,7 @@
 #include <sstream>
 #include <memory>
 
+#include "PersistentDataModel/Placement.h"
 #include "PersistentDataModel/Token.h"
 
 #include "StorageSvc/DbType.h"
@@ -18,7 +19,6 @@
 #include "FileCatalog/IFCAction.h"
 #include "FileCatalog/URIParser.h"
 
-#include "PersistencySvc/Placement.h"
 #include "PersistencySvc/ISession.h"
 #include "PersistencySvc/ITransaction.h"
 #include "PersistencySvc/DatabaseConnectionPolicy.h"
@@ -69,7 +69,7 @@ pool::TestDriver::write()
   if ( ! psfactory ) {
     throw std::runtime_error( "Could not retrieve an IPersistencySvc factory" );
   }
-  std::auto_ptr< pool::IPersistencySvc > persistencySvc( psfactory->create( "PersistencySvc", catalog ) );
+  std::unique_ptr< pool::IPersistencySvc > persistencySvc( psfactory->create( "PersistencySvc", catalog ) );
   if ( ! persistencySvc.get() ) {
     throw std::runtime_error( "Could not create a PersistencySvc" );
   }
@@ -91,8 +91,8 @@ pool::TestDriver::write()
   RootType class_SimpleTestClass( "SimpleTestClass" );
 
   // Defining the placement objects
-  pool::Placement placementHint_SimpleTestClass;
-  placementHint_SimpleTestClass.setDatabase( m_fileName1, pool::DatabaseSpecification::PFN );
+  Placement placementHint_SimpleTestClass;
+  placementHint_SimpleTestClass.setFileName( m_fileName1 );
   placementHint_SimpleTestClass.setContainerName( "SimpleTestClass_Container" );
   placementHint_SimpleTestClass.setTechnology( pool::ROOTKEY_StorageType.type() );
 
@@ -150,7 +150,7 @@ pool::TestDriver::read()
   if ( ! psfactory ) {
     throw std::runtime_error( "Could not retrieve an IPersistencySvc factory" );
   }
-  std::auto_ptr< pool::IPersistencySvc > persistencySvc( psfactory->create( "PersistencySvc", catalog ) );
+  std::unique_ptr< pool::IPersistencySvc > persistencySvc( psfactory->create( "PersistencySvc", catalog ) );
   if ( ! persistencySvc.get() ) {
     throw std::runtime_error( "Could not create a PersistencySvc" );
   }
diff --git a/Database/APR/Tests/PersistencySvc_FileCatalogOperations/TestDriver.h b/Database/APR/Tests/PersistencySvc_FileCatalogOperations/TestDriver.h
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/PersistencySvc_FileCatalogOperations/main.cpp b/Database/APR/Tests/PersistencySvc_FileCatalogOperations/main.cpp
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/PersistencySvc_FileOpenWithoutCatalog/TestDriver.cpp b/Database/APR/Tests/PersistencySvc_FileOpenWithoutCatalog/TestDriver.cpp
old mode 100755
new mode 100644
index 789d3f4727fcaa4d24a13c95a7cc4b8c3f6d8565..79f8a0a901f3b1203d85b03240ae44512d211a78
--- a/Database/APR/Tests/PersistencySvc_FileOpenWithoutCatalog/TestDriver.cpp
+++ b/Database/APR/Tests/PersistencySvc_FileOpenWithoutCatalog/TestDriver.cpp
@@ -10,6 +10,7 @@
 #include <sstream>
 #include <memory>
 
+#include "PersistentDataModel/Placement.h"
 #include "PersistentDataModel/Token.h"
 
 #include "StorageSvc/DbType.h"
@@ -17,7 +18,6 @@
 #include "FileCatalog/URIParser.h"
 #include "FileCatalog/IFileCatalog.h"
 
-#include "PersistencySvc/Placement.h"
 #include "PersistencySvc/ISession.h"
 #include "PersistencySvc/ITransaction.h"
 #include "PersistencySvc/DatabaseConnectionPolicy.h"
@@ -66,7 +66,7 @@ pool::TestDriver::write()
   if ( ! psfactory ) {
     throw std::runtime_error( "Could not retrieve an IPersistencySvc factory" );
   }
-  std::auto_ptr< pool::IPersistencySvc > persistencySvc( psfactory->create( "PersistencySvc", catalog ) );
+  std::unique_ptr< pool::IPersistencySvc > persistencySvc( psfactory->create( "PersistencySvc", catalog ) );
   if ( ! persistencySvc.get() ) {
     throw std::runtime_error( "Could not create a PersistencySvc" );
   }
@@ -86,8 +86,8 @@ pool::TestDriver::write()
   RootType class_SimpleTestClass( "SimpleTestClass" );
 
   // Defining the placement objects
-  pool::Placement placementHint_SimpleTestClass;
-  placementHint_SimpleTestClass.setDatabase( m_fileName, pool::DatabaseSpecification::PFN );
+  Placement placementHint_SimpleTestClass;
+  placementHint_SimpleTestClass.setFileName( m_fileName );
   placementHint_SimpleTestClass.setContainerName( "SimpleTestClass_Container" );
   placementHint_SimpleTestClass.setTechnology( pool::ROOTKEY_StorageType.type() );
 
@@ -137,7 +137,7 @@ pool::TestDriver::read()
   if ( ! psfactory ) {
     throw std::runtime_error( "Could not retrieve an IPersistencySvc factory" );
   }
-  std::auto_ptr< pool::IPersistencySvc > persistencySvc( psfactory->create( "PersistencySvc", catalog ) );
+  std::unique_ptr< pool::IPersistencySvc > persistencySvc( psfactory->create( "PersistencySvc", catalog ) );
   if ( ! persistencySvc.get() ) {
     throw std::runtime_error( "Could not create a PersistencySvc" );
   }
diff --git a/Database/APR/Tests/PersistencySvc_FileOpenWithoutCatalog/TestDriver.h b/Database/APR/Tests/PersistencySvc_FileOpenWithoutCatalog/TestDriver.h
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/PersistencySvc_FileOpenWithoutCatalog/main.cpp b/Database/APR/Tests/PersistencySvc_FileOpenWithoutCatalog/main.cpp
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/PersistencySvc_Functionality/TestDriver.cpp b/Database/APR/Tests/PersistencySvc_Functionality/TestDriver.cpp
old mode 100755
new mode 100644
index b12deb2189a96e606c3147bba4c6a746359dbee3..1091e71a3d7440635cd185460c09c7e3d0d38580
--- a/Database/APR/Tests/PersistencySvc_Functionality/TestDriver.cpp
+++ b/Database/APR/Tests/PersistencySvc_Functionality/TestDriver.cpp
@@ -10,6 +10,7 @@
 #include <sstream>
 #include <memory>
 
+#include "PersistentDataModel/Placement.h"
 #include "PersistentDataModel/Token.h"
 
 #include "StorageSvc/DbType.h"
@@ -17,7 +18,6 @@
 #include "FileCatalog/URIParser.h"
 #include "FileCatalog/IFileCatalog.h"
 
-#include "PersistencySvc/Placement.h"
 #include "PersistencySvc/ISession.h"
 #include "PersistencySvc/ITransaction.h"
 #include "PersistencySvc/DatabaseConnectionPolicy.h"
@@ -80,7 +80,7 @@ pool::TestDriver::write()
   if ( ! psfactory ) {
     throw std::runtime_error( "Could not retrieve an IPersistencySvc factory" );
   }
-  std::auto_ptr< pool::IPersistencySvc > persistencySvc( psfactory->create( "PersistencySvc", catalog ) );
+  std::unique_ptr< pool::IPersistencySvc > persistencySvc( psfactory->create( "PersistencySvc", catalog ) );
   if ( ! persistencySvc.get() ) {
     throw std::runtime_error( "Could not create a PersistencySvc" );
   }
@@ -103,23 +103,23 @@ pool::TestDriver::write()
   RootType class_TestClassVectors ( "TestClassVectors" );
 
   // Defining the placement objects
-  pool::Placement placementHint_SimpleTestClass;
-  placementHint_SimpleTestClass.setDatabase( m_fileName1, pool::DatabaseSpecification::PFN );
+  Placement placementHint_SimpleTestClass;
+  placementHint_SimpleTestClass.setFileName( m_fileName1 );
   placementHint_SimpleTestClass.setContainerName( "SimpleTestClass_Container" );
   placementHint_SimpleTestClass.setTechnology( pool::ROOTKEY_StorageType.type() );
 
-  pool::Placement placementHint_TestClassPrimitives;
-  placementHint_TestClassPrimitives.setDatabase( m_fileName1, pool::DatabaseSpecification::PFN );
+  Placement placementHint_TestClassPrimitives;
+  placementHint_TestClassPrimitives.setFileName( m_fileName1 );
   placementHint_TestClassPrimitives.setContainerName( "TestClassPrimitives_Container" );
   placementHint_TestClassPrimitives.setTechnology( pool::ROOTTREE_StorageType.type() );
 
-  pool::Placement placementHint_TestClassSimpleContainers;
-  placementHint_TestClassSimpleContainers.setDatabase( m_fileName2, pool::DatabaseSpecification::PFN );
+  Placement placementHint_TestClassSimpleContainers;
+  placementHint_TestClassSimpleContainers.setFileName( m_fileName2 );
   placementHint_TestClassSimpleContainers.setContainerName( "TestClassSimpleContainers_Container" );
   placementHint_TestClassSimpleContainers.setTechnology( pool::ROOTTREE_StorageType.type() );
 
-  pool::Placement placementHint_TestClassVectors;
-  placementHint_TestClassVectors.setDatabase( m_fileName2, pool::DatabaseSpecification::PFN );
+  Placement placementHint_TestClassVectors;
+  placementHint_TestClassVectors.setFileName( m_fileName2 );
   placementHint_TestClassVectors.setContainerName( "TestClassVectors_Container" );
   placementHint_TestClassVectors.setTechnology( pool::ROOTTREE_StorageType.type() );
 
@@ -248,7 +248,7 @@ pool::TestDriver::read()
   if ( ! psfactory ) {
     throw std::runtime_error( "Could not retrieve an IPersistencySvc factory" );
   }
-  std::auto_ptr< pool::IPersistencySvc > persistencySvc( psfactory->create( "PersistencySvc", catalog ) );
+  std::unique_ptr< pool::IPersistencySvc > persistencySvc( psfactory->create( "PersistencySvc", catalog ) );
   if ( ! persistencySvc.get() ) {
     throw std::runtime_error( "Could not create a PersistencySvc" );
   }
@@ -372,7 +372,7 @@ pool::TestDriver::readCollections()
   if ( ! psfactory ) {
     throw std::runtime_error( "Could not retrieve an IPersistencySvc factory" );
   }
-  std::auto_ptr< pool::IPersistencySvc > persistencySvc( psfactory->create( "PersistencySvc", catalog ) );
+  std::unique_ptr< pool::IPersistencySvc > persistencySvc( psfactory->create( "PersistencySvc", catalog ) );
   if ( ! persistencySvc.get() ) {
     throw std::runtime_error( "Could not create a PersistencySvc" );
   }
@@ -434,86 +434,6 @@ pool::TestDriver::readCollections()
 
 
 
-void
-pool::TestDriver::updateObjects()
-{
-  pool::IFileCatalog& catalog = *m_fileCatalog;
-  catalog.start();
-
-  std::cout << "Creating the persistency service" << std::endl;
-  pool::IPersistencySvcFactory* psfactory = pool::IPersistencySvcFactory::get();
-  if ( ! psfactory ) {
-    throw std::runtime_error( "Could not retrieve an IPersistencySvc factory" );
-  }
-  std::auto_ptr< pool::IPersistencySvc > persistencySvc( psfactory->create( "PersistencySvc", catalog ) );
-  if ( ! persistencySvc.get() ) {
-    throw std::runtime_error( "Could not create a PersistencySvc" );
-  }
-
-  // Starting an update transaction
-  if ( ! persistencySvc->session().transaction().start( pool::ITransaction::UPDATE ) ) {
-    throw std::runtime_error( "Could not start a read transaction." );
-  }
-
-  pool::IDatabase* db = persistencySvc->session().databaseHandle( m_fileName1, pool::DatabaseSpecification::PFN );
-  if ( ! db ) {
-    throw std::runtime_error( "Could not retrieve a database handle" );
-  }
-
-  db->connectForRead(); // will open db in read mode.
-
-  pool::IContainer* container = db->containerHandle( "SimpleTestClass_Container" );
-  if ( ! container ) {
-    throw std::runtime_error( "Could not retrieve the container" );
-  }
-
-  pool::ITokenIterator* tokenIterator = container->tokens( "" );
-  if ( ! tokenIterator ) {
-    throw std::runtime_error( "Could not obtain a token iterator" );
-  }
-
-  int i = 0;
-  std::vector< SimpleTestClass* > v_simpleTestClass;
-  Token* token = tokenIterator->next();
-  while ( token ) {
-    void* data_simpleTestClass = persistencySvc->readObject( *token );
-    if ( data_simpleTestClass == 0 ) {
-      throw std::runtime_error( "Could not read the stored data" );
-    }
-    SimpleTestClass* object_simpleTestClass = reinterpret_cast< SimpleTestClass* >( data_simpleTestClass );
-    object_simpleTestClass->data = i;
-    ++i;
-
-    if ( ! persistencySvc->updateObject( object_simpleTestClass,
-                                         *token ) ) {
-      throw std::runtime_error( "Could not update the obect" );
-    }
-    v_simpleTestClass.push_back( object_simpleTestClass );
-    token->release();
-    token = tokenIterator->next();
-  }
-
-  delete tokenIterator;
-  delete container;
-  delete db;
-
-  // Committing
-  std::cout << "Committing the transaction." << std::endl;
-  if ( ! persistencySvc->session().transaction().commit() ) {
-    throw std::runtime_error( "Could not commit the transaction." );
-  }
-
-  std::cout << "Clearing the cache" << std::endl;
-  for ( std::vector< SimpleTestClass* >::iterator iObject = v_simpleTestClass.begin();
-        iObject != v_simpleTestClass.end(); ++iObject ) {
-    delete *iObject;
-  }
-
-  catalog.commit();
-
-}
-
-
 void
 pool::TestDriver::readBackUpdatedObjects()
 {
@@ -525,7 +445,7 @@ pool::TestDriver::readBackUpdatedObjects()
   if ( ! psfactory ) {
     throw std::runtime_error( "Could not retrieve an IPersistencySvc factory" );
   }
-  std::auto_ptr< pool::IPersistencySvc > persistencySvc( psfactory->create( "PersistencySvc", catalog ) );
+  std::unique_ptr< pool::IPersistencySvc > persistencySvc( psfactory->create( "PersistencySvc", catalog ) );
   if ( ! persistencySvc.get() ) {
     throw std::runtime_error( "Could not create a PersistencySvc" );
   }
@@ -603,7 +523,7 @@ pool::TestDriver::readFileSizes()
   if ( ! psfactory ) {
     throw std::runtime_error( "Could not retrieve an IPersistencySvc factory" );
   }
-  std::auto_ptr< pool::IPersistencySvc > persistencySvc( psfactory->create( "PersistencySvc", catalog ) );
+  std::unique_ptr< pool::IPersistencySvc > persistencySvc( psfactory->create( "PersistencySvc", catalog ) );
   if ( ! persistencySvc.get() ) {
     throw std::runtime_error( "Could not create a PersistencySvc" );
   }
diff --git a/Database/APR/Tests/PersistencySvc_Functionality/TestDriver.h b/Database/APR/Tests/PersistencySvc_Functionality/TestDriver.h
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/PersistencySvc_Functionality/main.cpp b/Database/APR/Tests/PersistencySvc_Functionality/main.cpp
old mode 100755
new mode 100644
index aa30d1902a76d2f382c9b9442ca2041337f53dec..9aa5207959dbe5672f762a35b79af58685243501
--- a/Database/APR/Tests/PersistencySvc_Functionality/main.cpp
+++ b/Database/APR/Tests/PersistencySvc_Functionality/main.cpp
@@ -39,14 +39,6 @@ int main( int, char** ) {
     driver.readCollections();
     std::cout << "[OVAL] ...done" << std::endl;
 
-    std::cout << "[OVAL] Reading and updating the objects." << std::endl;
-    driver.updateObjects();
-    std::cout << "[OVAL] ...done" << std::endl;
- 
-    std::cout << "[OVAL] Reading the updated objects back from the database as implicit collections." << std::endl;
-    driver.readBackUpdatedObjects();
-    std::cout << "[OVAL] ...done" << std::endl;
-
     std::cout << "[OVAL] Reading the file sizes." << std::endl;
     driver.readFileSizes();
     std::cout << "[OVAL] ...done" << std::endl;
diff --git a/Database/APR/Tests/PersistencySvc_NoClassID/MyTestClass.h b/Database/APR/Tests/PersistencySvc_NoClassID/MyTestClass.h
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/PersistencySvc_NoClassID/TestDriver.cpp b/Database/APR/Tests/PersistencySvc_NoClassID/TestDriver.cpp
old mode 100755
new mode 100644
index be7af8b60f70509805c40cf2f3baee13cf4104e2..6d0605e3d41d4c6d26bcbdcf1351c3405a235658
--- a/Database/APR/Tests/PersistencySvc_NoClassID/TestDriver.cpp
+++ b/Database/APR/Tests/PersistencySvc_NoClassID/TestDriver.cpp
@@ -10,6 +10,7 @@
 #include <sstream>
 #include <memory>
 
+#include "PersistentDataModel/Placement.h"
 #include "PersistentDataModel/Token.h"
 
 #include "StorageSvc/DbType.h"
@@ -17,7 +18,6 @@
 #include "FileCatalog/URIParser.h"
 #include "FileCatalog/IFileCatalog.h"
 
-#include "PersistencySvc/Placement.h"
 #include "PersistencySvc/ISession.h"
 #include "PersistencySvc/ITransaction.h"
 #include "PersistencySvc/DatabaseConnectionPolicy.h"
@@ -69,7 +69,7 @@ pool::TestDriver::write()
   if ( ! psfactory ) {
     throw std::runtime_error( "Could not retrieve an IPersistencySvc factory" );
   }
-  std::auto_ptr< pool::IPersistencySvc > persistencySvc( psfactory->create( "PersistencySvc", catalog ) );
+  std::unique_ptr< pool::IPersistencySvc > persistencySvc( psfactory->create( "PersistencySvc", catalog ) );
   if ( ! persistencySvc.get() ) {
     throw std::runtime_error( "Could not create a PersistencySvc" );
   }
@@ -89,8 +89,8 @@ pool::TestDriver::write()
   RootType class_MyTestClass ( "MyTestClass" );
 
   // Defining the placement objects
-  pool::Placement placementHint_MyTestClass;
-  placementHint_MyTestClass.setDatabase( m_fileName, pool::DatabaseSpecification::PFN );
+  Placement placementHint_MyTestClass;
+  placementHint_MyTestClass.setFileName( m_fileName );
   placementHint_MyTestClass.setContainerName( "MyTestClass_Container" );
   placementHint_MyTestClass.setTechnology( pool::ROOTKEY_StorageType.type() );
 
@@ -135,7 +135,7 @@ pool::TestDriver::read()
   if ( ! psfactory ) {
     throw std::runtime_error( "Could not retrieve an IPersistencySvc factory" );
   }
-  std::auto_ptr< pool::IPersistencySvc > persistencySvc( psfactory->create( "PersistencySvc", catalog ) );
+  std::unique_ptr< pool::IPersistencySvc > persistencySvc( psfactory->create( "PersistencySvc", catalog ) );
   if ( ! persistencySvc.get() ) {
     throw std::runtime_error( "Could not create a PersistencySvc" );
   }
diff --git a/Database/APR/Tests/PersistencySvc_NoClassID/TestDriver.h b/Database/APR/Tests/PersistencySvc_NoClassID/TestDriver.h
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/PersistencySvc_NoClassID/classes.xml b/Database/APR/Tests/PersistencySvc_NoClassID/classes.xml
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/PersistencySvc_NoClassID/main.cpp b/Database/APR/Tests/PersistencySvc_NoClassID/main.cpp
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/PersistencySvc_Parameters/TestDriver.cpp b/Database/APR/Tests/PersistencySvc_Parameters/TestDriver.cpp
old mode 100755
new mode 100644
index 2df6e8de9fb01ee61aa8f9c15e7eace3a1d95cb1..66414d46d284c6cc977ce24ad9b8dbb7cdda0f45
--- a/Database/APR/Tests/PersistencySvc_Parameters/TestDriver.cpp
+++ b/Database/APR/Tests/PersistencySvc_Parameters/TestDriver.cpp
@@ -59,7 +59,7 @@ pool::TestDriver::write()
   if ( ! psfactory ) {
     throw std::runtime_error( "Could not retrieve an IPersistencySvc factory" );
   }
-  std::auto_ptr< pool::IPersistencySvc > persistencySvc( psfactory->create( "PersistencySvc", catalog ) );
+  std::unique_ptr< pool::IPersistencySvc > persistencySvc( psfactory->create( "PersistencySvc", catalog ) );
   if ( ! persistencySvc.get() ) {
     throw std::runtime_error( "Could not create a PersistencySvc" );
   }
@@ -118,7 +118,7 @@ pool::TestDriver::read()
   if ( ! psfactory ) {
     throw std::runtime_error( "Could not retrieve an IPersistencySvc factory" );
   }
-  std::auto_ptr< pool::IPersistencySvc > persistencySvc( psfactory->create( "PersistencySvc", catalog ) );
+  std::unique_ptr< pool::IPersistencySvc > persistencySvc( psfactory->create( "PersistencySvc", catalog ) );
   if ( ! persistencySvc.get() ) {
     throw std::runtime_error( "Could not create a PersistencySvc" );
   }
diff --git a/Database/APR/Tests/PersistencySvc_Parameters/TestDriver.h b/Database/APR/Tests/PersistencySvc_Parameters/TestDriver.h
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/PersistencySvc_Parameters/main.cpp b/Database/APR/Tests/PersistencySvc_Parameters/main.cpp
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/StorageSvc_BasicFunctionality/TestDriver.cpp b/Database/APR/Tests/StorageSvc_BasicFunctionality/TestDriver.cpp
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/StorageSvc_BasicFunctionality/TestDriver.h b/Database/APR/Tests/StorageSvc_BasicFunctionality/TestDriver.h
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/StorageSvc_BasicFunctionality/main.cpp b/Database/APR/Tests/StorageSvc_BasicFunctionality/main.cpp
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/StorageSvc_MultipleIterators/TestDriver.cpp b/Database/APR/Tests/StorageSvc_MultipleIterators/TestDriver.cpp
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/StorageSvc_MultipleIterators/TestDriver.h b/Database/APR/Tests/StorageSvc_MultipleIterators/TestDriver.h
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/StorageSvc_MultipleIterators/main.cpp b/Database/APR/Tests/StorageSvc_MultipleIterators/main.cpp
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/StorageSvc_ParallelReadWrite/TestDriver.cpp b/Database/APR/Tests/StorageSvc_ParallelReadWrite/TestDriver.cpp
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/StorageSvc_ParallelReadWrite/TestDriver.h b/Database/APR/Tests/StorageSvc_ParallelReadWrite/TestDriver.h
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/StorageSvc_ParallelReadWrite/main.cpp b/Database/APR/Tests/StorageSvc_ParallelReadWrite/main.cpp
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/StorageSvc_TransientMembers/TestClassTransient.h b/Database/APR/Tests/StorageSvc_TransientMembers/TestClassTransient.h
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/StorageSvc_TransientMembers/TestClassWithTransients.h b/Database/APR/Tests/StorageSvc_TransientMembers/TestClassWithTransients.h
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/StorageSvc_TransientMembers/TestDriver.cpp b/Database/APR/Tests/StorageSvc_TransientMembers/TestDriver.cpp
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/StorageSvc_TransientMembers/TestDriver.h b/Database/APR/Tests/StorageSvc_TransientMembers/TestDriver.h
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/StorageSvc_TransientMembers/classes.xml b/Database/APR/Tests/StorageSvc_TransientMembers/classes.xml
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/StorageSvc_TransientMembers/main.cpp b/Database/APR/Tests/StorageSvc_TransientMembers/main.cpp
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/TestDictionary/SimpleTestClass.h b/Database/APR/Tests/TestDictionary/SimpleTestClass.h
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/TestDictionary/TestClassPrimitives.h b/Database/APR/Tests/TestDictionary/TestClassPrimitives.h
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/TestDictionary/TestClassSimpleContainers.h b/Database/APR/Tests/TestDictionary/TestClassSimpleContainers.h
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/TestDictionary/TestClassVectors.h b/Database/APR/Tests/TestDictionary/TestClassVectors.h
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/TestDictionary/classes.xml b/Database/APR/Tests/TestDictionary/classes.xml
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/TestDictionary/dict_all.h b/Database/APR/Tests/TestDictionary/dict_all.h
old mode 100755
new mode 100644
diff --git a/Database/APR/Tests/cmt/requirements b/Database/APR/Tests/cmt/requirements
index b29c08dbc4b8f23602ce57eb0c421c15a723d3ee..cb98fffc3aa13cedf67220045dcc653b73fc4d8c 100644
--- a/Database/APR/Tests/cmt/requirements
+++ b/Database/APR/Tests/cmt/requirements
@@ -123,4 +123,4 @@ macro_append PersistencySvc_FileOpenWithoutCatalog_utest_dependencies " Persiste
 macro_append PersistencySvc_Parameters_utest_dependencies " PersistencySvc_FileOpenWithoutCatalog_utest "
 macro_append PersistencySvc_NoClassID_utest_dependencies " PersistencySvc_Parameters_utest "
 
-#macro_append FileCatalog_Functionality_utest_dependencies " PersistencySvc_NoClassID_utest "
+##macro_append FileCatalog_Functionality_utest_dependencies " PersistencySvc_NoClassID_utest "
diff --git a/Database/APR/Tests/share/PersistencySvc_Functionality_test.ref b/Database/APR/Tests/share/PersistencySvc_Functionality_test.ref
index 6dd6173849e3d17962612d1f2f6a25a7c5a306bb..ceb3f511040bbf1f484e59ac1f0cca96a82b95b4 100644
--- a/Database/APR/Tests/share/PersistencySvc_Functionality_test.ref
+++ b/Database/APR/Tests/share/PersistencySvc_Functionality_test.ref
@@ -2,20 +2,6 @@
 [OVAL] Creating a file catalog
 WARNING: $POOL_CATALOG is not defined
 using default `xmlcatalog_file:PoolFileCatalog.xml'
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1190
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1191
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1308
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1309
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1870
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1871
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1883
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1884
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:608
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:609
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:1012
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:1013
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:1198
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:1199
 [OVAL] Loading the shared libraries.
 Loading library test_TestDictionaryDict
 [OVAL] Testing the plugins...
@@ -23,65 +9,29 @@ Loading library test_TestDictionaryDict
 [OVAL] Writing objects in the database.
 Creating the persistency service
 Writing 100 objects of each type
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<bool>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<char>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<double>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<float>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<long>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<short>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<unsigned-char>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<unsigned-int>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<unsigned-long>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<unsigned-short>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<double>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<float>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<int>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<long>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<string>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.map<string,double>=map.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.map<string,float>=map.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.map<string,int>=map.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.map<int,int>=map2.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.multimap<string,int>=multimap.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<double>=set.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<float>=set.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<int>=set.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<long>=set.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<string>=set.dll> for level 0; ignored
-RootDatabase.open Success pool1.root File version:53418
-RootDatabase.open Success pool2.root File version:53418
+RootDatabase.open Success pool1.root File version:60602
+RootDatabase.open Success pool2.root File version:60602
 Committing the transaction.
 Committing the transaction.
 [OVAL] ...done
 [OVAL] Reading the objects back from the database.
 Creating the persistency service
 Reading back the objects.
-RootDatabase.open Success pool1.root File version:53418
-RootDatabase.open Success pool2.root File version:53418
+RootDatabase.open Success pool1.root File version:60602
+RootDatabase.open Success pool2.root File version:60602
 Committing the transaction.
 [OVAL] ...done
 [OVAL] Clearing the tokens.
 [OVAL] ...done
 [OVAL] Reading the objects back from the database as implicit collections.
 Creating the persistency service
-RootDatabase.open Success pool1.root File version:53418
+RootDatabase.open Success pool1.root File version:60602
 Container : SimpleTestClass_Container
 100 objects found in the container.
 Container : TestClassPrimitives_Container
 100 objects found in the container.
 Committing the transaction.
 [OVAL] ...done
-[OVAL] Reading and updating the objects.
-Creating the persistency service
-RootDatabase.open Success pool1.root File version:53418
-Committing the transaction.
-Clearing the cache
-[OVAL] ...done
-[OVAL] Reading the updated objects back from the database as implicit collections.
-Creating the persistency service
-RootDatabase.open Success pool1.root File version:53418
-Committing the transaction.
-[OVAL] ...done
 [OVAL] Reading the file sizes.
 Creating the persistency service
 Committing the transaction.
diff --git a/Database/APR/Tests/share/PersistencySvc_NoClassID_test.ref b/Database/APR/Tests/share/PersistencySvc_NoClassID_test.ref
index 6438724ba8d0b85687964ea0aff4214a13559c83..cbcd9e154d000ad89d5fef65e726b5eb4aacff6e 100644
--- a/Database/APR/Tests/share/PersistencySvc_NoClassID_test.ref
+++ b/Database/APR/Tests/share/PersistencySvc_NoClassID_test.ref
@@ -2,57 +2,18 @@
 [OVAL] Creating a file catalog
 WARNING: $POOL_CATALOG is not defined
 using default `xmlcatalog_file:PoolFileCatalog.xml'
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1190
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1191
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1308
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1309
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1870
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1871
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1883
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1884
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:608
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:609
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:1012
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:1013
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:1198
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:1199
 [OVAL] Loading the shared libraries.
 Loading library test_PersistencySvc_NoClassIDDict
 [OVAL] Writing objects in the database.
 Creating the persistency service
 Writing 100 objects
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<bool>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<char>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<double>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<float>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<long>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<short>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<unsigned-char>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<unsigned-int>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<unsigned-long>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<unsigned-short>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<double>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<float>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<int>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<long>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<string>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.map<string,double>=map.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.map<string,float>=map.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.map<string,int>=map.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.map<int,int>=map2.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.multimap<string,int>=multimap.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<double>=set.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<float>=set.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<int>=set.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<long>=set.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<string>=set.dll> for level 0; ignored
-RootDatabase.open Success pool.root File version:53418
+RootDatabase.open Success pool.root File version:60602
 Committing the transaction.
 [OVAL] ...done
 [OVAL] Reading the objects back from the database.
 Creating the persistency service
 Reading back the objects.
-RootDatabase.open Success pool.root File version:53418
+RootDatabase.open Success pool.root File version:60602
 Committing the transaction.
 [OVAL] ...done
 [OVAL] Number of floating tokens : 0
diff --git a/Database/APR/Tests/share/PersistencySvc_Parameters_test.ref b/Database/APR/Tests/share/PersistencySvc_Parameters_test.ref
index 79eae3f6b50c8c3c1addfdf0a082de80dcb956fb..561438f1f4eaedbb720d5a1874c7dac08ce7ff59 100644
--- a/Database/APR/Tests/share/PersistencySvc_Parameters_test.ref
+++ b/Database/APR/Tests/share/PersistencySvc_Parameters_test.ref
@@ -2,54 +2,15 @@
 [OVAL] Creating a file catalog
 WARNING: $POOL_CATALOG is not defined
 using default `xmlcatalog_file:PoolFileCatalog.xml'
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1190
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1191
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1308
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1309
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1870
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1871
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1883
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1884
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:608
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:609
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:1012
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:1013
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:1198
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:1199
 [OVAL] Writing parameters in the database.
 Creating the persistency service
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<bool>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<char>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<double>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<float>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<long>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<short>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<unsigned-char>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<unsigned-int>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<unsigned-long>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<unsigned-short>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<double>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<float>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<int>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<long>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<string>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.map<string,double>=map.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.map<string,float>=map.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.map<string,int>=map.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.map<int,int>=map2.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.multimap<string,int>=multimap.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<double>=set.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<float>=set.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<int>=set.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<long>=set.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<string>=set.dll> for level 0; ignored
-RootDatabase.open Success pool.root File version:53418
+RootDatabase.open Success pool.root File version:60602
 Committing the transaction.
 [OVAL] ...done
 [OVAL] Reading the parameters back from the database.
 Creating the persistency service
-RootDatabase.open Success pool.root File version:53418
-       "FID" : "90EC1600-2871-AC42-881D-9400E7C237B4"
+RootDatabase.open Success pool.root File version:60602
+       "FID" : "F0EE5CBD-8B60-6642-B6DD-E18029F6EB07"
 [OVAL] "FORMAT_VSN" : "1.1"
 [OVAL] "PFN" : "pool.root"
 [OVAL] "POOL_VSN" : "1.1"
diff --git a/Database/APR/Tests/share/StorageSvc_BasicFunctionality_test.ref b/Database/APR/Tests/share/StorageSvc_BasicFunctionality_test.ref
index ef57884057b69f93503dbb590b27c9dfd1124572..ca48ba721b07a7269c9534547dfb2a5224b114bd 100644
--- a/Database/APR/Tests/share/StorageSvc_BasicFunctionality_test.ref
+++ b/Database/APR/Tests/share/StorageSvc_BasicFunctionality_test.ref
@@ -2,49 +2,14 @@
 [OVAL] Loading the shared libraries.
 Loading library test_TestDictionaryDict
 [OVAL] Testing the writing operations
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1190
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1191
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1308
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1309
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1870
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1871
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1883
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1884
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:608
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:609
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:1012
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:1013
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:1198
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:1199
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<bool>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<char>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<double>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<float>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<long>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<short>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<unsigned-char>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<unsigned-int>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<unsigned-long>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<unsigned-short>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<double>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<float>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<int>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<long>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<string>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.map<string,double>=map.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.map<string,float>=map.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.map<string,int>=map.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.map<int,int>=map2.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.multimap<string,int>=multimap.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<double>=set.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<float>=set.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<int>=set.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<long>=set.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<string>=set.dll> for level 0; ignored
-RootDatabase.open Success pool_test.root File version:53418
+createStorageSvc
+startSession
+Session connect
+RootDatabase.open Success pool_test.root File version:60602
+startTransaction
 [OVAL] ...done
 [OVAL] Testing the reading operations
-RootDatabase.open Success pool_test.root File version:53418
+RootDatabase.open Success pool_test.root File version:60602
 Closing the session
 [OVAL] ...done
 [OVAL] Number of floating tokens : 0
diff --git a/Database/APR/Tests/share/StorageSvc_MultipleIterators_test.ref b/Database/APR/Tests/share/StorageSvc_MultipleIterators_test.ref
index 8bc56004cee0a583ede3395e062f54dbc29d6a1b..b19f7512df20778866acdb9d96d5d0fb6aca3e06 100644
--- a/Database/APR/Tests/share/StorageSvc_MultipleIterators_test.ref
+++ b/Database/APR/Tests/share/StorageSvc_MultipleIterators_test.ref
@@ -2,50 +2,10 @@
 [OVAL] Loading the shared libraries.
 Loading library test_TestDictionaryDict
 [OVAL] Testing the writing operations
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1190
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1191
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1308
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1309
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1870
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1871
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1883
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1884
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:608
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:609
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:1012
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:1013
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:1198
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:1199
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<bool>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<char>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<double>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<float>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<long>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<short>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<unsigned-char>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<unsigned-int>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<unsigned-long>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<unsigned-short>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<double>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<float>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<int>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<long>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<string>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.map<string,double>=map.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.map<string,float>=map.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.map<string,int>=map.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.map<int,int>=map2.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.multimap<string,int>=multimap.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<double>=set.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<float>=set.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<int>=set.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<long>=set.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<string>=set.dll> for level 0; ignored
-RootDatabase.open Success pool_test.root File version:53418
-RootDatabase.close Error Failed to modify file: pool_test.root Errno=2 No such file or directory
+RootDatabase.open Success pool_test.root File version:60602
 [OVAL] ...done
 [OVAL] Testing the parallel iterators in the same container
-RootDatabase.open Success pool_test.root File version:53418
+RootDatabase.open Success pool_test.root File version:60602
 Closing the session
 [OVAL] ...done
 [OVAL] Number of floating tokens : 0
diff --git a/Database/APR/Tests/share/StorageSvc_ParallelReadWrite_test.ref b/Database/APR/Tests/share/StorageSvc_ParallelReadWrite_test.ref
index 198fda9bdbd09be94cea5383714ed9409fb67409..83d70e879d136adfbe97fca72a2f1507a967ff9f 100644
--- a/Database/APR/Tests/share/StorageSvc_ParallelReadWrite_test.ref
+++ b/Database/APR/Tests/share/StorageSvc_ParallelReadWrite_test.ref
@@ -2,54 +2,15 @@
 [OVAL] Loading the shared libraries.
 Loading library test_TestDictionaryDict
 [OVAL] Testing the writing operations
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1190
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1191
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1308
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1309
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1870
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1871
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1883
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1884
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:608
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:609
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:1012
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:1013
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:1198
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:1199
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<bool>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<char>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<double>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<float>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<long>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<short>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<unsigned-char>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<unsigned-int>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<unsigned-long>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<unsigned-short>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<double>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<float>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<int>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<long>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<string>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.map<string,double>=map.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.map<string,float>=map.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.map<string,int>=map.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.map<int,int>=map2.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.multimap<string,int>=multimap.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<double>=set.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<float>=set.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<int>=set.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<long>=set.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<string>=set.dll> for level 0; ignored
-RootDatabase.open Success pool_test1.root File version:53418
+RootDatabase.open Success pool_test1.root File version:60602
 [OVAL] ...done
 [OVAL] Testing the parrallel reading and writing operations
-RootDatabase.open Success pool_test1.root File version:53418
-RootDatabase.open Success pool_test2.root File version:53418
+RootDatabase.open Success pool_test1.root File version:60602
+RootDatabase.open Success pool_test2.root File version:60602
 Closing the session
 [OVAL] ...done
 [OVAL] Testing the reading operations
-RootDatabase.open Success pool_test2.root File version:53418
+RootDatabase.open Success pool_test2.root File version:60602
 Closing the session
 [OVAL] ...done
 [OVAL] Number of floating tokens : 0
diff --git a/Database/APR/Tests/share/StorageSvc_TransientMembers_test.ref b/Database/APR/Tests/share/StorageSvc_TransientMembers_test.ref
index 26959dc6791acbaf8197e3fed925881b1a57bc89..6b8aa608ff62e806a4b5c23dbb74c905fdb565ff 100644
--- a/Database/APR/Tests/share/StorageSvc_TransientMembers_test.ref
+++ b/Database/APR/Tests/share/StorageSvc_TransientMembers_test.ref
@@ -2,49 +2,10 @@
 [OVAL] Loading the shared libraries.
 Loading library test_StorageSvc_TransientMembersDict
 [OVAL] Testing the writing operations
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1190
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1191
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1308
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1309
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1870
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1871
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1883
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasAnalysis/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasAnalysis.components:1884
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:608
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:609
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:1012
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:1013
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:1198
-WARNING: failed to parse line /afs/cern.ch/atlas/software/builds/nightlies/mig6/AtlasTrigger/rel_0/InstallArea/x86_64-slc6-gcc48-opt/lib/AtlasTrigger.components:1199
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<bool>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<char>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<double>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<float>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<long>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<short>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<unsigned-char>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<unsigned-int>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<unsigned-long>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.vector<unsigned-short>=vector.dll vectorbool.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<double>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<float>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<int>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<long>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.list<string>=list.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.map<string,double>=map.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.map<string,float>=map.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.map<string,int>=map.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.map<int,int>=map2.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.multimap<string,int>=multimap.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<double>=set.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<float>=set.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<int>=set.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<long>=set.dll> for level 0; ignored
-Warning in <TEnvRec::ChangeValue>: duplicate entry <Library.set<string>=set.dll> for level 0; ignored
-RootDatabase.open Success pool_test.root File version:53418
+RootDatabase.open Success pool_test.root File version:60602
 [OVAL] ...done
 [OVAL] Testing the reading operations
-RootDatabase.open Success pool_test.root File version:53418
+RootDatabase.open Success pool_test.root File version:60602
 Closing the session
 [OVAL] ...done
 [OVAL] Number of floating tokens : 0