diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 50167b1ce810b7f97dad30e1e004b0c61e56472c..3b9d3dd9c368a1a684b177ffdf5fed946e745cdd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 #####################################################################################
-# (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations #
+# (c) Copyright 1998-2025 CERN for the benefit of the LHCb and ATLAS collaborations #
 #                                                                                   #
 # This software is distributed under the terms of the Apache version 2 licence,     #
 # copied verbatim in the file "LICENSE".                                            #
@@ -48,8 +48,7 @@ variables:
     - cd ..
     - xsltproc ci-utils/CTest2JUnit.xslt Test.xml > results.xml
     - echo "Test results can be browsed at https://lhcb-nightlies.web.cern.ch/utils/test_report?url=${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/Test.xml"
-    # FIXME: Many tests require AIDA, so we ignore them in that case
-    - test "$PRESET" = "no-AIDA" -o "$result" = "success"
+    - test "$result" = "success"
   artifacts:
     paths:
       - build.log
diff --git a/GaudiCoreSvc/src/ApplicationMgr/EventLoopMgr.cpp b/GaudiCoreSvc/src/ApplicationMgr/EventLoopMgr.cpp
index 74b7fbdf2469c793c7b55aaf35573b042ebfc1ef..7f8ec4c729303d765cca1b3434054f34c5fb0043 100644
--- a/GaudiCoreSvc/src/ApplicationMgr/EventLoopMgr.cpp
+++ b/GaudiCoreSvc/src/ApplicationMgr/EventLoopMgr.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2025 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -85,17 +85,17 @@ StatusCode EventLoopMgr::initialize() {
     }
   }
 
-  // Setup access to histogramming services
-  m_histoDataMgrSvc = serviceLocator()->service( "HistogramDataSvc" );
-  if ( !m_histoDataMgrSvc ) {
-    fatal() << "Error retrieving HistogramDataSvc." << endmsg;
-    return sc;
-  }
-  // Setup histogram persistency
-  m_histoPersSvc = serviceLocator()->service( "HistogramPersistencySvc" );
-  if ( !m_histoPersSvc ) {
-    warning() << "Histograms cannot not be saved - though required." << endmsg;
-    return sc;
+  setProperty( m_appMgrProperty->getProperty( "HistogramPersistency" ) ).ignore();
+  if ( m_histPersName != "NONE" && !m_histPersName.empty() ) {
+    // Setup access to histogramming services
+    m_histoDataMgrSvc = serviceLocator()->service( "HistogramDataSvc" );
+    if ( !m_histoDataMgrSvc ) {
+      fatal() << "Error retrieving HistogramDataSvc." << endmsg;
+      return StatusCode::FAILURE;
+    }
+    // Setup histogram persistency
+    m_histoPersSvc = serviceLocator()->service( "HistogramPersistencySvc" );
+    if ( !m_histoPersSvc ) { warning() << "Histograms cannot not be saved - though required." << endmsg; }
   }
 
   return StatusCode::SUCCESS;
diff --git a/GaudiExamples/TinyExperiment/tests/refs/FullExperiment.yaml b/GaudiExamples/TinyExperiment/tests/refs/FullExperiment.yaml
index 2db52d1ad54dbf514a09e3f8d0ef5a1fe4d10089..5f462d3770ef6ed240561102de71065a64a0a8b1 100644
--- a/GaudiExamples/TinyExperiment/tests/refs/FullExperiment.yaml
+++ b/GaudiExamples/TinyExperiment/tests/refs/FullExperiment.yaml
@@ -177,7 +177,6 @@ stdout: |-
   SimulationAlg        INFO Number of counters : 1
   TrackingAlg          INFO Number of counters : 1
   ApplicationMgr       INFO Application Manager Stopped successfully
-  HiveSlimEventLo...   INFO Histograms converted successfully according to request.
   AvalancheSchedu...   INFO Joining Scheduler thread
   ApplicationMgr       INFO Application Manager Finalized successfully
   ApplicationMgr       INFO Application Manager Terminated successfully
diff --git a/GaudiHive/src/HiveSlimEventLoopMgr.cpp b/GaudiHive/src/HiveSlimEventLoopMgr.cpp
index 1e2386e3d8431caba46e8fb12a4bc53967058a61..d75907b0876bcdd141c954753218bad60430f686 100644
--- a/GaudiHive/src/HiveSlimEventLoopMgr.cpp
+++ b/GaudiHive/src/HiveSlimEventLoopMgr.cpp
@@ -1,5 +1,5 @@
 /***********************************************************************************\
-* (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations *
+* (c) Copyright 1998-2025 CERN for the benefit of the LHCb and ATLAS collaborations *
 *                                                                                   *
 * This software is distributed under the terms of the Apache version 2 licence,     *
 * copied verbatim in the file "LICENSE".                                            *
@@ -102,17 +102,17 @@ StatusCode HiveSlimEventLoopMgr::initialize() {
     }
   }
 
-  // Setup access to histogramming services
-  m_histoDataMgrSvc = serviceLocator()->service( "HistogramDataSvc" );
-  if ( !m_histoDataMgrSvc ) {
-    fatal() << "Error retrieving HistogramDataSvc." << endmsg;
-    return sc;
-  }
-  // Setup histogram persistency
-  m_histoPersSvc = serviceLocator()->service( "HistogramPersistencySvc" );
-  if ( !m_histoPersSvc ) {
-    warning() << "Histograms cannot not be saved - though required." << endmsg;
-    return sc;
+  setProperty( m_appMgrProperty->getProperty( "HistogramPersistency" ) ).ignore();
+  if ( m_histPersName != "NONE" && !m_histPersName.empty() ) {
+    // Setup access to histogramming services
+    m_histoDataMgrSvc = serviceLocator()->service( "HistogramDataSvc" );
+    if ( !m_histoDataMgrSvc ) {
+      fatal() << "Error retrieving HistogramDataSvc." << endmsg;
+      return StatusCode::FAILURE;
+    }
+    // Setup histogram persistency
+    m_histoPersSvc = serviceLocator()->service( "HistogramPersistencySvc" );
+    if ( !m_histoPersSvc ) { warning() << "Histograms cannot not be saved - though required." << endmsg; }
   }
 
   // Setup algorithm resource pool
diff --git a/GaudiHive/tests/pytest/refs/SubSlotVsSlotIsolation.yaml b/GaudiHive/tests/pytest/refs/SubSlotVsSlotIsolation.yaml
index 77f60f41f50e054b2e4c08484c08eb85c12e3946..2543b927de4af727e2dcf8d8a648fb808c008967 100644
--- a/GaudiHive/tests/pytest/refs/SubSlotVsSlotIsolation.yaml
+++ b/GaudiHive/tests/pytest/refs/SubSlotVsSlotIsolation.yaml
@@ -199,7 +199,6 @@ stdout: |-
   HiveSlimEventLo...  DEBUG Clearing slot 0 (event 0) of the whiteboard
   HiveSlimEventLo...   INFO 0 events were SKIPed
   ApplicationMgr       INFO Application Manager Stopped successfully
-  HiveSlimEventLo...   INFO Histograms converted successfully according to request.
   AvalancheSchedu...   INFO Joining Scheduler thread
   ApplicationMgr       INFO Application Manager Finalized successfully
   ApplicationMgr      ERROR Application Manager Terminated with error code 1
diff --git a/GaudiHive/tests/pytest/refs/ViewExceptionTest.yaml b/GaudiHive/tests/pytest/refs/ViewExceptionTest.yaml
index e290a0df0409afc320ffe3e89f2f26313f7dd364..0193d7095f66dcf90c397231e2af6a98fb1845b5 100644
--- a/GaudiHive/tests/pytest/refs/ViewExceptionTest.yaml
+++ b/GaudiHive/tests/pytest/refs/ViewExceptionTest.yaml
@@ -70,8 +70,7 @@ stdout: "{'A1': {'Cardinality': 1,\n        'OutputLevel': 3,\n        'baseView
   PrecedenceSvc     WARNING To trace temporal and topological aspects of execution\
   \ flow, set DumpPrecedenceRules property to True\nHiveSlimEventLo...  FATAL Failed\
   \ event detected on s: 0  e: 1\nHiveSlimEventLo...   INFO 0 events were SKIPed\n\
-  ApplicationMgr       INFO Application Manager Stopped successfully\nHiveSlimEventLo...\
-  \   INFO Histograms converted successfully according to request.\nAvalancheSchedu...\
+  ApplicationMgr       INFO Application Manager Stopped successfully\nAvalancheSchedu...\
   \   INFO Joining Scheduler thread\nApplicationMgr       INFO Application Manager\
   \ Finalized successfully\nApplicationMgr      ERROR Application Manager Terminated\
   \ with error code 6"
diff --git a/GaudiHive/tests/pytest/refs/ViewIsolationTest.yaml b/GaudiHive/tests/pytest/refs/ViewIsolationTest.yaml
index 05bf57f9bc3932e07ffbcb11053d81190b01d7b4..7e60ee23c93d5ac10223abf6683d817e124f52bf 100644
--- a/GaudiHive/tests/pytest/refs/ViewIsolationTest.yaml
+++ b/GaudiHive/tests/pytest/refs/ViewIsolationTest.yaml
@@ -233,7 +233,6 @@ stdout: |-
   A5                   INFO Running in whole event context
   HiveSlimEventLo...   INFO 0 events were SKIPed
   ApplicationMgr       INFO Application Manager Stopped successfully
-  HiveSlimEventLo...   INFO Histograms converted successfully according to request.
   AvalancheSchedu...   INFO Joining Scheduler thread
   ApplicationMgr       INFO Application Manager Finalized successfully
   ApplicationMgr       INFO Application Manager Terminated successfully
diff --git a/GaudiHive/tests/pytest/refs/ViewTest.yaml b/GaudiHive/tests/pytest/refs/ViewTest.yaml
index 653206d869b5b67a2fd7185eadc26b20ee58737c..616e334a0463b04522b8c764e1b33835537e0a18 100644
--- a/GaudiHive/tests/pytest/refs/ViewTest.yaml
+++ b/GaudiHive/tests/pytest/refs/ViewTest.yaml
@@ -145,7 +145,6 @@ stdout: |-
   A4                   INFO Running in whole event context
   HiveSlimEventLo...   INFO 0 events were SKIPed
   ApplicationMgr       INFO Application Manager Stopped successfully
-  HiveSlimEventLo...   INFO Histograms converted successfully according to request.
   AvalancheSchedu...   INFO Joining Scheduler thread
   ApplicationMgr       INFO Application Manager Finalized successfully
   ApplicationMgr       INFO Application Manager Terminated successfully
diff --git a/GaudiMP/CMakeLists.txt b/GaudiMP/CMakeLists.txt
index fa296d653ea16a0c23393601c4d6a64422380d9f..81d6c3929d077afd604d353625abf71989a92455 100644
--- a/GaudiMP/CMakeLists.txt
+++ b/GaudiMP/CMakeLists.txt
@@ -1,5 +1,5 @@
 #####################################################################################
-# (c) Copyright 1998-2019 CERN for the benefit of the LHCb and ATLAS collaborations #
+# (c) Copyright 1998-2025 CERN for the benefit of the LHCb and ATLAS collaborations #
 #                                                                                   #
 # This software is distributed under the terms of the Apache version 2 licence,     #
 # copied verbatim in the file "LICENSE".                                            #
@@ -23,17 +23,15 @@ gaudi_add_library(GaudiMPLib
 
 # Build the plugin
 gaudi_add_module(GaudiMP
-                 SOURCES src/component/IoComponentMgr.cpp
+                 SOURCES
+                     src/component/IoComponentMgr.cpp
+                     src/component/RecordOutputStream.cpp
+                     src/component/ReplayOutputStream.cpp
                  LINK GaudiMPLib
                       Python::Python
                       ROOT::Net
                       ROOT::RIO
                       ROOT::Thread)
-if(GAUDI_USE_AIDA)
-   target_sources(GaudiMP PRIVATE src/component/RecordOutputStream.cpp
-                                  src/component/ReplayOutputStream.cpp)
-   target_link_libraries(GaudiMP PRIVATE AIDA::aida)
-endif()
 
 # ROOT dictionaries
 gaudi_add_dictionary(GaudiMPDict
diff --git a/GaudiPython/CMakeLists.txt b/GaudiPython/CMakeLists.txt
index 962627a88cd8e333fff4dd2a580772dc786d9b8e..c245a37bbb75af515ad3ccb190a3b5f681b4bbfc 100644
--- a/GaudiPython/CMakeLists.txt
+++ b/GaudiPython/CMakeLists.txt
@@ -1,5 +1,5 @@
 #####################################################################################
-# (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations #
+# (c) Copyright 1998-2025 CERN for the benefit of the LHCb and ATLAS collaborations #
 #                                                                                   #
 # This software is distributed under the terms of the Apache version 2 licence,     #
 # copied verbatim in the file "LICENSE".                                            #
@@ -35,6 +35,7 @@ gaudi_add_dictionary(GaudiPythonDict
 set(selection_fragments main)
 if(GAUDI_USE_AIDA)
    target_compile_definitions(GaudiPythonDict PRIVATE AIDA_FOUND)
+   list(APPEND selection_fragments aida)
 endif()
 if(GAUDI_USE_CLHEP)
    target_compile_definitions(GaudiPythonDict PRIVATE CLHEP_FOUND)
diff --git a/GaudiPython/dict/selection_fragment_aida.xml b/GaudiPython/dict/selection_fragment_aida.xml
new file mode 100644
index 0000000000000000000000000000000000000000..62bd7e31d6cdb0f54bfb597c2ded35c95dea700b
--- /dev/null
+++ b/GaudiPython/dict/selection_fragment_aida.xml
@@ -0,0 +1,24 @@
+<!--
+    (c) Copyright 2025 CERN for the benefit of the LHCb and ATLAS collaborations
+
+    This software is distributed under the terms of the Apache version 2 licence,
+    copied verbatim in the file "LICENSE".
+
+    In applying this licence, CERN does not waive the privileges and immunities
+    granted to it by virtue of its status as an Intergovernmental Organization
+    or submit itself to any jurisdiction.
+-->
+
+  <class name    = "std::vector<AIDA::IHistogram1D*>"/>
+  <class name    = "std::vector<AIDA::IHistogram2D*>"/>
+  <class name    = "std::vector<AIDA::IHistogram3D*>"/>
+  <class name    = "std::vector<AIDA::IProfile1D*>"  />
+  <class name    = "std::vector<AIDA::IProfile2D*>"  />
+
+  <class pattern = "AIDA::I*"  />
+
+  <class name    = "Gaudi::Utils::Aida2ROOT"    />
+
+  <class name    = "Gaudi::Utils::Histos::Table"  />
+  <class name    = "Gaudi::Utils::HistoStats"  />
+  <class name    = "Gaudi::Utils::Histos::HistoStrings" />
diff --git a/GaudiPython/dict/selection_fragment_main.xml b/GaudiPython/dict/selection_fragment_main.xml
index 40b223c2edc6fc74fd31d7840a819117eeb126c1..dae035053e56c660dc5fcd71b42a1eae49ce504e 100644
--- a/GaudiPython/dict/selection_fragment_main.xml
+++ b/GaudiPython/dict/selection_fragment_main.xml
@@ -1,5 +1,5 @@
 <!--
-    (c) Copyright 1998-2023 CERN for the benefit of the LHCb and ATLAS collaborations
+    (c) Copyright 1998-2025 CERN for the benefit of the LHCb and ATLAS collaborations
 
     This software is distributed under the terms of the Apache version 2 licence,
     copied verbatim in the file "LICENSE".
@@ -31,24 +31,15 @@
 
   <class name    = "std::vector<IAlgTool*>"          />
   <class name    = "std::vector<StatEntity*>"        />
-  <class name    = "std::vector<AIDA::IHistogram1D*>"/>
-  <class name    = "std::vector<AIDA::IHistogram2D*>"/>
-  <class name    = "std::vector<AIDA::IHistogram3D*>"/>
-  <class name    = "std::vector<AIDA::IProfile1D*>"  />
-  <class name    = "std::vector<AIDA::IProfile2D*>"  />
   <function name = "Gaudi::Utils::Histos::path"      />
   <function name = "Gaudi::Utils::Histos::histoDump" />
-  <class name    = "Gaudi::Utils::Histos::HistoStrings" />
 
   <class name    = "StatEntity"               />
   <class pattern = "GaudiPython::Printer<*>"  />
 
-  <class name    = "Gaudi::Utils::Aida2ROOT"    />
-
   <class name    = "Stat"                   />
   <class pattern = "Chrono*"                 />
 
-  <class pattern = "AIDA::I*"  />
   <class name    = "GaudiPython::PyAlgorithm"/>
   <class name    = "GaudiPython::CallbackStreamBuf"/>
 
@@ -66,8 +57,6 @@
   <function name= "Gaudi::Utils::Histos::Formats::format" />
   <function name= "Gaudi::Utils::Histos::Formats::header" />
   <function name= "Gaudi::Utils::Histos::format" />
-  <class    name= "Gaudi::Utils::Histos::Table"  />
-  <class    name= "Gaudi::Utils::HistoStats"  />
 
   <function name= "Gaudi::Utils::QuasiRandom::mix" />
   <function name= "Gaudi::Utils::QuasiRandom::mix32" />
diff --git a/GaudiTestSuite/CMakeLists.txt b/GaudiTestSuite/CMakeLists.txt
index 5ab522f2905d27bca1bce2a194cade21e3fb3e78..f5d318ac9c605cd2bcdafca9ed9f8b38a0421ef2 100644
--- a/GaudiTestSuite/CMakeLists.txt
+++ b/GaudiTestSuite/CMakeLists.txt
@@ -1,5 +1,5 @@
 #####################################################################################
-# (c) Copyright 1998-2024 CERN for the benefit of the LHCb and ATLAS collaborations #
+# (c) Copyright 1998-2025 CERN for the benefit of the LHCb and ATLAS collaborations #
 #                                                                                   #
 # This software is distributed under the terms of the Apache version 2 licence,     #
 # copied verbatim in the file "LICENSE".                                            #
@@ -66,12 +66,21 @@ gaudi_add_module(GaudiTestSuiteComponents
                          src/FunctionalAlgorithms/TestObjectVersion.cpp
                          src/FunctionalAlgorithms/transformer.cpp
                          src/Histograms/CounterHistos.cpp
+                         src/Histograms/HistoProps.cpp
                          src/History/History.cpp
                          src/IncidentSvc/IncidentAsyncTestAlg.cpp
                          src/IncidentSvc/IncidentAsyncTestSvc.cpp
                          src/IncidentSvc/IncidentListenerTest.cpp
                          src/IncidentSvc/IncidentListenerTestAlg.cpp
                          src/IntelProfiler/CpuHungryAlg.cpp
+                         src/IO/EvtCollectionSelector.cpp
+                         src/IO/EvtCollectionWrite.cpp
+                         src/IO/EvtExtCollectionSelector.cpp
+                         src/IO/ReadAlg.cpp
+                         src/IO/ReadHandleAlg.cpp
+                         src/IO/ReadTES.cpp
+                         src/IO/WriteAlg.cpp
+                         src/IO/WriteHandleAlg.cpp
                          src/Maps/MapAlg.cpp
                          src/MultipleLogStreams/QotdAlg.cpp
                          src/NTuples/NTupleAlgorithm.cpp
@@ -122,15 +131,6 @@ endif()
 if(GAUDI_USE_AIDA)
     target_sources(GaudiTestSuiteComponents PRIVATE
                                          src/Histograms/HistoAlgorithm.cpp
-                                         src/Histograms/HistoProps.cpp
-                                         src/IO/EvtCollectionSelector.cpp
-                                         src/IO/EvtCollectionWrite.cpp
-                                         src/IO/EvtExtCollectionSelector.cpp
-                                         src/IO/ReadAlg.cpp
-                                         src/IO/ReadHandleAlg.cpp
-                                         src/IO/ReadTES.cpp
-                                         src/IO/WriteAlg.cpp
-                                         src/IO/WriteHandleAlg.cpp
                                          src/RandomNumber/RandomNumberAlg.cpp)
     target_link_libraries(GaudiTestSuiteComponents PRIVATE AIDA::aida)
 endif()
@@ -188,6 +188,18 @@ if(NOT GAUDI_ENABLE_GAUDIPARTPROP)
         GaudiTestSuite.pytest.test_particlepropsvc
     )
 endif()
+if(NOT GAUDI_USE_AIDA)
+    list(APPEND tests_to_disable
+        GaudiTestSuite.pytest.bug.test_71216
+        GaudiTestSuite.pytest.gaudiconfig2.test_histograms
+        GaudiTestSuite.pytest.gaudiconfig2.test_histograms_with_global
+        GaudiTestSuite.pytest.test_randomnumber
+        GaudiTestSuite.pytest.test_ntuples
+        GaudiTestSuite.pytest.test_metadatasvc
+        GaudiTestSuite.pytest.test_histograms_py
+        GaudiTestSuite.pytest.test_histograms_opts
+    )
+endif()
 if(NOT CMAKE_BUILD_TYPE MATCHES "Debug" AND NOT CMAKE_BUILD_TYPE STREQUAL "")
     # the messages expected by this test are printed only if NDEBUG is not defined
     # (i.e. in release builds or with empty build type)
diff --git a/GaudiTestSuite/tests/pytest/refs/AlgTools.yaml b/GaudiTestSuite/tests/pytest/refs/AlgTools.yaml
index 051e0c8217e47dae485a291b9d07662ab4b0b6b1..4bcafa7d03716181074a995cda9cbc3b6bb53c2f 100644
--- a/GaudiTestSuite/tests/pytest/refs/AlgTools.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/AlgTools.yaml
@@ -293,7 +293,6 @@ stdout: |-
   ToolSvc.ConstGe...   INFO doIt() has been called
   ApplicationMgr       INFO Application Manager Stopped successfully
   MyAlg                INFO finalizing....
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   ToolSvc              INFO Removing all tools created by ToolSvc
   MyAlg.ToolWithName   INFO finalize() has been called
   MyAlg.MyTool         INFO finalize() has been called
diff --git a/GaudiTestSuite/tests/pytest/refs/AlgTools_pyopts.yaml b/GaudiTestSuite/tests/pytest/refs/AlgTools_pyopts.yaml
index 202793fd765c56d04340074de19f1f6772a87355..cfaab21a270ef30278f96aa55811daaa14e86ae9 100644
--- a/GaudiTestSuite/tests/pytest/refs/AlgTools_pyopts.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/AlgTools_pyopts.yaml
@@ -246,7 +246,6 @@ stdout: |-
   ToolSvc.ConstGe...   INFO doIt() has been called
   ApplicationMgr       INFO Application Manager Stopped successfully
   MyAlg                INFO finalizing....
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   ToolSvc              INFO Removing all tools created by ToolSvc
   MyAlg.ToolWithName   INFO finalize() has been called
   MyAlg.MyTool         INFO finalize() has been called
diff --git a/GaudiTestSuite/tests/pytest/refs/AlgTypeAliases.yaml b/GaudiTestSuite/tests/pytest/refs/AlgTypeAliases.yaml
index d30bf16dd8cdc4ee5c3d59c40ecec63065fbf2e0..7c5f086e19c57872408ff225d810877a9a2b1178 100644
--- a/GaudiTestSuite/tests/pytest/refs/AlgTypeAliases.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/AlgTypeAliases.yaml
@@ -20,7 +20,6 @@ stdout: |-
   ApplicationMgr       INFO Application Manager Stopped successfully
   HW1                  INFO finalizing....
   HW2                  INFO finalizing....
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   ApplicationMgr       INFO Application Manager Finalized successfully
   ApplicationMgr       INFO Application Manager Terminated successfully
 histos: {}
diff --git a/GaudiTestSuite/tests/pytest/refs/ColorMsg.winxp.yaml b/GaudiTestSuite/tests/pytest/refs/ColorMsg.winxp.yaml
deleted file mode 100644
index d0c5a85788be119459797c1e114ce73b4c134562..0000000000000000000000000000000000000000
--- a/GaudiTestSuite/tests/pytest/refs/ColorMsg.winxp.yaml
+++ /dev/null
@@ -1,115 +0,0 @@
-stdout: |
-  JobOptionsSvc        INFO # =======> D:/Profiles/clemenci/cmtuser/Gaudi/GaudiTestSuite/options/Services.opts)
-  JobOptionsSvc        INFO # (12,1): AuditorSvc.Auditors = ["ChronoAuditor"]
-  JobOptionsSvc        INFO # =======> D:/Profiles/clemenci/cmtuser/Gaudi/GaudiTestSuite/options/Common.opts)
-  JobOptionsSvc        INFO # (9,1): ApplicationMgr.StatusCodeCheck = 1
-  JobOptionsSvc        INFO # =======> D:/Profiles/clemenci/cmtuser/Gaudi/GaudiTestSuite/options/ColorMsg.opts)
-  JobOptionsSvc        INFO # (10,1): ApplicationMgr.TopAlg = ["ColorMsgAlg"]
-  JobOptionsSvc        INFO # (16,1): MessageSvc.OutputLevel = 1
-  JobOptionsSvc        INFO # (17,1): MessageSvc.useColors = 1
-  JobOptionsSvc        INFO # (18,1): MessageSvc.fatalColorCode = ["blue", "red"]
-  JobOptionsSvc        INFO # (19,1): MessageSvc.errorColorCode = ["[97;101;1m"]
-  JobOptionsSvc        INFO # (20,1): MessageSvc.warningColorCode = ["yellow"]
-  JobOptionsSvc        INFO # (21,1): MessageSvc.infoColorCode = ["[96;1m"]
-  JobOptionsSvc        INFO # (22,1): MessageSvc.debugColorCode = ["[92;1m"]
-  JobOptionsSvc        INFO # (23,1): MessageSvc.verboseColorCode = ["[95;4m"]
-  JobOptionsSvc        INFO # (31,1): ApplicationMgr.EvtMax = 2
-  JobOptionsSvc        INFO # (32,1): ApplicationMgr.EvtSel = "NONE"
-  JobOptionsSvc        INFO Job options successfully read in from D:\Profiles\clemenci\cmtuser\Gaudi\GaudiTestSuite\options\ColorMsg.opts
-  ApplicationMgr      DEBUG Getting my own properties
-  ApplicationMgr    SUCCESS
-  ====================================================================================================================================
-                                                     Welcome to ApplicationMgr $Revision: 1.77 $
-                                            running on CERNTSLHCB05 on 08/16/11 11:49:59
-  ====================================================================================================================================
-  ApplicationMgr       INFO Application Manager Configured successfully
-  ServiceManager      DEBUG Initializing service StatusCodeSvc
-  StatusCodeSvc       DEBUG Service base class initialized successfully
-  StatusCodeSvc        INFO initialize
-  ServiceManager      DEBUG Initializing service AppMgrRunable
-  AppMgrRunable       DEBUG Service base class initialized successfully
-  ServiceManager      DEBUG Initializing service EventLoopMgr
-  EventLoopMgr        DEBUG Service base class initialized successfully
-  IncidentSvc         DEBUG Service base class initialized successfully
-  IncidentSvc         DEBUG Adding [AbortEvent] listener '<unknown>' with priority 0
-  EventLoopMgr        DEBUG Creating Top Algorithm ColorMsgAlg with name ColorMsgAlg
-  EventDataSvc        DEBUG Service base class initialized successfully
-  EventDataSvc      VERBOSE ServiceLocatorHelper::service: found service IncidentSvc
-  EventPersistenc...  DEBUG Service base class initialized successfully
-  EventLoopMgr      WARNING Unable to locate service "EventSelector"
-  EventLoopMgr      WARNING No events will be processed from external input.
-  HistogramDataSvc    DEBUG Service base class initialized successfully
-  HistogramDataSvc  VERBOSE ServiceLocatorHelper::service: found service IncidentSvc
-  HistogramPersis...  DEBUG  'CnvServices':[ 'RootHistSvc' ]
-  HistogramPersis...  DEBUG Service base class initialized successfully
-  HistogramPersis...WARNING Histograms saving not required.
-  HistogramDataSvc  VERBOSE ServiceLocatorHelper::service: found service HistogramPersistencySvc
-  ApplicationMgr       INFO Application Manager Initialized successfully
-  ServiceManager      DEBUG Starting service StatusCodeSvc
-  ServiceManager      DEBUG Starting service AppMgrRunable
-  ServiceManager      DEBUG Starting service IncidentSvc
-  ServiceManager      DEBUG Starting service EventPersistencySvc
-  ServiceManager      DEBUG Starting service EventDataSvc
-  ServiceManager      DEBUG Starting service HistogramPersistencySvc
-  ServiceManager      DEBUG Starting service HistogramDataSvc
-  ServiceManager      DEBUG Starting service EventLoopMgr
-  ApplicationMgr       INFO Application Manager Started successfully
-  ColorMsgAlg         FATAL THIS IS A FATAL MESSAGE
-  ColorMsgAlg         ERROR THIS IS AN ERROR MESSAGE
-  ColorMsgAlg       WARNING THIS IS A WARNING MESSAGE
-  ColorMsgAlg          INFO THIS IS A INFO MESSAGE
-  ColorMsgAlg         DEBUG THIS IS A DEBUG MESSAGE
-  ColorMsgAlg       VERBOSE THIS IS A VERBOSE MESSAGE
-  ColorMsgAlg         ERROR this is another error message
-  ColorMsgAlg       WARNING This is another warning message
-  ColorMsgAlg          INFO testing colour
-  ColorMsgAlg          INFO setting....this should be in yellow and red
-  ColorMsgAlg          INFO multicolor: this is blue on green and purple on white
-  ColorMsgAlg          INFO This is green. This is in yellow on blue. This is back to normal
-  ColorMsgAlg         FATAL THIS IS A FATAL MESSAGE
-  ColorMsgAlg         ERROR THIS IS AN ERROR MESSAGE
-  ColorMsgAlg       WARNING THIS IS A WARNING MESSAGE
-  ColorMsgAlg          INFO THIS IS A INFO MESSAGE
-  ColorMsgAlg         DEBUG THIS IS A DEBUG MESSAGE
-  ColorMsgAlg       VERBOSE THIS IS A VERBOSE MESSAGE
-  ColorMsgAlg         ERROR this is another error message
-  ColorMsgAlg       WARNING This is another warning message
-  ColorMsgAlg          INFO testing colour
-  ColorMsgAlg          INFO setting....this should be in yellow and red
-  ColorMsgAlg          INFO multicolor: this is blue on green and purple on white
-  ColorMsgAlg          INFO This is green. This is in yellow on blue. This is back to normal
-  ServiceManager      DEBUG Stopping service EventLoopMgr
-  ServiceManager      DEBUG Stopping service HistogramDataSvc
-  ServiceManager      DEBUG Stopping service HistogramPersistencySvc
-  ServiceManager      DEBUG Stopping service EventDataSvc
-  ServiceManager      DEBUG Stopping service EventPersistencySvc
-  ServiceManager      DEBUG Stopping service IncidentSvc
-  ServiceManager      DEBUG Stopping service AppMgrRunable
-  ServiceManager      DEBUG Stopping service StatusCodeSvc
-  ApplicationMgr       INFO Application Manager Stopped successfully
-  ServiceManager      DEBUG Finalizing service EventLoopMgr
-  IncidentSvc         DEBUG Removing [AbortEvent] listener '<unknown>'
-  EventLoopMgr         INFO Histograms converted successfully according to request.
-  ServiceManager      DEBUG Finalizing service HistogramDataSvc
-  ServiceManager      DEBUG Finalizing service HistogramPersistencySvc
-  ServiceManager      DEBUG Finalizing service EventDataSvc
-  ServiceManager      DEBUG Finalizing service EventPersistencySvc
-  ServiceManager      DEBUG Finalizing service IncidentSvc
-  IncidentSvc         DEBUG Incident  timing: Mean(+-rms)/Min/Max:0(+-0)/0/0[ms] Total:0[s]
-  ServiceManager      DEBUG Finalizing service AppMgrRunable
-  ServiceManager      DEBUG Finalizing service StatusCodeSvc
-  ServiceManager      DEBUG Service reference count check:
-  ServiceManager      DEBUG ---- StatusCodeSvc (refCount = 2)
-  ServiceManager      DEBUG ---- MessageSvc (refCount = 11)
-  ServiceManager      DEBUG ---- JobOptionsSvc (refCount = 2)
-  ServiceManager      DEBUG ---- AppMgrRunable (refCount = 3)
-  ServiceManager      DEBUG ---- IncidentSvc (refCount = 2)
-  ServiceManager      DEBUG ---- EventPersistencySvc (refCount = 2)
-  ServiceManager      DEBUG ---- EventDataSvc (refCount = 3)
-  ServiceManager      DEBUG ---- HistogramPersistencySvc (refCount = 2)
-  ServiceManager      DEBUG ---- HistogramDataSvc (refCount = 3)
-  ServiceManager      DEBUG ---- EventLoopMgr (refCount = 3)
-  ApplicationMgr       INFO Application Manager Finalized successfully
-  ApplicationMgr       INFO Application Manager Terminated successfully
-histos: {}
-ttrees: {}
diff --git a/GaudiTestSuite/tests/pytest/refs/ColorMsg.yaml b/GaudiTestSuite/tests/pytest/refs/ColorMsg.yaml
index 45ebed7fd171ec0553087e3089629899d34371e5..e6b707c8f02cc4a29ce54375dd18c80475211e85 100644
--- a/GaudiTestSuite/tests/pytest/refs/ColorMsg.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/ColorMsg.yaml
@@ -16,18 +16,14 @@ stdout: "JobOptionsSvc        INFO Job options successfully file ColorMsg.opts\n
   \ will add Alg ColorMsgAlg later\e[m\n\e[92;1mColorMsgAlg         DEBUG input handles:\
   \ 0\e[m\n\e[92;1mColorMsgAlg         DEBUG output handles: 0\e[m\n\e[93;1mEventLoopMgr\
   \      WARNING Unable to locate service \"EventSelector\" \e[m\n\e[93;1mEventLoopMgr\
-  \      WARNING No events will be processed from external input.\e[m\n\e[95;4mHistogramDataSvc\
-  \  VERBOSE ServiceLocatorHelper::service: found service IncidentSvc\e[m\n\e[95;4mHistogramDataSvc\
-  \  VERBOSE ServiceLocatorHelper::service: found service HistogramPersistencySvc\e\
-  [m\n\e[96;1mApplicationMgr       INFO Application Manager Initialized successfully\e\
-  [m\n\e[92;1mServiceManager      DEBUG Starting service AppMgrRunable\e[m\n\e[92;1mServiceManager\
-  \      DEBUG Starting service IncidentSvc\e[m\n\e[92;1mServiceManager      DEBUG\
-  \ Starting service EventPersistencySvc\e[m\n\e[92;1mServiceManager      DEBUG Starting\
-  \ service EventDataSvc\e[m\n\e[92;1mServiceManager      DEBUG Starting service TimelineSvc\e\
-  [m\n\e[92;1mServiceManager      DEBUG Starting service AlgExecStateSvc\e[m\n\e[92;1mServiceManager\
-  \      DEBUG Starting service HistogramPersistencySvc\e[m\n\e[92;1mServiceManager\
-  \      DEBUG Starting service HistogramDataSvc\e[m\n\e[92;1mServiceManager     \
-  \ DEBUG Starting service EventLoopMgr\e[m\n\e[96;1mApplicationMgr       INFO Application\
+  \      WARNING No events will be processed from external input.\e[m\n\e[96;1mApplicationMgr\
+  \       INFO Application Manager Initialized successfully\e[m\n\e[92;1mServiceManager\
+  \      DEBUG Starting service AppMgrRunable\e[m\n\e[92;1mServiceManager      DEBUG\
+  \ Starting service IncidentSvc\e[m\n\e[92;1mServiceManager      DEBUG Starting service\
+  \ EventPersistencySvc\e[m\n\e[92;1mServiceManager      DEBUG Starting service EventDataSvc\e\
+  [m\n\e[92;1mServiceManager      DEBUG Starting service TimelineSvc\e[m\n\e[92;1mServiceManager\
+  \      DEBUG Starting service AlgExecStateSvc\e[m\n\e[92;1mServiceManager      DEBUG\
+  \ Starting service EventLoopMgr\e[m\n\e[96;1mApplicationMgr       INFO Application\
   \ Manager Started successfully\e[m\n\e[95;4mAlgExecStateSvc   VERBOSE reset(0)\e\
   [m\n\e[92;1mAlgExecStateSvc     DEBUG resizing state containers to : 1\e[m\n\e[92;1mAlgExecStateSvc\
   \     DEBUG adding alg ColorMsgAlg to 1 slots\e[m\n\e[95;4mAlgExecStateSvc   VERBOSE\
@@ -57,33 +53,26 @@ stdout: "JobOptionsSvc        INFO Job options successfully file ColorMsg.opts\n
   [95;107;1m and purple on white\e[m\n\e[96;1mColorMsgAlg          INFO \e[92;1mThis\
   \ is green. \e[93;104;1mThis is in yellow on blue. \e[m\e[96;1mThis is back to normal\e\
   [m\n\e[92;1mServiceManager      DEBUG Stopping service EventLoopMgr\e[m\n\e[92;1mServiceManager\
-  \      DEBUG Stopping service HistogramDataSvc\e[m\n\e[92;1mServiceManager     \
-  \ DEBUG Stopping service HistogramPersistencySvc\e[m\n\e[92;1mServiceManager   \
-  \   DEBUG Stopping service AlgExecStateSvc\e[m\n\e[92;1mServiceManager      DEBUG\
+  \      DEBUG Stopping service AlgExecStateSvc\e[m\n\e[92;1mServiceManager      DEBUG\
   \ Stopping service TimelineSvc\e[m\n\e[92;1mServiceManager      DEBUG Stopping service\
   \ EventDataSvc\e[m\n\e[92;1mServiceManager      DEBUG Stopping service EventPersistencySvc\e\
   [m\n\e[92;1mServiceManager      DEBUG Stopping service IncidentSvc\e[m\n\e[92;1mServiceManager\
   \      DEBUG Stopping service AppMgrRunable\e[m\n\e[96;1mApplicationMgr       INFO\
   \ Application Manager Stopped successfully\e[m\n\e[92;1mServiceManager      DEBUG\
-  \ Finalizing service EventLoopMgr\e[m\n\e[96;1mEventLoopMgr         INFO Histograms\
-  \ converted successfully according to request.\e[m\n\e[92;1mServiceManager     \
-  \ DEBUG Finalizing service HistogramDataSvc\e[m\n\e[92;1mServiceManager      DEBUG\
-  \ Finalizing service HistogramPersistencySvc\e[m\n\e[92;1mServiceManager      DEBUG\
-  \ Finalizing service AlgExecStateSvc\e[m\n\e[92;1mServiceManager      DEBUG Finalizing\
-  \ service TimelineSvc\e[m\n\e[92;1mServiceManager      DEBUG Finalizing service\
-  \ EventDataSvc\e[m\n\e[92;1mServiceManager      DEBUG Finalizing service EventPersistencySvc\e\
-  [m\n\e[92;1mServiceManager      DEBUG Finalizing service IncidentSvc\e[m\n\e[92;1mServiceManager\
+  \ Finalizing service EventLoopMgr\e[m\n\e[92;1mServiceManager      DEBUG Finalizing\
+  \ service AlgExecStateSvc\e[m\n\e[92;1mServiceManager      DEBUG Finalizing service\
+  \ TimelineSvc\e[m\n\e[92;1mServiceManager      DEBUG Finalizing service EventDataSvc\e\
+  [m\n\e[92;1mServiceManager      DEBUG Finalizing service EventPersistencySvc\e[m\n\
+  \e[92;1mServiceManager      DEBUG Finalizing service IncidentSvc\e[m\n\e[92;1mServiceManager\
   \      DEBUG Finalizing service AppMgrRunable\e[m\n\e[92;1mServiceManager      DEBUG\
   \ Looping over all active services...\e[m\n\e[92;1mServiceManager      DEBUG ----\
-  \ MessageSvc (refCount = 17)\e[m\n\e[92;1mServiceManager      DEBUG ---- JobOptionsSvc\
+  \ MessageSvc (refCount = 15)\e[m\n\e[92;1mServiceManager      DEBUG ---- JobOptionsSvc\
   \ (refCount = 2)\e[m\n\e[92;1mServiceManager      DEBUG ---- AppMgrRunable (refCount\
   \ = 3)\e[m\n\e[92;1mServiceManager      DEBUG ---- IncidentSvc (refCount = 2)\e\
   [m\n\e[92;1mServiceManager      DEBUG ---- EventPersistencySvc (refCount = 2)\e\
   [m\n\e[92;1mServiceManager      DEBUG ---- EventDataSvc (refCount = 3)\e[m\n\e[92;1mServiceManager\
   \      DEBUG ---- TimelineSvc (refCount = 2)\e[m\n\e[92;1mServiceManager      DEBUG\
   \ ---- AlgExecStateSvc (refCount = 3)\e[m\n\e[92;1mServiceManager      DEBUG ----\
-  \ HistogramPersistencySvc (refCount = 2)\e[m\n\e[92;1mServiceManager      DEBUG\
-  \ ---- HistogramDataSvc (refCount = 3)\e[m\n\e[92;1mServiceManager      DEBUG ----\
   \ EventLoopMgr (refCount = 3)\e[m\n\e[96;1mApplicationMgr       INFO Application\
   \ Manager Finalized successfully\e[m\n\e[96;1mApplicationMgr       INFO Application\
   \ Manager Terminated successfully\e[m"
diff --git a/GaudiTestSuite/tests/pytest/refs/ColorMsg_py.yaml b/GaudiTestSuite/tests/pytest/refs/ColorMsg_py.yaml
index 0f53a4a31a8aa95f7817224e24aa2f4e49a5d8bc..f31c4dc6567cc2fd9a5767b163258589560313b9 100644
--- a/GaudiTestSuite/tests/pytest/refs/ColorMsg_py.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/ColorMsg_py.yaml
@@ -14,18 +14,14 @@ stdout: "ApplicationMgr    SUCCESS\n============================================
   [m\n\e[92;1mColorMsgAlg         DEBUG input handles: 0\e[m\n\e[92;1mColorMsgAlg\
   \         DEBUG output handles: 0\e[m\n\e[93;1mEventLoopMgr      WARNING Unable\
   \ to locate service \"EventSelector\" \e[m\n\e[93;1mEventLoopMgr      WARNING No\
-  \ events will be processed from external input.\e[m\n\e[95;4mHistogramDataSvc  VERBOSE\
-  \ ServiceLocatorHelper::service: found service IncidentSvc\e[m\n\e[95;4mHistogramDataSvc\
-  \  VERBOSE ServiceLocatorHelper::service: found service HistogramPersistencySvc\e\
-  [m\n\e[96;1mApplicationMgr       INFO Application Manager Initialized successfully\e\
-  [m\n\e[92;1mServiceManager      DEBUG Starting service AppMgrRunable\e[m\n\e[92;1mServiceManager\
-  \      DEBUG Starting service IncidentSvc\e[m\n\e[92;1mServiceManager      DEBUG\
-  \ Starting service EventPersistencySvc\e[m\n\e[92;1mServiceManager      DEBUG Starting\
-  \ service EventDataSvc\e[m\n\e[92;1mServiceManager      DEBUG Starting service TimelineSvc\e\
-  [m\n\e[92;1mServiceManager      DEBUG Starting service AlgExecStateSvc\e[m\n\e[92;1mServiceManager\
-  \      DEBUG Starting service HistogramPersistencySvc\e[m\n\e[92;1mServiceManager\
-  \      DEBUG Starting service HistogramDataSvc\e[m\n\e[92;1mServiceManager     \
-  \ DEBUG Starting service EventLoopMgr\e[m\n\e[96;1mApplicationMgr       INFO Application\
+  \ events will be processed from external input.\e[m\n\e[96;1mApplicationMgr    \
+  \   INFO Application Manager Initialized successfully\e[m\n\e[92;1mServiceManager\
+  \      DEBUG Starting service AppMgrRunable\e[m\n\e[92;1mServiceManager      DEBUG\
+  \ Starting service IncidentSvc\e[m\n\e[92;1mServiceManager      DEBUG Starting service\
+  \ EventPersistencySvc\e[m\n\e[92;1mServiceManager      DEBUG Starting service EventDataSvc\e\
+  [m\n\e[92;1mServiceManager      DEBUG Starting service TimelineSvc\e[m\n\e[92;1mServiceManager\
+  \      DEBUG Starting service AlgExecStateSvc\e[m\n\e[92;1mServiceManager      DEBUG\
+  \ Starting service EventLoopMgr\e[m\n\e[96;1mApplicationMgr       INFO Application\
   \ Manager Started successfully\e[m\n\e[95;4mAlgExecStateSvc   VERBOSE reset(0)\e\
   [m\n\e[92;1mAlgExecStateSvc     DEBUG resizing state containers to : 1\e[m\n\e[92;1mAlgExecStateSvc\
   \     DEBUG adding alg ColorMsgAlg to 1 slots\e[m\n\e[95;4mAlgExecStateSvc   VERBOSE\
@@ -55,33 +51,26 @@ stdout: "ApplicationMgr    SUCCESS\n============================================
   [95;107;1m and purple on white\e[m\n\e[96;1mColorMsgAlg          INFO \e[92;1mThis\
   \ is green. \e[93;104;1mThis is in yellow on blue. \e[m\e[96;1mThis is back to normal\e\
   [m\n\e[92;1mServiceManager      DEBUG Stopping service EventLoopMgr\e[m\n\e[92;1mServiceManager\
-  \      DEBUG Stopping service HistogramDataSvc\e[m\n\e[92;1mServiceManager     \
-  \ DEBUG Stopping service HistogramPersistencySvc\e[m\n\e[92;1mServiceManager   \
-  \   DEBUG Stopping service AlgExecStateSvc\e[m\n\e[92;1mServiceManager      DEBUG\
+  \      DEBUG Stopping service AlgExecStateSvc\e[m\n\e[92;1mServiceManager      DEBUG\
   \ Stopping service TimelineSvc\e[m\n\e[92;1mServiceManager      DEBUG Stopping service\
   \ EventDataSvc\e[m\n\e[92;1mServiceManager      DEBUG Stopping service EventPersistencySvc\e\
   [m\n\e[92;1mServiceManager      DEBUG Stopping service IncidentSvc\e[m\n\e[92;1mServiceManager\
   \      DEBUG Stopping service AppMgrRunable\e[m\n\e[96;1mApplicationMgr       INFO\
   \ Application Manager Stopped successfully\e[m\n\e[92;1mServiceManager      DEBUG\
-  \ Finalizing service EventLoopMgr\e[m\n\e[96;1mEventLoopMgr         INFO Histograms\
-  \ converted successfully according to request.\e[m\n\e[92;1mServiceManager     \
-  \ DEBUG Finalizing service HistogramDataSvc\e[m\n\e[92;1mServiceManager      DEBUG\
-  \ Finalizing service HistogramPersistencySvc\e[m\n\e[92;1mServiceManager      DEBUG\
-  \ Finalizing service AlgExecStateSvc\e[m\n\e[92;1mServiceManager      DEBUG Finalizing\
-  \ service TimelineSvc\e[m\n\e[92;1mServiceManager      DEBUG Finalizing service\
-  \ EventDataSvc\e[m\n\e[92;1mServiceManager      DEBUG Finalizing service EventPersistencySvc\e\
-  [m\n\e[92;1mServiceManager      DEBUG Finalizing service IncidentSvc\e[m\n\e[92;1mServiceManager\
+  \ Finalizing service EventLoopMgr\e[m\n\e[92;1mServiceManager      DEBUG Finalizing\
+  \ service AlgExecStateSvc\e[m\n\e[92;1mServiceManager      DEBUG Finalizing service\
+  \ TimelineSvc\e[m\n\e[92;1mServiceManager      DEBUG Finalizing service EventDataSvc\e\
+  [m\n\e[92;1mServiceManager      DEBUG Finalizing service EventPersistencySvc\e[m\n\
+  \e[92;1mServiceManager      DEBUG Finalizing service IncidentSvc\e[m\n\e[92;1mServiceManager\
   \      DEBUG Finalizing service AppMgrRunable\e[m\n\e[92;1mServiceManager      DEBUG\
   \ Looping over all active services...\e[m\n\e[92;1mServiceManager      DEBUG ----\
-  \ MessageSvc (refCount = 17)\e[m\n\e[92;1mServiceManager      DEBUG ---- JobOptionsSvc\
+  \ MessageSvc (refCount = 15)\e[m\n\e[92;1mServiceManager      DEBUG ---- JobOptionsSvc\
   \ (refCount = 2)\e[m\n\e[92;1mServiceManager      DEBUG ---- AppMgrRunable (refCount\
   \ = 3)\e[m\n\e[92;1mServiceManager      DEBUG ---- IncidentSvc (refCount = 2)\e\
   [m\n\e[92;1mServiceManager      DEBUG ---- EventPersistencySvc (refCount = 2)\e\
   [m\n\e[92;1mServiceManager      DEBUG ---- EventDataSvc (refCount = 3)\e[m\n\e[92;1mServiceManager\
   \      DEBUG ---- TimelineSvc (refCount = 2)\e[m\n\e[92;1mServiceManager      DEBUG\
   \ ---- AlgExecStateSvc (refCount = 3)\e[m\n\e[92;1mServiceManager      DEBUG ----\
-  \ HistogramPersistencySvc (refCount = 2)\e[m\n\e[92;1mServiceManager      DEBUG\
-  \ ---- HistogramDataSvc (refCount = 3)\e[m\n\e[92;1mServiceManager      DEBUG ----\
   \ EventLoopMgr (refCount = 3)\e[m\n\e[96;1mApplicationMgr       INFO Application\
   \ Manager Finalized successfully\e[m\n\e[96;1mApplicationMgr       INFO Application\
   \ Manager Terminated successfully\e[m"
diff --git a/GaudiTestSuite/tests/pytest/refs/ConditionsAccess.yaml b/GaudiTestSuite/tests/pytest/refs/ConditionsAccess.yaml
index d4fe35c68b1823c374ffb9e3c9fdd5bf27566634..912155f9d8974feec107fb11923d5ed18f347378 100644
--- a/GaudiTestSuite/tests/pytest/refs/ConditionsAccess.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/ConditionsAccess.yaml
@@ -38,7 +38,6 @@ stdout: |-
   ApplicationMgr       INFO Application Manager Stopped successfully
   ConditionsUser1      INFO finalize
   ConditionsUser2      INFO finalize
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   ApplicationMgr       INFO Application Manager Finalized successfully
   ApplicationMgr       INFO Application Manager Terminated successfully
 histos: {}
diff --git a/GaudiTestSuite/tests/pytest/refs/ControlFlow/AlgSequencer.yaml b/GaudiTestSuite/tests/pytest/refs/ControlFlow/AlgSequencer.yaml
index 4a1846069b555c44c6b6a89fcdb25b0eaa3062b6..58b541b3c15aca4d711e333ccb00724f8da20698 100644
--- a/GaudiTestSuite/tests/pytest/refs/ControlFlow/AlgSequencer.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/ControlFlow/AlgSequencer.yaml
@@ -95,7 +95,6 @@ stdout: |-
   HelloWorld           INFO finalizing....
   AND                  INFO finalizing....
   OR                   INFO finalizing....
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   ToolSvc              INFO Removing all tools created by ToolSvc
   *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
   ChronoStatSvc.f...   INFO  Service finalized successfully
diff --git a/GaudiTestSuite/tests/pytest/refs/ControlFlow/SuperAlgDynamicGraph.yaml b/GaudiTestSuite/tests/pytest/refs/ControlFlow/SuperAlgDynamicGraph.yaml
index 869cef88b8be96c79f018b79f5885987a4938dd3..1c2bcae8db7ba72d0bc595ca5eaf2db673a5c4a1 100644
--- a/GaudiTestSuite/tests/pytest/refs/ControlFlow/SuperAlgDynamicGraph.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/ControlFlow/SuperAlgDynamicGraph.yaml
@@ -21,6 +21,5 @@ stdout: |-
   s2_Prescaler         INFO Number of counters : 1
   ApplicationMgr       INFO Application Manager Stopped successfully
   s1_HW                INFO finalizing....
-  EventLoopMgr         INFO Histograms converted successfully according to request.
 histos: {}
 ttrees: {}
diff --git a/GaudiTestSuite/tests/pytest/refs/ControlFlow/SuperAlgorithm.yaml b/GaudiTestSuite/tests/pytest/refs/ControlFlow/SuperAlgorithm.yaml
index e1c50322c9fb7167fc8cde8bab7ab6fe1c31cf08..320d8ac28309c6a89a30320b8cb68b4c4cc28dbb 100644
--- a/GaudiTestSuite/tests/pytest/refs/ControlFlow/SuperAlgorithm.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/ControlFlow/SuperAlgorithm.yaml
@@ -85,6 +85,5 @@ stdout: |-
   s2_HW                INFO finalizing....
   AND                  INFO finalizing....
   OR                   INFO finalizing....
-  EventLoopMgr         INFO Histograms converted successfully according to request.
 histos: {}
 ttrees: {}
diff --git a/GaudiTestSuite/tests/pytest/refs/CounterAlg.yaml b/GaudiTestSuite/tests/pytest/refs/CounterAlg.yaml
index e676344a9542023ebac05fff78f9e94b83ccdca9..7ecea62b8223ccd6f35158a240868364c9d49663 100644
--- a/GaudiTestSuite/tests/pytest/refs/CounterAlg.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/CounterAlg.yaml
@@ -14,7 +14,6 @@ stdout: |-
   CounterAlg           INFO Suppressing message: 'Super nice message, max 5 times'
   CounterAlg           INFO Number of counters : 18
   ApplicationMgr       INFO Application Manager Stopped successfully
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   ApplicationMgr       INFO Application Manager Finalized successfully
   ApplicationMgr       INFO Application Manager Terminated successfully
 histos: {}
diff --git a/GaudiTestSuite/tests/pytest/refs/DataOnDemand.yaml b/GaudiTestSuite/tests/pytest/refs/DataOnDemand.yaml
index c30f0f3fa9ce45f62d2afbfb6d927459148f9a1e..7bd5d51a79da623f05713aebd715f9bbb1c594f2 100644
--- a/GaudiTestSuite/tests/pytest/refs/DataOnDemand.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/DataOnDemand.yaml
@@ -57,7 +57,6 @@ stdout: |-
   MuonDigits           INFO finalizing....
   MuonFoos             INFO finalizing....
   MyDataAlgorithm      INFO finalizing....
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   DataOnDemandSvc      INFO Handled "DataFault" incidents: 20/20/40(Alg/Node/Total).
   ApplicationMgr       INFO Application Manager Finalized successfully
   ApplicationMgr       INFO Application Manager Terminated successfully
diff --git a/GaudiTestSuite/tests/pytest/refs/DataOnDemandDyn.yaml b/GaudiTestSuite/tests/pytest/refs/DataOnDemandDyn.yaml
index 4b0c9ec26be51bdc3da14d26ee3a2f3c8e922044..fcd421e9ef755c563c1af7a58de78ae9fd3d8d35 100644
--- a/GaudiTestSuite/tests/pytest/refs/DataOnDemandDyn.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/DataOnDemandDyn.yaml
@@ -55,7 +55,6 @@ stdout: |-
   MuonDigits           INFO finalizing....
   MuonFoos             INFO finalizing....
   MyDataAlgorithm      INFO finalizing....
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   DataOnDemandSvc      INFO Handled "DataFault" incidents: 20/20/40(Alg/Node/Total).
   ToolSvc              INFO Removing all tools created by ToolSvc
   ApplicationMgr       INFO Application Manager Finalized successfully
diff --git a/GaudiTestSuite/tests/pytest/refs/FSMCallbackTest.yaml b/GaudiTestSuite/tests/pytest/refs/FSMCallbackTest.yaml
index af3edf844d8293949afc71e8cbdbe37bd6034631..d20f89b339100fd8cbc7af6968cada310eefa820 100644
--- a/GaudiTestSuite/tests/pytest/refs/FSMCallbackTest.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/FSMCallbackTest.yaml
@@ -17,7 +17,6 @@ stdout: |-
   Callback properly called at STOP
   ApplicationMgr       INFO Application Manager Stopped successfully
   Callback properly called at FINALIZE
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   ApplicationMgr       INFO Application Manager Finalized successfully
   ApplicationMgr       INFO Application Manager Terminated successfully
 histos: {}
diff --git a/GaudiTestSuite/tests/pytest/refs/History.winxp.yaml b/GaudiTestSuite/tests/pytest/refs/History.winxp.yaml
deleted file mode 100644
index 3f87ad8960c702d93364d25782f2a2083e980f69..0000000000000000000000000000000000000000
--- a/GaudiTestSuite/tests/pytest/refs/History.winxp.yaml
+++ /dev/null
@@ -1,157 +0,0 @@
-stdout: |
-  JobOptionsSvc        INFO
-  //GP:================================================================================
-  //GP: include "D:\Profiles\clemenci\cmtuser\Gaudi\GaudiTestSuite\options\History.opts" (0,0)
-  //GP: include "D:\Profiles\clemenci\cmtuser\Gaudi\GaudiTestSuite\options\Common.opts" (5,10)
-  //GP: include "D:\Profiles\clemenci\cmtuser\Gaudi\GaudiTestSuite\options\Services.opts" (7,10)
-  AuditorSvc.Auditors =  [ "ChronoAuditor" ] ;                            //GP: (1,1)
-  //GP: end  "D:\Profiles\clemenci\cmtuser\Gaudi\GaudiTestSuite\options\Services.opts" (24,1)
-  ApplicationMgr.StatusCodeCheck = 1;                                     //GP: (7,10)
-  //GP: end  "D:\Profiles\clemenci\cmtuser\Gaudi\GaudiTestSuite\options\Common.opts" (16,1)
-  ApplicationMgr.TopAlg =  [ "History" ] ;                                //GP: (5,10)
-  ApplicationMgr.ActivateHistory = 1;                                     //GP: (5,10)
-  MessageSvc.OutputLevel = 1;                                             //GP: (5,10)
-  MessageSvc.useColors = 1;                                               //GP: (5,10)
-  MessageSvc.setVerbose +=  [ "HistorySvc" ] ;                            //GP: (5,10)
-  MessageSvc.setDebug +=  [ "FastHistorySvc" ] ;                          //GP: (5,10)
-  MessageSvc.setDebug +=  [ "StatusCodeSvc" , "IncidentSvc" ] ;           //GP: (5,10)
-  HistorySvc.Dump = 0;                                                    //GP: (5,10)
-  HistorySvc.OutputFile = "history.dat";                                  //GP: (5,10)
-  HistorySvc.OutputLevel = 0;                                             //GP: (5,10)
-  FastHistorySvc.Dump = 1;                                                //GP: (5,10)
-  FastHistorySvc.OutputFile = "history.dat";                              //GP: (5,10)
-  ApplicationMgr.EvtMax = 2;                                              //GP: (5,10)
-  ApplicationMgr.EvtSel = "NONE";                                         //GP: (5,10)
-  //GP: end  "D:\Profiles\clemenci\cmtuser\Gaudi\GaudiTestSuite\options\History.opts" (43,1)
-  //GP:================================================================================
-
-  JobOptionsSvc        INFO Job options successfully read in from D:\Profiles\clemenci\cmtuser\Gaudi\GaudiTestSuite\options\History.opts
-  ApplicationMgr      DEBUG Getting my own properties
-  ApplicationMgr    SUCCESS
-  ====================================================================================================================================
-                                                     Welcome to ApplicationMgr $Revision: 1.77 $
-                                            running on CERNTSLHCB03 on Thu Jan 06 19:08:36 2011
-  ====================================================================================================================================
-  ApplicationMgr       INFO Application Manager Configured successfully
-  ServiceManager      DEBUG Initializing service StatusCodeSvc
-  StatusCodeSvc       DEBUG Service base class initialized successfully
-  StatusCodeSvc        INFO initialize
-  ServiceManager      DEBUG Initializing service AppMgrRunable
-  AppMgrRunable       DEBUG Service base class initialized successfully
-  ServiceManager      DEBUG Initializing service EventLoopMgr
-  EventLoopMgr        DEBUG Service base class initialized successfully
-  IncidentSvc         DEBUG Service base class initialized successfully
-  IncidentSvc         DEBUG Adding [AbortEvent] listener '<unknown>' with priority 0
-  EventLoopMgr        DEBUG Creating Top Algorithm History with name History
-  History           VERBOSE ServiceLocatorHelper::service: found service HistorySvc
-  History              INFO got historySvc: HistorySvc
-  EventDataSvc        DEBUG Service base class initialized successfully
-  EventDataSvc      VERBOSE ServiceLocatorHelper::service: found service IncidentSvc
-  EventPersistenc...  DEBUG Service base class initialized successfully
-  EventLoopMgr      WARNING Unable to locate service "EventSelector"
-  EventLoopMgr      WARNING No events will be processed from external input.
-  HistogramDataSvc    DEBUG Service base class initialized successfully
-  HistogramDataSvc  VERBOSE ServiceLocatorHelper::service: found service IncidentSvc
-  HistogramPersis...  DEBUG  'CnvServices':[ 'RootHistSvc' ]
-  HistogramPersis...  DEBUG Service base class initialized successfully
-  HistogramPersis...WARNING Histograms saving not required.
-  HistogramDataSvc  VERBOSE ServiceLocatorHelper::service: found service HistogramPersistencySvc
-  ServiceManager      DEBUG Initializing service HistorySvc
-  HistorySvc          DEBUG Service base class initialized successfully
-  HistorySvc          DEBUG Initializing HistorySvc
-  AlgContextSvc       DEBUG Service base class initialized successfully
-  AlgContextSvc     VERBOSE ServiceLocatorHelper::service: found service IncidentSvc
-  IncidentSvc         DEBUG Adding [BeginEvent] listener 'AlgContextSvc' with priority 0
-  IncidentSvc         DEBUG Adding [EndEvent] listener 'AlgContextSvc' with priority 0
-  HistorySvc        VERBOSE ServiceLocatorHelper::service: found service AlgContextSvc
-  HistorySvc        VERBOSE ServiceLocatorHelper::service: found service IncidentSvc
-  ToolSvc             DEBUG Service base class initialized successfully
-  IncidentSvc         DEBUG Adding [BeginEvent] listener 'HistorySvc' with priority -2147483648
-  ApplicationMgr       INFO Application Manager Initialized successfully
-  ServiceManager      DEBUG Starting service StatusCodeSvc
-  ServiceManager      DEBUG Starting service AppMgrRunable
-  ServiceManager      DEBUG Starting service IncidentSvc
-  ServiceManager      DEBUG Starting service EventPersistencySvc
-  ServiceManager      DEBUG Starting service EventDataSvc
-  ServiceManager      DEBUG Starting service HistogramPersistencySvc
-  ServiceManager      DEBUG Starting service HistogramDataSvc
-  ServiceManager      DEBUG Starting service AlgContextSvc
-  ServiceManager      DEBUG Starting service ToolSvc
-  ToolSvc             DEBUG START transition for AlgTools
-  ServiceManager      DEBUG Starting service EventLoopMgr
-  ServiceManager      DEBUG Starting service HistorySvc
-  ApplicationMgr       INFO Application Manager Started successfully
-  IncidentSvc       VERBOSE Calling 'AlgContextSvc' for incident [BeginEvent]
-  IncidentSvc       VERBOSE Calling 'HistorySvc' for incident [BeginEvent]
-  HistorySvc        VERBOSE ServiceLocatorHelper::service: found service JobOptionsSvc
-  HistorySvc          DEBUG Registering algorithm: History
-  HistorySvc           INFO Registered 1 Algorithms
-  HistorySvc           INFO Registered 0 AlgTools
-  HistorySvc          DEBUG Registering Service: StatusCodeSvc
-  HistorySvc          DEBUG Registering Service: MessageSvc
-  HistorySvc          DEBUG Registering Service: JobOptionsSvc
-  HistorySvc          DEBUG Registering Service: AppMgrRunable
-  HistorySvc          DEBUG Registering Service: IncidentSvc
-  HistorySvc          DEBUG Registering Service: EventPersistencySvc
-  HistorySvc          DEBUG Registering Service: EventDataSvc
-  HistorySvc          DEBUG Registering Service: HistogramPersistencySvc
-  HistorySvc          DEBUG Registering Service: HistogramDataSvc
-  HistorySvc          DEBUG Registering Service: AlgContextSvc
-  HistorySvc          DEBUG Registering Service: ToolSvc
-  HistorySvc          DEBUG Registering Service: EventLoopMgr
-  HistorySvc          DEBUG Registering Service: HistorySvc
-  HistorySvc           INFO Registered 13 Services
-  IncidentSvc       VERBOSE Calling 'AlgContextSvc' for incident [EndEvent]
-  IncidentSvc       VERBOSE Calling 'AlgContextSvc' for incident [BeginEvent]
-  ServiceManager      DEBUG Stopping service HistorySvc
-  ServiceManager      DEBUG Stopping service EventLoopMgr
-  IncidentSvc       VERBOSE Calling 'AlgContextSvc' for incident [EndEvent]
-  ServiceManager      DEBUG Stopping service ToolSvc
-  ToolSvc             DEBUG STOP transition for AlgTools
-  ServiceManager      DEBUG Stopping service AlgContextSvc
-  ServiceManager      DEBUG Stopping service HistogramDataSvc
-  ServiceManager      DEBUG Stopping service HistogramPersistencySvc
-  ServiceManager      DEBUG Stopping service EventDataSvc
-  ServiceManager      DEBUG Stopping service EventPersistencySvc
-  ServiceManager      DEBUG Stopping service IncidentSvc
-  ServiceManager      DEBUG Stopping service AppMgrRunable
-  ServiceManager      DEBUG Stopping service StatusCodeSvc
-  ApplicationMgr       INFO Application Manager Stopped successfully
-  ServiceManager      DEBUG Finalizing service HistorySvc
-  HistorySvc           INFO Service finalised successfully
-  ServiceManager      DEBUG Finalizing service EventLoopMgr
-  IncidentSvc         DEBUG Removing [AbortEvent] listener '<unknown>'
-  EventLoopMgr         INFO Histograms converted successfully according to request.
-  ServiceManager      DEBUG Finalizing service ToolSvc
-  ToolSvc              INFO Removing all tools created by ToolSvc
-  ToolSvc             DEBUG   Tool List :
-  ToolSvc             DEBUG Deleting 0 finalized tools
-  ServiceManager      DEBUG Finalizing service AlgContextSvc
-  IncidentSvc         DEBUG Removing [EndEvent] listener 'AlgContextSvc'
-  IncidentSvc         DEBUG Removing [BeginEvent] listener 'AlgContextSvc'
-  ServiceManager      DEBUG Finalizing service EventDataSvc
-  ServiceManager      DEBUG Finalizing service EventPersistencySvc
-  ServiceManager      DEBUG Finalizing service IncidentSvc
-  IncidentSvc         DEBUG Incident  timing: Mean(+-rms)/Min/Max:0(+-0)/0/0[ms] Total:0[s]
-  ServiceManager      DEBUG Finalizing service AppMgrRunable
-  ServiceManager      DEBUG Finalizing service HistogramDataSvc
-  ServiceManager      DEBUG Finalizing service HistogramPersistencySvc
-  ServiceManager      DEBUG Finalizing service StatusCodeSvc
-  ServiceManager      DEBUG Service reference count check:
-  ServiceManager      DEBUG ---- StatusCodeSvc (refCount = 3)
-  ServiceManager      DEBUG ---- MessageSvc (refCount = 15)
-  ServiceManager      DEBUG ---- JobOptionsSvc (refCount = 4)
-  ServiceManager      DEBUG ---- HistogramPersistencySvc (refCount = 3)
-  ServiceManager      DEBUG ---- HistogramDataSvc (refCount = 4)
-  ServiceManager      DEBUG ---- AppMgrRunable (refCount = 4)
-  ServiceManager      DEBUG ---- IncidentSvc (refCount = 4)
-  ServiceManager      DEBUG ---- EventPersistencySvc (refCount = 3)
-  ServiceManager      DEBUG ---- EventDataSvc (refCount = 4)
-  ServiceManager      DEBUG ---- AlgContextSvc (refCount = 4)
-  ServiceManager      DEBUG ---- ToolSvc (refCount = 4)
-  ServiceManager      DEBUG ---- EventLoopMgr (refCount = 4)
-  ServiceManager      DEBUG ---- HistorySvc (refCount = 4)
-  ApplicationMgr       INFO Application Manager Finalized successfully
-  ApplicationMgr       INFO Application Manager Terminated successfully
-histos: {}
-ttrees: {}
diff --git a/GaudiTestSuite/tests/pytest/refs/History.yaml b/GaudiTestSuite/tests/pytest/refs/History.yaml
index 02828f6683ea024cf85882695fa4adf97882ca8d..db78b4417f89130d178aae276825bb699bbae94b 100644
--- a/GaudiTestSuite/tests/pytest/refs/History.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/History.yaml
@@ -15,12 +15,10 @@ stdout: "JobOptionsSvc        INFO Job options successfully file History.opts\nA
   \     DEBUG preInit: will add Alg History later\e[m\nHistory             DEBUG input\
   \ handles: 0\e[m\nHistory             DEBUG output handles: 0\e[m\n\e[93;1mEventLoopMgr\
   \      WARNING Unable to locate service \"EventSelector\" \e[m\n\e[93;1mEventLoopMgr\
-  \      WARNING No events will be processed from external input.\e[m\nHistogramDataSvc\
-  \  VERBOSE ServiceLocatorHelper::service: found service IncidentSvc\e[m\nHistogramDataSvc\
-  \  VERBOSE ServiceLocatorHelper::service: found service HistogramPersistencySvc\e\
-  [m\nServiceManager      DEBUG Initializing service HistorySvc\e[m\nHistorySvc  \
-  \        DEBUG Initializing HistorySvc\e[m\nAlgContextSvc     VERBOSE ServiceLocatorHelper::service:\
-  \ found service IncidentSvc\e[m\nHistorySvc.AlgC...VERBOSE ServiceLocatorHelper::service:\
+  \      WARNING No events will be processed from external input.\e[m\nServiceManager\
+  \      DEBUG Initializing service HistorySvc\e[m\nHistorySvc          DEBUG Initializing\
+  \ HistorySvc\e[m\nAlgContextSvc     VERBOSE ServiceLocatorHelper::service: found\
+  \ service IncidentSvc\e[m\nHistorySvc.AlgC...VERBOSE ServiceLocatorHelper::service:\
   \ found service AlgContextSvc\e[m\nHistorySvc        VERBOSE ServiceLocatorHelper::service:\
   \ found service IncidentSvc\e[m\nApplicationMgr       INFO Application Manager Initialized\
   \ successfully\e[m\nServiceManager      DEBUG Starting service AppMgrRunable\e[m\n\
@@ -28,30 +26,26 @@ stdout: "JobOptionsSvc        INFO Job options successfully file History.opts\nA
   \ DEBUG Starting service EventPersistencySvc\e[m\nServiceManager      DEBUG Starting\
   \ service EventDataSvc\e[m\nServiceManager      DEBUG Starting service TimelineSvc\e\
   [m\nServiceManager      DEBUG Starting service AlgExecStateSvc\e[m\nServiceManager\
-  \      DEBUG Starting service HistogramPersistencySvc\e[m\nServiceManager      DEBUG\
-  \ Starting service HistogramDataSvc\e[m\nServiceManager      DEBUG Starting service\
-  \ AlgContextSvc\e[m\nServiceManager      DEBUG Starting service ToolSvc\e[m\nToolSvc\
-  \             DEBUG START transition for AlgTools\e[m\nServiceManager      DEBUG\
-  \ Starting service EventLoopMgr\e[m\nServiceManager      DEBUG Starting service\
-  \ HistorySvc\e[m\nApplicationMgr       INFO Application Manager Started successfully\e\
-  [m\nHistorySvc          DEBUG Registering algorithm: \e[96;1mHistory\e[m\nHistorySvc\
-  \           INFO \e[mRegistered 1 Algorithms\e[m\nHistorySvc           INFO Registered\
-  \ 0 AlgTools\e[m\nHistorySvc          DEBUG Registering Service: \e[96;1mMessageSvc\e\
-  [m\nHistorySvc          DEBUG \e[mRegistering Service: \e[96;1mJobOptionsSvc\e[m\n\
-  HistorySvc          DEBUG \e[mRegistering Service: \e[96;1mAppMgrRunable\e[m\nHistorySvc\
-  \          DEBUG \e[mRegistering Service: \e[96;1mIncidentSvc\e[m\nHistorySvc  \
-  \        DEBUG \e[mRegistering Service: \e[96;1mEventPersistencySvc\e[m\nHistorySvc\
-  \          DEBUG \e[mRegistering Service: \e[96;1mEventDataSvc\e[m\nHistorySvc \
-  \         DEBUG \e[mRegistering Service: \e[96;1mTimelineSvc\e[m\nHistorySvc   \
-  \       DEBUG \e[mRegistering Service: \e[96;1mAlgExecStateSvc\e[m\nHistorySvc \
-  \         DEBUG \e[mRegistering Service: \e[96;1mHistogramPersistencySvc\e[m\nHistorySvc\
-  \          DEBUG \e[mRegistering Service: \e[96;1mHistogramDataSvc\e[m\nHistorySvc\
-  \          DEBUG \e[mRegistering Service: \e[96;1mAlgContextSvc\e[m\nHistorySvc\
-  \          DEBUG \e[mRegistering Service: \e[96;1mToolSvc\e[m\nHistorySvc      \
-  \    DEBUG \e[mRegistering Service: \e[96;1mEventLoopMgr\e[m\nHistorySvc       \
-  \   DEBUG \e[mRegistering Service: \e[96;1mHistorySvc\e[m\nHistorySvc          \
-  \ INFO \e[mRegistered 14 Services\e[m\nAlgExecStateSvc   VERBOSE reset(0)\e[m\n\
-  AlgExecStateSvc     DEBUG resizing state containers to : 1\e[m\nAlgExecStateSvc\
+  \      DEBUG Starting service AlgContextSvc\e[m\nServiceManager      DEBUG Starting\
+  \ service ToolSvc\e[m\nToolSvc             DEBUG START transition for AlgTools\e\
+  [m\nServiceManager      DEBUG Starting service EventLoopMgr\e[m\nServiceManager\
+  \      DEBUG Starting service HistorySvc\e[m\nApplicationMgr       INFO Application\
+  \ Manager Started successfully\e[m\nHistorySvc          DEBUG Registering algorithm:\
+  \ \e[96;1mHistory\e[m\nHistorySvc           INFO \e[mRegistered 1 Algorithms\e[m\n\
+  HistorySvc           INFO Registered 0 AlgTools\e[m\nHistorySvc          DEBUG Registering\
+  \ Service: \e[96;1mMessageSvc\e[m\nHistorySvc          DEBUG \e[mRegistering Service:\
+  \ \e[96;1mJobOptionsSvc\e[m\nHistorySvc          DEBUG \e[mRegistering Service:\
+  \ \e[96;1mAppMgrRunable\e[m\nHistorySvc          DEBUG \e[mRegistering Service:\
+  \ \e[96;1mIncidentSvc\e[m\nHistorySvc          DEBUG \e[mRegistering Service: \e\
+  [96;1mEventPersistencySvc\e[m\nHistorySvc          DEBUG \e[mRegistering Service:\
+  \ \e[96;1mEventDataSvc\e[m\nHistorySvc          DEBUG \e[mRegistering Service: \e\
+  [96;1mTimelineSvc\e[m\nHistorySvc          DEBUG \e[mRegistering Service: \e[96;1mAlgExecStateSvc\e\
+  [m\nHistorySvc          DEBUG \e[mRegistering Service: \e[96;1mAlgContextSvc\e[m\n\
+  HistorySvc          DEBUG \e[mRegistering Service: \e[96;1mToolSvc\e[m\nHistorySvc\
+  \          DEBUG \e[mRegistering Service: \e[96;1mEventLoopMgr\e[m\nHistorySvc \
+  \         DEBUG \e[mRegistering Service: \e[96;1mHistorySvc\e[m\nHistorySvc    \
+  \       INFO \e[mRegistered 12 Services\e[m\nAlgExecStateSvc   VERBOSE reset(0)\e\
+  [m\nAlgExecStateSvc     DEBUG resizing state containers to : 1\e[m\nAlgExecStateSvc\
   \     DEBUG adding alg History to 1 slots\e[m\nAlgExecStateSvc   VERBOSE dumping\
   \ state:\n  [slot: 0, incident: Invalid]:\n  + History  e: n\n\e[m\nAlgExecStateSvc\
   \   VERBOSE reset(0)\e[m\nServiceManager      DEBUG Stopping service HistorySvc\e\
@@ -59,41 +53,33 @@ stdout: "JobOptionsSvc        INFO Job options successfully file History.opts\nA
   \ AlgExecStateSvc is Service\e[m\nHistorySvc        VERBOSE AppMgrRunable is Service\e\
   [m\nHistorySvc        VERBOSE EventDataSvc is Service\e[m\nHistorySvc        VERBOSE\
   \ EventLoopMgr is Service\e[m\nHistorySvc        VERBOSE EventPersistencySvc is\
-  \ Service\e[m\nHistorySvc        VERBOSE HistogramDataSvc is Service\e[m\nHistorySvc\
-  \        VERBOSE HistogramPersistencySvc is Service\e[m\nHistorySvc        VERBOSE\
-  \ HistorySvc is Service\e[m\nHistorySvc        VERBOSE IncidentSvc is Service\e\
-  [m\nHistorySvc        VERBOSE JobOptionsSvc is Service\e[m\nHistorySvc        VERBOSE\
-  \ MessageSvc is Service\e[m\nHistorySvc        VERBOSE TimelineSvc is Service\e\
-  [m\nHistorySvc        VERBOSE ToolSvc is Service\e[m\nHistorySvc        VERBOSE\
-  \ History is Alg\e[m\nServiceManager      DEBUG Stopping service EventLoopMgr\e\
-  [m\nServiceManager      DEBUG Stopping service ToolSvc\e[m\nToolSvc            \
-  \ DEBUG STOP transition for AlgTools\e[m\nServiceManager      DEBUG Stopping service\
-  \ AlgContextSvc\e[m\nServiceManager      DEBUG Stopping service HistogramDataSvc\e\
-  [m\nServiceManager      DEBUG Stopping service HistogramPersistencySvc\e[m\nServiceManager\
-  \      DEBUG Stopping service AlgExecStateSvc\e[m\nServiceManager      DEBUG Stopping\
-  \ service TimelineSvc\e[m\nServiceManager      DEBUG Stopping service EventDataSvc\e\
-  [m\nServiceManager      DEBUG Stopping service EventPersistencySvc\e[m\nServiceManager\
-  \      DEBUG Stopping service IncidentSvc\e[m\nServiceManager      DEBUG Stopping\
-  \ service AppMgrRunable\e[m\nApplicationMgr       INFO Application Manager Stopped\
-  \ successfully\e[m\nServiceManager      DEBUG Finalizing service EventLoopMgr\e\
-  [m\nEventLoopMgr         INFO Histograms converted successfully according to request.\e\
-  [m\nServiceManager      DEBUG Finalizing service ToolSvc\e[m\nToolSvc          \
-  \    INFO Removing all tools created by ToolSvc\e[m\nToolSvc             DEBUG \
-  \  Tool List : \e[m\nToolSvc             DEBUG Deleting 0 finalized tools\e[m\n\
-  ServiceManager      DEBUG Finalizing service AlgContextSvc\e[m\nServiceManager \
-  \     DEBUG Finalizing service AlgExecStateSvc\e[m\nServiceManager      DEBUG Finalizing\
-  \ service TimelineSvc\e[m\nServiceManager      DEBUG Finalizing service EventDataSvc\e\
-  [m\nServiceManager      DEBUG Finalizing service EventPersistencySvc\e[m\nServiceManager\
-  \      DEBUG Finalizing service IncidentSvc\e[m\nServiceManager      DEBUG Finalizing\
-  \ service AppMgrRunable\e[m\nServiceManager      DEBUG Finalizing service HistogramDataSvc\e\
-  [m\nServiceManager      DEBUG Finalizing service HistogramPersistencySvc\e[m\nServiceManager\
-  \      DEBUG Finalizing service HistorySvc\e[m\nHistorySvc        VERBOSE HistorySvc::finalize()\e\
-  [m\nHistorySvc           INFO Service finalised successfully\e[m\nServiceManager\
-  \      DEBUG Looping over all active services...\e[m\nServiceManager      DEBUG\
-  \ ---- MessageSvc (refCount = 21)\e[m\nServiceManager      DEBUG ---- JobOptionsSvc\
-  \ (refCount = 3)\e[m\nServiceManager      DEBUG ---- HistorySvc (refCount = 3)\e\
-  [m\nServiceManager      DEBUG ---- HistogramPersistencySvc (refCount = 3)\e[m\n\
-  ServiceManager      DEBUG ---- HistogramDataSvc (refCount = 4)\e[m\nServiceManager\
+  \ Service\e[m\nHistorySvc        VERBOSE HistorySvc is Service\e[m\nHistorySvc \
+  \       VERBOSE IncidentSvc is Service\e[m\nHistorySvc        VERBOSE JobOptionsSvc\
+  \ is Service\e[m\nHistorySvc        VERBOSE MessageSvc is Service\e[m\nHistorySvc\
+  \        VERBOSE TimelineSvc is Service\e[m\nHistorySvc        VERBOSE ToolSvc is\
+  \ Service\e[m\nHistorySvc        VERBOSE History is Alg\e[m\nServiceManager    \
+  \  DEBUG Stopping service EventLoopMgr\e[m\nServiceManager      DEBUG Stopping service\
+  \ ToolSvc\e[m\nToolSvc             DEBUG STOP transition for AlgTools\e[m\nServiceManager\
+  \      DEBUG Stopping service AlgContextSvc\e[m\nServiceManager      DEBUG Stopping\
+  \ service AlgExecStateSvc\e[m\nServiceManager      DEBUG Stopping service TimelineSvc\e\
+  [m\nServiceManager      DEBUG Stopping service EventDataSvc\e[m\nServiceManager\
+  \      DEBUG Stopping service EventPersistencySvc\e[m\nServiceManager      DEBUG\
+  \ Stopping service IncidentSvc\e[m\nServiceManager      DEBUG Stopping service AppMgrRunable\e\
+  [m\nApplicationMgr       INFO Application Manager Stopped successfully\e[m\nServiceManager\
+  \      DEBUG Finalizing service EventLoopMgr\e[m\nServiceManager      DEBUG Finalizing\
+  \ service ToolSvc\e[m\nToolSvc              INFO Removing all tools created by ToolSvc\e\
+  [m\nToolSvc             DEBUG   Tool List : \e[m\nToolSvc             DEBUG Deleting\
+  \ 0 finalized tools\e[m\nServiceManager      DEBUG Finalizing service AlgContextSvc\e\
+  [m\nServiceManager      DEBUG Finalizing service AlgExecStateSvc\e[m\nServiceManager\
+  \      DEBUG Finalizing service TimelineSvc\e[m\nServiceManager      DEBUG Finalizing\
+  \ service EventDataSvc\e[m\nServiceManager      DEBUG Finalizing service EventPersistencySvc\e\
+  [m\nServiceManager      DEBUG Finalizing service IncidentSvc\e[m\nServiceManager\
+  \      DEBUG Finalizing service AppMgrRunable\e[m\nServiceManager      DEBUG Finalizing\
+  \ service HistorySvc\e[m\nHistorySvc        VERBOSE HistorySvc::finalize()\e[m\n\
+  HistorySvc           INFO Service finalised successfully\e[m\nServiceManager   \
+  \   DEBUG Looping over all active services...\e[m\nServiceManager      DEBUG ----\
+  \ MessageSvc (refCount = 19)\e[m\nServiceManager      DEBUG ---- JobOptionsSvc (refCount\
+  \ = 3)\e[m\nServiceManager      DEBUG ---- HistorySvc (refCount = 3)\e[m\nServiceManager\
   \      DEBUG ---- AppMgrRunable (refCount = 4)\e[m\nServiceManager      DEBUG ----\
   \ IncidentSvc (refCount = 3)\e[m\nServiceManager      DEBUG ---- EventPersistencySvc\
   \ (refCount = 3)\e[m\nServiceManager      DEBUG ---- EventDataSvc (refCount = 4)\e\
diff --git a/GaudiTestSuite/tests/pytest/refs/IncidentSvc.yaml b/GaudiTestSuite/tests/pytest/refs/IncidentSvc.yaml
index 169d719a127574283afebc3ba4211dac94641be2..ee538e540831e35bff8658e35585ab7444d817c7 100644
--- a/GaudiTestSuite/tests/pytest/refs/IncidentSvc.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/IncidentSvc.yaml
@@ -66,7 +66,6 @@ stdout: |-
   Generic Listener     INFO Handling incident 'EndEvent'
   ApplicationMgr       INFO Application Manager Stopped successfully
   IncidentListene...   INFO Finalize
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   ApplicationMgr       INFO Application Manager Finalized successfully
   ApplicationMgr       INFO Application Manager Terminated successfully
 histos: {}
diff --git a/GaudiTestSuite/tests/pytest/refs/JSONSink.yaml b/GaudiTestSuite/tests/pytest/refs/JSONSink.yaml
index 6567492aca174fd97bc224e8e5823499a8401d86..08be33f9d995fcd792541ed8b84928e3efda2fb1 100644
--- a/GaudiTestSuite/tests/pytest/refs/JSONSink.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/JSONSink.yaml
@@ -15,7 +15,6 @@ stdout: |-
   Gaudi::Monitori...   INFO Writing JSON file CounterAlg.json
   CounterAlg           INFO Number of counters : 18
   ApplicationMgr       INFO Application Manager Stopped successfully
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   ApplicationMgr       INFO Application Manager Finalized successfully
   ApplicationMgr       INFO Application Manager Terminated successfully
 histos: {}
diff --git a/GaudiTestSuite/tests/pytest/refs/Maps.gcc52.yaml b/GaudiTestSuite/tests/pytest/refs/Maps.gcc52.yaml
deleted file mode 100644
index fb0dfab0c853f9d05fc92e565cfd8dccbd446185..0000000000000000000000000000000000000000
--- a/GaudiTestSuite/tests/pytest/refs/Maps.gcc52.yaml
+++ /dev/null
@@ -1,297 +0,0 @@
-stdout: "JobOptionsSvc        INFO # =======> /home/marco/Devel/LHCb/workspace/Gaudi/GaudiTestSuite/options/Maps.opts\n\
-  JobOptionsSvc        INFO # (16,1): ApplicationMgr.ExtSvc += [\"RndmGenSvc\"]\n\
-  JobOptionsSvc        INFO # (17,1): ApplicationMgr.TopAlg = [\"MapAlg/Map\"]\nJobOptionsSvc\
-  \        INFO # (20,1): MessageSvc.OutputLevel = 3\nJobOptionsSvc        INFO #\
-  \ (22,1): ApplicationMgr.EvtMax = 10\nJobOptionsSvc        INFO # (23,1): ApplicationMgr.EvtSel\
-  \ = \"NONE\"\nJobOptionsSvc        INFO Job options successfully read in from /home/marco/Devel/LHCb/workspace/Gaudi/GaudiTestSuite/options/Maps.opts\n\
-  ApplicationMgr    SUCCESS\n====================================================================================================================================\n\
-  \                                                   Welcome to ApplicationMgr (GaudiCoreSvc\
-  \ v3r6)\n                                          running on pcphlbc16 on Wed Nov\
-  \ 11 12:10:10 2015\n====================================================================================================================================\n\
-  ApplicationMgr       INFO Application Manager Configured successfully\nRndmGenSvc.Engine\
-  \    INFO Generator engine type:CLHEP::RanluxEngine\nRndmGenSvc.Engine    INFO Current\
-  \ Seed:1234567 Luxury:3\nRndmGenSvc           INFO Using Random engine:HepRndm::Engine<CLHEP::RanluxEngine>\n\
-  EventLoopMgr      WARNING Unable to locate service \"EventSelector\"\nEventLoopMgr\
-  \      WARNING No events will be processed from external input.\nHistogramPersis...WARNING\
-  \ Histograms saving not required.\nApplicationMgr       INFO Application Manager\
-  \ Initialized successfully\nApplicationMgr       INFO Application Manager Started\
-  \ successfully\nMap               SUCCESS  Inserting key -2 1st:  True True True\
-  \ True\nMap               SUCCESS 1 Map1: { -2 : -1.5600000 }\nMap             \
-  \  SUCCESS 1 Map2: { -2 : -1.5600000 }\nMap               SUCCESS 1 Map3: { -2 :\
-  \ -1.5600000 }\nMap               SUCCESS 1 Map4: { -2 : -1.5600000 }\nMap     \
-  \          SUCCESS      CONST:   map2['1']: 0, map3['1']: 0, map4['1']: 0\nMap \
-  \              SUCCESS 2 Map1: { -2 : -1.5600000 }\nMap               SUCCESS 2\
-  \ Map2: { -2 : -1.5600000 }\nMap               SUCCESS 2 Map3: { -2 : -1.5600000\
-  \ }\nMap               SUCCESS 2 Map4: { -2 : -1.5600000 }\nMap               SUCCESS\
-  \  NON-CONST:   map1['7']: 0, map2['7']: 0, map3['7']: 0, map4['7']: 0\nMap    \
-  \           SUCCESS 3 Map1: { -2 : -1.5600000 , 7 : 0.0000000 }\nMap           \
-  \    SUCCESS 3 Map2: { -2 : -1.5600000 }\nMap               SUCCESS 3 Map3: { -2\
-  \ : -1.5600000 , 7 : 0.0000000 }\nMap               SUCCESS 3 Map4: { 7 : 0.0000000\
-  \ , -2 : -1.5600000 }\nMap               SUCCESS  Inserting key -2 2nd:  False False\
-  \ False False\nMap               SUCCESS 4 Map1: { -2 : -1.5600000 , 7 : 0.0000000\
-  \ }\nMap               SUCCESS 4 Map2: { -2 : -1.5600000 }\nMap               SUCCESS\
-  \ 4 Map3: { -2 : -1.5600000 , 7 : 0.0000000 }\nMap               SUCCESS 4 Map4:\
-  \ { 7 : 0.0000000 , -2 : -1.5600000 }\nMap               SUCCESS  Erased :  True\
-  \ True True True\nMap               SUCCESS 5 Map1: { 7 : 0.0000000 }\nMap     \
-  \          SUCCESS 5 Map2: {  }\nMap               SUCCESS 5 Map3: { 7 : 0.0000000\
-  \ }\nMap               SUCCESS 5 Map4: { 7 : 0.0000000 }\nMap               SUCCESS\
-  \  Count key    0 :  0 0 0 0\nMap               SUCCESS  Count key    1 :  0 0 0\
-  \ 0\nMap               SUCCESS  Count key    7 :  1 0 1 1\nMap               SUCCESS\
-  \  Count key -100 :  0 0 0 0\nMap               SUCCESS  Inserting key 8 1st:  True\
-  \ True True True\nMap               SUCCESS 1 Map1: { 7 : 0.0000000 , 8 : 0.40000000\
-  \ }\nMap               SUCCESS 1 Map2: { 8 : 0.40000000 }\nMap               SUCCESS\
-  \ 1 Map3: { 7 : 0.0000000 , 8 : 0.40000000 }\nMap               SUCCESS 1 Map4:\
-  \ { 8 : 0.40000000 , 7 : 0.0000000 }\nMap               SUCCESS      CONST:   map2['1']:\
-  \ 0, map3['1']: 0, map4['1']: 0\nMap               SUCCESS 2 Map1: { 7 : 0.0000000\
-  \ , 8 : 0.40000000 }\nMap               SUCCESS 2 Map2: { 8 : 0.40000000 }\nMap\
-  \               SUCCESS 2 Map3: { 7 : 0.0000000 , 8 : 0.40000000 }\nMap        \
-  \       SUCCESS 2 Map4: { 8 : 0.40000000 , 7 : 0.0000000 }\nMap               SUCCESS\
-  \  NON-CONST:   map1['7']: 0, map2['7']: 0, map3['7']: 0, map4['7']: 0\nMap    \
-  \           SUCCESS 3 Map1: { 7 : 0.0000000 , 8 : 0.40000000 }\nMap            \
-  \   SUCCESS 3 Map2: { 8 : 0.40000000 }\nMap               SUCCESS 3 Map3: { 7 :\
-  \ 0.0000000 , 8 : 0.40000000 }\nMap               SUCCESS 3 Map4: { 8 : 0.40000000\
-  \ , 7 : 0.0000000 }\nMap               SUCCESS  Inserting key 8 2nd:  False False\
-  \ False False\nMap               SUCCESS 4 Map1: { 7 : 0.0000000 , 8 : 0.40000000\
-  \ }\nMap               SUCCESS 4 Map2: { 8 : 0.40000000 }\nMap               SUCCESS\
-  \ 4 Map3: { 7 : 0.0000000 , 8 : 0.40000000 }\nMap               SUCCESS 4 Map4:\
-  \ { 8 : 0.40000000 , 7 : 0.0000000 }\nMap               SUCCESS  Erased :  True\
-  \ True True True\nMap               SUCCESS 5 Map1: { 7 : 0.0000000 }\nMap     \
-  \          SUCCESS 5 Map2: {  }\nMap               SUCCESS 5 Map3: { 7 : 0.0000000\
-  \ }\nMap               SUCCESS 5 Map4: { 7 : 0.0000000 }\nMap               SUCCESS\
-  \  Count key    0 :  0 0 0 0\nMap               SUCCESS  Count key    1 :  0 0 0\
-  \ 0\nMap               SUCCESS  Count key    7 :  1 0 1 1\nMap               SUCCESS\
-  \  Count key -100 :  0 0 0 0\nMap               SUCCESS  Inserting key -12 1st:\
-  \  True True True True\nMap               SUCCESS 1 Map1: { -12 : 0.090000000 ,\
-  \ 7 : 0.0000000 }\nMap               SUCCESS 1 Map2: { -12 : 0.090000000 }\nMap\
-  \               SUCCESS 1 Map3: { -12 : 0.090000000 , 7 : 0.0000000 }\nMap     \
-  \          SUCCESS 1 Map4: { -12 : 0.090000000 , 7 : 0.0000000 }\nMap          \
-  \     SUCCESS      CONST:   map2['1']: 0, map3['1']: 0, map4['1']: 0\nMap      \
-  \         SUCCESS 2 Map1: { -12 : 0.090000000 , 7 : 0.0000000 }\nMap           \
-  \    SUCCESS 2 Map2: { -12 : 0.090000000 }\nMap               SUCCESS 2 Map3: {\
-  \ -12 : 0.090000000 , 7 : 0.0000000 }\nMap               SUCCESS 2 Map4: { -12 :\
-  \ 0.090000000 , 7 : 0.0000000 }\nMap               SUCCESS  NON-CONST:   map1['7']:\
-  \ 0, map2['7']: 0, map3['7']: 0, map4['7']: 0\nMap               SUCCESS 3 Map1:\
-  \ { -12 : 0.090000000 , 7 : 0.0000000 }\nMap               SUCCESS 3 Map2: { -12\
-  \ : 0.090000000 }\nMap               SUCCESS 3 Map3: { -12 : 0.090000000 , 7 : 0.0000000\
-  \ }\nMap               SUCCESS 3 Map4: { -12 : 0.090000000 , 7 : 0.0000000 }\nMap\
-  \               SUCCESS  Inserting key -12 2nd:  False False False False\nMap  \
-  \             SUCCESS 4 Map1: { -12 : 0.090000000 , 7 : 0.0000000 }\nMap       \
-  \        SUCCESS 4 Map2: { -12 : 0.090000000 }\nMap               SUCCESS 4 Map3:\
-  \ { -12 : 0.090000000 , 7 : 0.0000000 }\nMap               SUCCESS 4 Map4: { -12\
-  \ : 0.090000000 , 7 : 0.0000000 }\nMap               SUCCESS  Erased :  True True\
-  \ True True\nMap               SUCCESS 5 Map1: { 7 : 0.0000000 }\nMap          \
-  \     SUCCESS 5 Map2: {  }\nMap               SUCCESS 5 Map3: { 7 : 0.0000000 }\n\
-  Map               SUCCESS 5 Map4: { 7 : 0.0000000 }\nMap               SUCCESS \
-  \ Count key    0 :  0 0 0 0\nMap               SUCCESS  Count key    1 :  0 0 0\
-  \ 0\nMap               SUCCESS  Count key    7 :  1 0 1 1\nMap               SUCCESS\
-  \  Count key -100 :  0 0 0 0\nMap               SUCCESS  Inserting key 0 1st:  True\
-  \ True True True\nMap               SUCCESS 1 Map1: { 0 : -0.27000000 , 7 : 0.0000000\
-  \ }\nMap               SUCCESS 1 Map2: { 0 : -0.27000000 }\nMap               SUCCESS\
-  \ 1 Map3: { 0 : -0.27000000 , 7 : 0.0000000 }\nMap               SUCCESS 1 Map4:\
-  \ { 0 : -0.27000000 , 7 : 0.0000000 }\nMap               SUCCESS      CONST:   map2['1']:\
-  \ 0, map3['1']: 0, map4['1']: 0\nMap               SUCCESS 2 Map1: { 0 : -0.27000000\
-  \ , 7 : 0.0000000 }\nMap               SUCCESS 2 Map2: { 0 : -0.27000000 }\nMap\
-  \               SUCCESS 2 Map3: { 0 : -0.27000000 , 7 : 0.0000000 }\nMap       \
-  \        SUCCESS 2 Map4: { 0 : -0.27000000 , 7 : 0.0000000 }\nMap              \
-  \ SUCCESS  NON-CONST:   map1['7']: 0, map2['7']: 0, map3['7']: 0, map4['7']: 0\n\
-  Map               SUCCESS 3 Map1: { 0 : -0.27000000 , 7 : 0.0000000 }\nMap     \
-  \          SUCCESS 3 Map2: { 0 : -0.27000000 }\nMap               SUCCESS 3 Map3:\
-  \ { 0 : -0.27000000 , 7 : 0.0000000 }\nMap               SUCCESS 3 Map4: { 0 : -0.27000000\
-  \ , 7 : 0.0000000 }\nMap               SUCCESS  Inserting key 0 2nd:  False False\
-  \ False False\nMap               SUCCESS 4 Map1: { 0 : -0.27000000 , 7 : 0.0000000\
-  \ }\nMap               SUCCESS 4 Map2: { 0 : -0.27000000 }\nMap               SUCCESS\
-  \ 4 Map3: { 0 : -0.27000000 , 7 : 0.0000000 }\nMap               SUCCESS 4 Map4:\
-  \ { 0 : -0.27000000 , 7 : 0.0000000 }\nMap               SUCCESS  Erased :  True\
-  \ True True True\nMap               SUCCESS 5 Map1: { 7 : 0.0000000 }\nMap     \
-  \          SUCCESS 5 Map2: {  }\nMap               SUCCESS 5 Map3: { 7 : 0.0000000\
-  \ }\nMap               SUCCESS 5 Map4: { 7 : 0.0000000 }\nMap               SUCCESS\
-  \  Count key    0 :  0 0 0 0\nMap               SUCCESS  Count key    1 :  0 0 0\
-  \ 0\nMap               SUCCESS  Count key    7 :  1 0 1 1\nMap               SUCCESS\
-  \  Count key -100 :  0 0 0 0\nMap               SUCCESS  Inserting key 4 1st:  True\
-  \ True True True\nMap               SUCCESS 1 Map1: { 4 : 1.4300000 , 7 : 0.0000000\
-  \ }\nMap               SUCCESS 1 Map2: { 4 : 1.4300000 }\nMap               SUCCESS\
-  \ 1 Map3: { 4 : 1.4300000 , 7 : 0.0000000 }\nMap               SUCCESS 1 Map4: {\
-  \ 4 : 1.4300000 , 7 : 0.0000000 }\nMap               SUCCESS      CONST:   map2['1']:\
-  \ 0, map3['1']: 0, map4['1']: 0\nMap               SUCCESS 2 Map1: { 4 : 1.4300000\
-  \ , 7 : 0.0000000 }\nMap               SUCCESS 2 Map2: { 4 : 1.4300000 }\nMap  \
-  \             SUCCESS 2 Map3: { 4 : 1.4300000 , 7 : 0.0000000 }\nMap           \
-  \    SUCCESS 2 Map4: { 4 : 1.4300000 , 7 : 0.0000000 }\nMap               SUCCESS\
-  \  NON-CONST:   map1['7']: 0, map2['7']: 0, map3['7']: 0, map4['7']: 0\nMap    \
-  \           SUCCESS 3 Map1: { 4 : 1.4300000 , 7 : 0.0000000 }\nMap             \
-  \  SUCCESS 3 Map2: { 4 : 1.4300000 }\nMap               SUCCESS 3 Map3: { 4 : 1.4300000\
-  \ , 7 : 0.0000000 }\nMap               SUCCESS 3 Map4: { 4 : 1.4300000 , 7 : 0.0000000\
-  \ }\nMap               SUCCESS  Inserting key 4 2nd:  False False False False\n\
-  Map               SUCCESS 4 Map1: { 4 : 1.4300000 , 7 : 0.0000000 }\nMap       \
-  \        SUCCESS 4 Map2: { 4 : 1.4300000 }\nMap               SUCCESS 4 Map3: {\
-  \ 4 : 1.4300000 , 7 : 0.0000000 }\nMap               SUCCESS 4 Map4: { 4 : 1.4300000\
-  \ , 7 : 0.0000000 }\nMap               SUCCESS  Erased :  True True True True\n\
-  Map               SUCCESS 5 Map1: { 7 : 0.0000000 }\nMap               SUCCESS 5\
-  \ Map2: {  }\nMap               SUCCESS 5 Map3: { 7 : 0.0000000 }\nMap         \
-  \      SUCCESS 5 Map4: { 7 : 0.0000000 }\nMap               SUCCESS  Count key \
-  \   0 :  0 0 0 0\nMap               SUCCESS  Count key    1 :  0 0 0 0\nMap    \
-  \           SUCCESS  Count key    7 :  1 0 1 1\nMap               SUCCESS  Count\
-  \ key -100 :  0 0 0 0\nMap               SUCCESS  Inserting key -13 1st:  True True\
-  \ True True\nMap               SUCCESS 1 Map1: { -13 : 2.5800000 , 7 : 0.0000000\
-  \ }\nMap               SUCCESS 1 Map2: { -13 : 2.5800000 }\nMap               SUCCESS\
-  \ 1 Map3: { -13 : 2.5800000 , 7 : 0.0000000 }\nMap               SUCCESS 1 Map4:\
-  \ { -13 : 2.5800000 , 7 : 0.0000000 }\nMap               SUCCESS      CONST:   map2['1']:\
-  \ 0, map3['1']: 0, map4['1']: 0\nMap               SUCCESS 2 Map1: { -13 : 2.5800000\
-  \ , 7 : 0.0000000 }\nMap               SUCCESS 2 Map2: { -13 : 2.5800000 }\nMap\
-  \               SUCCESS 2 Map3: { -13 : 2.5800000 , 7 : 0.0000000 }\nMap       \
-  \        SUCCESS 2 Map4: { -13 : 2.5800000 , 7 : 0.0000000 }\nMap              \
-  \ SUCCESS  NON-CONST:   map1['7']: 0, map2['7']: 0, map3['7']: 0, map4['7']: 0\n\
-  Map               SUCCESS 3 Map1: { -13 : 2.5800000 , 7 : 0.0000000 }\nMap     \
-  \          SUCCESS 3 Map2: { -13 : 2.5800000 }\nMap               SUCCESS 3 Map3:\
-  \ { -13 : 2.5800000 , 7 : 0.0000000 }\nMap               SUCCESS 3 Map4: { -13 :\
-  \ 2.5800000 , 7 : 0.0000000 }\nMap               SUCCESS  Inserting key -13 2nd:\
-  \  False False False False\nMap               SUCCESS 4 Map1: { -13 : 2.5800000\
-  \ , 7 : 0.0000000 }\nMap               SUCCESS 4 Map2: { -13 : 2.5800000 }\nMap\
-  \               SUCCESS 4 Map3: { -13 : 2.5800000 , 7 : 0.0000000 }\nMap       \
-  \        SUCCESS 4 Map4: { -13 : 2.5800000 , 7 : 0.0000000 }\nMap              \
-  \ SUCCESS 5 Map1: { -13 : 2.5800000 , 7 : 0.0000000 }\nMap               SUCCESS\
-  \ 5 Map2: { -13 : 2.5800000 }\nMap               SUCCESS 5 Map3: { -13 : 2.5800000\
-  \ , 7 : 0.0000000 }\nMap               SUCCESS 5 Map4: { -13 : 2.5800000 , 7 : 0.0000000\
-  \ }\nMap               SUCCESS  Count key    0 :  0 0 0 0\nMap               SUCCESS\
-  \  Count key    1 :  0 0 0 0\nMap               SUCCESS  Count key    7 :  1 0 1\
-  \ 1\nMap               SUCCESS  Count key -100 :  0 0 0 0\nMap               SUCCESS\
-  \  Inserting key -1 1st:  True True True True\nMap               SUCCESS 1 Map1:\
-  \ { -13 : 2.5800000 , -1 : -2.1800000 , 7 : 0.0000000 }\nMap               SUCCESS\
-  \ 1 Map2: { -13 : 2.5800000 , -1 : -2.1800000 }\nMap               SUCCESS 1 Map3:\
-  \ { -13 : 2.5800000 , -1 : -2.1800000 , 7 : 0.0000000 }\nMap               SUCCESS\
-  \ 1 Map4: { -1 : -2.1800000 , -13 : 2.5800000 , 7 : 0.0000000 }\nMap           \
-  \    SUCCESS      CONST:   map2['1']: 0, map3['1']: 0, map4['1']: 0\nMap       \
-  \        SUCCESS 2 Map1: { -13 : 2.5800000 , -1 : -2.1800000 , 7 : 0.0000000 }\n\
-  Map               SUCCESS 2 Map2: { -13 : 2.5800000 , -1 : -2.1800000 }\nMap   \
-  \            SUCCESS 2 Map3: { -13 : 2.5800000 , -1 : -2.1800000 , 7 : 0.0000000\
-  \ }\nMap               SUCCESS 2 Map4: { -1 : -2.1800000 , -13 : 2.5800000 , 7 :\
-  \ 0.0000000 }\nMap               SUCCESS  NON-CONST:   map1['7']: 0, map2['7']:\
-  \ 0, map3['7']: 0, map4['7']: 0\nMap               SUCCESS 3 Map1: { -13 : 2.5800000\
-  \ , -1 : -2.1800000 , 7 : 0.0000000 }\nMap               SUCCESS 3 Map2: { -13 :\
-  \ 2.5800000 , -1 : -2.1800000 }\nMap               SUCCESS 3 Map3: { -13 : 2.5800000\
-  \ , -1 : -2.1800000 , 7 : 0.0000000 }\nMap               SUCCESS 3 Map4: { -1 :\
-  \ -2.1800000 , -13 : 2.5800000 , 7 : 0.0000000 }\nMap               SUCCESS  Inserting\
-  \ key -1 2nd:  False False False False\nMap               SUCCESS 4 Map1: { -13\
-  \ : 2.5800000 , -1 : -2.1800000 , 7 : 0.0000000 }\nMap               SUCCESS 4 Map2:\
-  \ { -13 : 2.5800000 , -1 : -2.1800000 }\nMap               SUCCESS 4 Map3: { -13\
-  \ : 2.5800000 , -1 : -2.1800000 , 7 : 0.0000000 }\nMap               SUCCESS 4 Map4:\
-  \ { -1 : -2.1800000 , -13 : 2.5800000 , 7 : 0.0000000 }\nMap               SUCCESS\
-  \ 5 Map1: { -13 : 2.5800000 , -1 : -2.1800000 , 7 : 0.0000000 }\nMap           \
-  \    SUCCESS 5 Map2: { -13 : 2.5800000 , -1 : -2.1800000 }\nMap               SUCCESS\
-  \ 5 Map3: { -13 : 2.5800000 , -1 : -2.1800000 , 7 : 0.0000000 }\nMap           \
-  \    SUCCESS 5 Map4: { -1 : -2.1800000 , -13 : 2.5800000 , 7 : 0.0000000 }\nMap\
-  \               SUCCESS  Count key    0 :  0 0 0 0\nMap               SUCCESS  Count\
-  \ key    1 :  0 0 0 0\nMap               SUCCESS  Count key    7 :  1 0 1 1\nMap\
-  \               SUCCESS  Count key -100 :  0 0 0 0\nMap               SUCCESS  Inserting\
-  \ key 0 1st:  True True True True\nMap               SUCCESS 1 Map1: { -13 : 2.5800000\
-  \ , -1 : -2.1800000 , 0 : -0.87000000 , 7 : 0.0000000 }\nMap               SUCCESS\
-  \ 1 Map2: { -13 : 2.5800000 , -1 : -2.1800000 , 0 : -0.87000000 }\nMap         \
-  \      SUCCESS 1 Map3: { -13 : 2.5800000 , -1 : -2.1800000 , 0 : -0.87000000 , 7\
-  \ : 0.0000000 }\nMap               SUCCESS 1 Map4: { 0 : -0.87000000 , -1 : -2.1800000\
-  \ , -13 : 2.5800000 , 7 : 0.0000000 }\nMap               SUCCESS      CONST:   map2['1']:\
-  \ 0, map3['1']: 0, map4['1']: 0\nMap               SUCCESS 2 Map1: { -13 : 2.5800000\
-  \ , -1 : -2.1800000 , 0 : -0.87000000 , 7 : 0.0000000 }\nMap               SUCCESS\
-  \ 2 Map2: { -13 : 2.5800000 , -1 : -2.1800000 , 0 : -0.87000000 }\nMap         \
-  \      SUCCESS 2 Map3: { -13 : 2.5800000 , -1 : -2.1800000 , 0 : -0.87000000 , 7\
-  \ : 0.0000000 }\nMap               SUCCESS 2 Map4: { 0 : -0.87000000 , -1 : -2.1800000\
-  \ , -13 : 2.5800000 , 7 : 0.0000000 }\nMap               SUCCESS  NON-CONST:   map1['7']:\
-  \ 0, map2['7']: 0, map3['7']: 0, map4['7']: 0\nMap               SUCCESS 3 Map1:\
-  \ { -13 : 2.5800000 , -1 : -2.1800000 , 0 : -0.87000000 , 7 : 0.0000000 }\nMap \
-  \              SUCCESS 3 Map2: { -13 : 2.5800000 , -1 : -2.1800000 , 0 : -0.87000000\
-  \ }\nMap               SUCCESS 3 Map3: { -13 : 2.5800000 , -1 : -2.1800000 , 0 :\
-  \ -0.87000000 , 7 : 0.0000000 }\nMap               SUCCESS 3 Map4: { 0 : -0.87000000\
-  \ , -1 : -2.1800000 , -13 : 2.5800000 , 7 : 0.0000000 }\nMap               SUCCESS\
-  \  Inserting key 0 2nd:  False False False False\nMap               SUCCESS 4 Map1:\
-  \ { -13 : 2.5800000 , -1 : -2.1800000 , 0 : -0.87000000 , 7 : 0.0000000 }\nMap \
-  \              SUCCESS 4 Map2: { -13 : 2.5800000 , -1 : -2.1800000 , 0 : -0.87000000\
-  \ }\nMap               SUCCESS 4 Map3: { -13 : 2.5800000 , -1 : -2.1800000 , 0 :\
-  \ -0.87000000 , 7 : 0.0000000 }\nMap               SUCCESS 4 Map4: { 0 : -0.87000000\
-  \ , -1 : -2.1800000 , -13 : 2.5800000 , 7 : 0.0000000 }\nMap               SUCCESS\
-  \  Erased :  True True True True\nMap               SUCCESS 5 Map1: { -13 : 2.5800000\
-  \ , -1 : -2.1800000 , 7 : 0.0000000 }\nMap               SUCCESS 5 Map2: { -13 :\
-  \ 2.5800000 , -1 : -2.1800000 }\nMap               SUCCESS 5 Map3: { -13 : 2.5800000\
-  \ , -1 : -2.1800000 , 7 : 0.0000000 }\nMap               SUCCESS 5 Map4: { -1 :\
-  \ -2.1800000 , -13 : 2.5800000 , 7 : 0.0000000 }\nMap               SUCCESS  Count\
-  \ key    0 :  0 0 0 0\nMap               SUCCESS  Count key    1 :  0 0 0 0\nMap\
-  \               SUCCESS  Count key    7 :  1 0 1 1\nMap               SUCCESS  Count\
-  \ key -100 :  0 0 0 0\nMap               SUCCESS  Inserting key 15 1st:  True True\
-  \ True True\nMap               SUCCESS 1 Map1: { -13 : 2.5800000 , -1 : -2.1800000\
-  \ , 7 : 0.0000000 , 15 : -0.54000000 }\nMap               SUCCESS 1 Map2: { -13\
-  \ : 2.5800000 , -1 : -2.1800000 , 15 : -0.54000000 }\nMap               SUCCESS\
-  \ 1 Map3: { -13 : 2.5800000 , -1 : -2.1800000 , 7 : 0.0000000 , 15 : -0.54000000\
-  \ }\nMap               SUCCESS 1 Map4: { 15 : -0.54000000 , -1 : -2.1800000 , -13\
-  \ : 2.5800000 , 7 : 0.0000000 }\nMap               SUCCESS      CONST:   map2['1']:\
-  \ 0, map3['1']: 0, map4['1']: 0\nMap               SUCCESS 2 Map1: { -13 : 2.5800000\
-  \ , -1 : -2.1800000 , 7 : 0.0000000 , 15 : -0.54000000 }\nMap               SUCCESS\
-  \ 2 Map2: { -13 : 2.5800000 , -1 : -2.1800000 , 15 : -0.54000000 }\nMap        \
-  \       SUCCESS 2 Map3: { -13 : 2.5800000 , -1 : -2.1800000 , 7 : 0.0000000 , 15\
-  \ : -0.54000000 }\nMap               SUCCESS 2 Map4: { 15 : -0.54000000 , -1 : -2.1800000\
-  \ , -13 : 2.5800000 , 7 : 0.0000000 }\nMap               SUCCESS  NON-CONST:   map1['7']:\
-  \ 0, map2['7']: 0, map3['7']: 0, map4['7']: 0\nMap               SUCCESS 3 Map1:\
-  \ { -13 : 2.5800000 , -1 : -2.1800000 , 7 : 0.0000000 , 15 : -0.54000000 }\nMap\
-  \               SUCCESS 3 Map2: { -13 : 2.5800000 , -1 : -2.1800000 , 15 : -0.54000000\
-  \ }\nMap               SUCCESS 3 Map3: { -13 : 2.5800000 , -1 : -2.1800000 , 7 :\
-  \ 0.0000000 , 15 : -0.54000000 }\nMap               SUCCESS 3 Map4: { 15 : -0.54000000\
-  \ , -1 : -2.1800000 , -13 : 2.5800000 , 7 : 0.0000000 }\nMap               SUCCESS\
-  \  Inserting key 15 2nd:  False False False False\nMap               SUCCESS 4 Map1:\
-  \ { -13 : 2.5800000 , -1 : -2.1800000 , 7 : 0.0000000 , 15 : -0.54000000 }\nMap\
-  \               SUCCESS 4 Map2: { -13 : 2.5800000 , -1 : -2.1800000 , 15 : -0.54000000\
-  \ }\nMap               SUCCESS 4 Map3: { -13 : 2.5800000 , -1 : -2.1800000 , 7 :\
-  \ 0.0000000 , 15 : -0.54000000 }\nMap               SUCCESS 4 Map4: { 15 : -0.54000000\
-  \ , -1 : -2.1800000 , -13 : 2.5800000 , 7 : 0.0000000 }\nMap               SUCCESS\
-  \ 5 Map1: { -13 : 2.5800000 , -1 : -2.1800000 , 7 : 0.0000000 , 15 : -0.54000000\
-  \ }\nMap               SUCCESS 5 Map2: { -13 : 2.5800000 , -1 : -2.1800000 , 15\
-  \ : -0.54000000 }\nMap               SUCCESS 5 Map3: { -13 : 2.5800000 , -1 : -2.1800000\
-  \ , 7 : 0.0000000 , 15 : -0.54000000 }\nMap               SUCCESS 5 Map4: { 15 :\
-  \ -0.54000000 , -1 : -2.1800000 , -13 : 2.5800000 , 7 : 0.0000000 }\nMap       \
-  \        SUCCESS  Count key    0 :  0 0 0 0\nMap               SUCCESS  Count key\
-  \    1 :  0 0 0 0\nMap               SUCCESS  Count key    7 :  1 0 1 1\nMap   \
-  \            SUCCESS  Count key -100 :  0 0 0 0\nMap               SUCCESS  Inserting\
-  \ key -22 1st:  True True True True\nMap               SUCCESS 1 Map1: { -22 : 0.090000000\
-  \ , -13 : 2.5800000 , -1 : -2.1800000 , 7 : 0.0000000 , 15 : -0.54000000 }\nMap\
-  \               SUCCESS 1 Map2: { -22 : 0.090000000 , -13 : 2.5800000 , -1 : -2.1800000\
-  \ , 15 : -0.54000000 }\nMap               SUCCESS 1 Map3: { -22 : 0.090000000 ,\
-  \ -13 : 2.5800000 , -1 : -2.1800000 , 7 : 0.0000000 , 15 : -0.54000000 }\nMap  \
-  \             SUCCESS 1 Map4: { -22 : 0.090000000 , 7 : 0.0000000 , -13 : 2.5800000\
-  \ , -1 : -2.1800000 , 15 : -0.54000000 }\nMap               SUCCESS      CONST:\
-  \   map2['1']: 0, map3['1']: 0, map4['1']: 0\nMap               SUCCESS 2 Map1:\
-  \ { -22 : 0.090000000 , -13 : 2.5800000 , -1 : -2.1800000 , 7 : 0.0000000 , 15 :\
-  \ -0.54000000 }\nMap               SUCCESS 2 Map2: { -22 : 0.090000000 , -13 : 2.5800000\
-  \ , -1 : -2.1800000 , 15 : -0.54000000 }\nMap               SUCCESS 2 Map3: { -22\
-  \ : 0.090000000 , -13 : 2.5800000 , -1 : -2.1800000 , 7 : 0.0000000 , 15 : -0.54000000\
-  \ }\nMap               SUCCESS 2 Map4: { -22 : 0.090000000 , 7 : 0.0000000 , -13\
-  \ : 2.5800000 , -1 : -2.1800000 , 15 : -0.54000000 }\nMap               SUCCESS\
-  \  NON-CONST:   map1['7']: 0, map2['7']: 0, map3['7']: 0, map4['7']: 0\nMap    \
-  \           SUCCESS 3 Map1: { -22 : 0.090000000 , -13 : 2.5800000 , -1 : -2.1800000\
-  \ , 7 : 0.0000000 , 15 : -0.54000000 }\nMap               SUCCESS 3 Map2: { -22\
-  \ : 0.090000000 , -13 : 2.5800000 , -1 : -2.1800000 , 15 : -0.54000000 }\nMap  \
-  \             SUCCESS 3 Map3: { -22 : 0.090000000 , -13 : 2.5800000 , -1 : -2.1800000\
-  \ , 7 : 0.0000000 , 15 : -0.54000000 }\nMap               SUCCESS 3 Map4: { -22\
-  \ : 0.090000000 , 7 : 0.0000000 , -13 : 2.5800000 , -1 : -2.1800000 , 15 : -0.54000000\
-  \ }\nMap               SUCCESS  Inserting key -22 2nd:  False False False False\n\
-  Map               SUCCESS 4 Map1: { -22 : 0.090000000 , -13 : 2.5800000 , -1 : -2.1800000\
-  \ , 7 : 0.0000000 , 15 : -0.54000000 }\nMap               SUCCESS 4 Map2: { -22\
-  \ : 0.090000000 , -13 : 2.5800000 , -1 : -2.1800000 , 15 : -0.54000000 }\nMap  \
-  \             SUCCESS 4 Map3: { -22 : 0.090000000 , -13 : 2.5800000 , -1 : -2.1800000\
-  \ , 7 : 0.0000000 , 15 : -0.54000000 }\nMap               SUCCESS 4 Map4: { -22\
-  \ : 0.090000000 , 7 : 0.0000000 , -13 : 2.5800000 , -1 : -2.1800000 , 15 : -0.54000000\
-  \ }\nMap               SUCCESS  Erased :  True True True True\nMap             \
-  \  SUCCESS 5 Map1: { -13 : 2.5800000 , -1 : -2.1800000 , 7 : 0.0000000 , 15 : -0.54000000\
-  \ }\nMap               SUCCESS 5 Map2: { -13 : 2.5800000 , -1 : -2.1800000 , 15\
-  \ : -0.54000000 }\nMap               SUCCESS 5 Map3: { -13 : 2.5800000 , -1 : -2.1800000\
-  \ , 7 : 0.0000000 , 15 : -0.54000000 }\nMap               SUCCESS 5 Map4: { 7 :\
-  \ 0.0000000 , -13 : 2.5800000 , -1 : -2.1800000 , 15 : -0.54000000 }\nMap      \
-  \         SUCCESS  Count key    0 :  0 0 0 0\nMap               SUCCESS  Count key\
-  \    1 :  0 0 0 0\nMap               SUCCESS  Count key    7 :  1 0 1 1\nMap   \
-  \            SUCCESS  Count key -100 :  0 0 0 0\nApplicationMgr       INFO Application\
-  \ Manager Stopped successfully\nMap               SUCCESS\nMap               SUCCESS\
-  \  FINALIZE\nMap               SUCCESS  \tTested maps :\nMap               SUCCESS\
-  \  \t1) std::map<int,double,std::less<int>,std::allocator<std::pair<int const,double>\
-  \ > >\nMap               SUCCESS  \t2) GaudiUtils::VectorMap<int,double,std::less<int\
-  \ const>,std::allocator<std::pair<int,double> > >\nMap               SUCCESS  \t\
-  3) GaudiUtils::Map<int,double,std::map<int,double,std::less<int>,std::allocator<std::pair<int\
-  \ const,double> > > >\nMap               SUCCESS  \t4) GaudiUtils::HashMap<int,double,GaudiUtils::Hash<int>,std::unordered_map<int,double,GaudiUtils::Hash<int>,std::equal_to<int>,std::allocator<std::pair<int\
-  \ const,double> > > >\nEventLoopMgr         INFO Histograms converted successfully\
-  \ according to request.\nApplicationMgr       INFO Application Manager Finalized\
-  \ successfully\nApplicationMgr       INFO Application Manager Terminated successfully\n"
-histos: {}
-ttrees: {}
diff --git a/GaudiTestSuite/tests/pytest/refs/Maps.winxp.yaml b/GaudiTestSuite/tests/pytest/refs/Maps.winxp.yaml
deleted file mode 100644
index b146380f73328466d841b908ef733749a02440d0..0000000000000000000000000000000000000000
--- a/GaudiTestSuite/tests/pytest/refs/Maps.winxp.yaml
+++ /dev/null
@@ -1,267 +0,0 @@
-stdout: "JobOptionsSvc        INFO\n//GP:================================================================================\n\
-  //GP: include \"..\\options\\Maps.opts\"                                       \
-  \   (0,0)\nApplicationMgr.ExtSvc +=  [ \"RndmGenSvc\" ] ;                      \
-  \      //GP: (1,1)\nApplicationMgr.TopAlg =  [ \"MapAlg/Map\" ] ;              \
-  \               //GP: (1,1)\nMessageSvc.OutputLevel = 3;                       \
-  \                      //GP: (1,1)\nApplicationMgr.EvtMax = 10;                \
-  \                             //GP: (1,1)\nApplicationMgr.EvtSel = \"NONE\";   \
-  \                                      //GP: (1,1)\n//GP: end  \"..\\options\\Maps.opts\"\
-  \                                             (31,1)\n//GP:================================================================================\n\
-  \nJobOptionsSvc        INFO Job options successfully read in from ..\\options\\\
-  Maps.opts\nApplicationMgr    SUCCESS\n====================================================================================================================================\n\
-  \                                                   Welcome to ApplicationMgr $Revision:\
-  \ 1.4 $\n                                          running on MCLVIRT01 on Tue Jun\
-  \ 03 11:42:22 2008\n====================================================================================================================================\n\
-  ApplicationMgr       INFO Application Manager Configured successfully\nRndmGenSvc.Engine\
-  \    INFO Generator engine type:CLHEP::RanluxEngine\nRndmGenSvc.Engine    INFO Current\
-  \ Seed:1234567 Luxury:3\nRndmGenSvc           INFO Using Random engine:HepRndm::Engine<CLHEP::RanluxEngine>\n\
-  EventLoopMgr      WARNING Unable to locate service \"EventSelector\"\nEventLoopMgr\
-  \      WARNING No events will be processed from external input.\nHistogramPersis...WARNING\
-  \ Histograms saving not required.\nApplicationMgr       INFO Application Manager\
-  \ Initialized successfully\nApplicationMgr       INFO Application Manager Started\
-  \ successfully\nMap               SUCCESS  Inserting key -2 1st:  True True True\
-  \ True\nMap               SUCCESS 1 Map1: { -2 : -1.56 }\nMap               SUCCESS\
-  \ 1 Map2: { -2 : -1.56 }\nMap               SUCCESS 1 Map3: { -2 : -1.56 }\nMap\
-  \               SUCCESS 1 Map4: { -2 : -1.56 }\nMap               SUCCESS      CONST:\
-  \   map2['1']: 0, map3['1']: 0, map4['1']: 0\nMap               SUCCESS 2 Map1:\
-  \ { -2 : -1.56 }\nMap               SUCCESS 2 Map2: { -2 : -1.56 }\nMap        \
-  \       SUCCESS 2 Map3: { -2 : -1.56 }\nMap               SUCCESS 2 Map4: { -2 :\
-  \ -1.56 }\nMap               SUCCESS  NON-CONST:   map1['7']: 0, map2['7']: 0, map3['7']:\
-  \ 0, map4['7']: 0\nMap               SUCCESS 3 Map1: { -2 : -1.56 , 7 : 0 }\nMap\
-  \               SUCCESS 3 Map2: { -2 : -1.56 }\nMap               SUCCESS 3 Map3:\
-  \ { -2 : -1.56 , 7 : 0 }\nMap               SUCCESS 3 Map4: { -2 : -1.56 , 7 : 0\
-  \ }\nMap               SUCCESS  Inserting key -2 2nd:  False False False False\n\
-  Map               SUCCESS 4 Map1: { -2 : -1.56 , 7 : 0 }\nMap               SUCCESS\
-  \ 4 Map2: { -2 : -1.56 }\nMap               SUCCESS 4 Map3: { -2 : -1.56 , 7 : 0\
-  \ }\nMap               SUCCESS 4 Map4: { -2 : -1.56 , 7 : 0 }\nMap             \
-  \  SUCCESS  Erased :  True True True True\nMap               SUCCESS 5 Map1: { 7\
-  \ : 0 }\nMap               SUCCESS 5 Map2: {  }\nMap               SUCCESS 5 Map3:\
-  \ { 7 : 0 }\nMap               SUCCESS 5 Map4: { 7 : 0 }\nMap               SUCCESS\
-  \  Count key    0 :  0 0 0 0\nMap               SUCCESS  Count key    1 :  0 0 0\
-  \ 0\nMap               SUCCESS  Count key    7 :  1 0 1 1\nMap               SUCCESS\
-  \  Count key -100 :  0 0 0 0\nMap               SUCCESS  Inserting key 8 1st:  True\
-  \ True True True\nMap               SUCCESS 1 Map1: { 7 : 0 , 8 : 0.4 }\nMap   \
-  \            SUCCESS 1 Map2: { 8 : 0.4 }\nMap               SUCCESS 1 Map3: { 7\
-  \ : 0 , 8 : 0.4 }\nMap               SUCCESS 1 Map4: { 7 : 0 , 8 : 0.4 }\nMap  \
-  \             SUCCESS      CONST:   map2['1']: 0, map3['1']: 0, map4['1']: 0\nMap\
-  \               SUCCESS 2 Map1: { 7 : 0 , 8 : 0.4 }\nMap               SUCCESS 2\
-  \ Map2: { 8 : 0.4 }\nMap               SUCCESS 2 Map3: { 7 : 0 , 8 : 0.4 }\nMap\
-  \               SUCCESS 2 Map4: { 7 : 0 , 8 : 0.4 }\nMap               SUCCESS \
-  \ NON-CONST:   map1['7']: 0, map2['7']: 0, map3['7']: 0, map4['7']: 0\nMap     \
-  \          SUCCESS 3 Map1: { 7 : 0 , 8 : 0.4 }\nMap               SUCCESS 3 Map2:\
-  \ { 8 : 0.4 }\nMap               SUCCESS 3 Map3: { 7 : 0 , 8 : 0.4 }\nMap      \
-  \         SUCCESS 3 Map4: { 7 : 0 , 8 : 0.4 }\nMap               SUCCESS  Inserting\
-  \ key 8 2nd:  False False False False\nMap               SUCCESS 4 Map1: { 7 : 0\
-  \ , 8 : 0.4 }\nMap               SUCCESS 4 Map2: { 8 : 0.4 }\nMap              \
-  \ SUCCESS 4 Map3: { 7 : 0 , 8 : 0.4 }\nMap               SUCCESS 4 Map4: { 7 : 0\
-  \ , 8 : 0.4 }\nMap               SUCCESS  Erased :  True True True True\nMap   \
-  \            SUCCESS 5 Map1: { 7 : 0 }\nMap               SUCCESS 5 Map2: {  }\n\
-  Map               SUCCESS 5 Map3: { 7 : 0 }\nMap               SUCCESS 5 Map4: {\
-  \ 7 : 0 }\nMap               SUCCESS  Count key    0 :  0 0 0 0\nMap           \
-  \    SUCCESS  Count key    1 :  0 0 0 0\nMap               SUCCESS  Count key  \
-  \  7 :  1 0 1 1\nMap               SUCCESS  Count key -100 :  0 0 0 0\nMap     \
-  \          SUCCESS  Inserting key -12 1st:  True True True True\nMap           \
-  \    SUCCESS 1 Map1: { -12 : 0.09 , 7 : 0 }\nMap               SUCCESS 1 Map2: {\
-  \ -12 : 0.09 }\nMap               SUCCESS 1 Map3: { -12 : 0.09 , 7 : 0 }\nMap  \
-  \             SUCCESS 1 Map4: { -12 : 0.09 , 7 : 0 }\nMap               SUCCESS\
-  \      CONST:   map2['1']: 0, map3['1']: 0, map4['1']: 0\nMap               SUCCESS\
-  \ 2 Map1: { -12 : 0.09 , 7 : 0 }\nMap               SUCCESS 2 Map2: { -12 : 0.09\
-  \ }\nMap               SUCCESS 2 Map3: { -12 : 0.09 , 7 : 0 }\nMap             \
-  \  SUCCESS 2 Map4: { -12 : 0.09 , 7 : 0 }\nMap               SUCCESS  NON-CONST:\
-  \   map1['7']: 0, map2['7']: 0, map3['7']: 0, map4['7']: 0\nMap               SUCCESS\
-  \ 3 Map1: { -12 : 0.09 , 7 : 0 }\nMap               SUCCESS 3 Map2: { -12 : 0.09\
-  \ }\nMap               SUCCESS 3 Map3: { -12 : 0.09 , 7 : 0 }\nMap             \
-  \  SUCCESS 3 Map4: { -12 : 0.09 , 7 : 0 }\nMap               SUCCESS  Inserting\
-  \ key -12 2nd:  False False False False\nMap               SUCCESS 4 Map1: { -12\
-  \ : 0.09 , 7 : 0 }\nMap               SUCCESS 4 Map2: { -12 : 0.09 }\nMap      \
-  \         SUCCESS 4 Map3: { -12 : 0.09 , 7 : 0 }\nMap               SUCCESS 4 Map4:\
-  \ { -12 : 0.09 , 7 : 0 }\nMap               SUCCESS  Erased :  True True True True\n\
-  Map               SUCCESS 5 Map1: { 7 : 0 }\nMap               SUCCESS 5 Map2: {\
-  \  }\nMap               SUCCESS 5 Map3: { 7 : 0 }\nMap               SUCCESS 5 Map4:\
-  \ { 7 : 0 }\nMap               SUCCESS  Count key    0 :  0 0 0 0\nMap         \
-  \      SUCCESS  Count key    1 :  0 0 0 0\nMap               SUCCESS  Count key\
-  \    7 :  1 0 1 1\nMap               SUCCESS  Count key -100 :  0 0 0 0\nMap   \
-  \            SUCCESS  Inserting key 0 1st:  True True True True\nMap           \
-  \    SUCCESS 1 Map1: { 0 : -0.27 , 7 : 0 }\nMap               SUCCESS 1 Map2: {\
-  \ 0 : -0.27 }\nMap               SUCCESS 1 Map3: { 0 : -0.27 , 7 : 0 }\nMap    \
-  \           SUCCESS 1 Map4: { 0 : -0.27 , 7 : 0 }\nMap               SUCCESS   \
-  \   CONST:   map2['1']: 0, map3['1']: 0, map4['1']: 0\nMap               SUCCESS\
-  \ 2 Map1: { 0 : -0.27 , 7 : 0 }\nMap               SUCCESS 2 Map2: { 0 : -0.27 }\n\
-  Map               SUCCESS 2 Map3: { 0 : -0.27 , 7 : 0 }\nMap               SUCCESS\
-  \ 2 Map4: { 0 : -0.27 , 7 : 0 }\nMap               SUCCESS  NON-CONST:   map1['7']:\
-  \ 0, map2['7']: 0, map3['7']: 0, map4['7']: 0\nMap               SUCCESS 3 Map1:\
-  \ { 0 : -0.27 , 7 : 0 }\nMap               SUCCESS 3 Map2: { 0 : -0.27 }\nMap  \
-  \             SUCCESS 3 Map3: { 0 : -0.27 , 7 : 0 }\nMap               SUCCESS 3\
-  \ Map4: { 0 : -0.27 , 7 : 0 }\nMap               SUCCESS  Inserting key 0 2nd: \
-  \ False False False False\nMap               SUCCESS 4 Map1: { 0 : -0.27 , 7 : 0\
-  \ }\nMap               SUCCESS 4 Map2: { 0 : -0.27 }\nMap               SUCCESS\
-  \ 4 Map3: { 0 : -0.27 , 7 : 0 }\nMap               SUCCESS 4 Map4: { 0 : -0.27 ,\
-  \ 7 : 0 }\nMap               SUCCESS  Erased :  True True True True\nMap       \
-  \        SUCCESS 5 Map1: { 7 : 0 }\nMap               SUCCESS 5 Map2: {  }\nMap\
-  \               SUCCESS 5 Map3: { 7 : 0 }\nMap               SUCCESS 5 Map4: { 7\
-  \ : 0 }\nMap               SUCCESS  Count key    0 :  0 0 0 0\nMap             \
-  \  SUCCESS  Count key    1 :  0 0 0 0\nMap               SUCCESS  Count key    7\
-  \ :  1 0 1 1\nMap               SUCCESS  Count key -100 :  0 0 0 0\nMap        \
-  \       SUCCESS  Inserting key 4 1st:  True True True True\nMap               SUCCESS\
-  \ 1 Map1: { 4 : 1.43 , 7 : 0 }\nMap               SUCCESS 1 Map2: { 4 : 1.43 }\n\
-  Map               SUCCESS 1 Map3: { 4 : 1.43 , 7 : 0 }\nMap               SUCCESS\
-  \ 1 Map4: { 4 : 1.43 , 7 : 0 }\nMap               SUCCESS      CONST:   map2['1']:\
-  \ 0, map3['1']: 0, map4['1']: 0\nMap               SUCCESS 2 Map1: { 4 : 1.43 ,\
-  \ 7 : 0 }\nMap               SUCCESS 2 Map2: { 4 : 1.43 }\nMap               SUCCESS\
-  \ 2 Map3: { 4 : 1.43 , 7 : 0 }\nMap               SUCCESS 2 Map4: { 4 : 1.43 , 7\
-  \ : 0 }\nMap               SUCCESS  NON-CONST:   map1['7']: 0, map2['7']: 0, map3['7']:\
-  \ 0, map4['7']: 0\nMap               SUCCESS 3 Map1: { 4 : 1.43 , 7 : 0 }\nMap \
-  \              SUCCESS 3 Map2: { 4 : 1.43 }\nMap               SUCCESS 3 Map3: {\
-  \ 4 : 1.43 , 7 : 0 }\nMap               SUCCESS 3 Map4: { 4 : 1.43 , 7 : 0 }\nMap\
-  \               SUCCESS  Inserting key 4 2nd:  False False False False\nMap    \
-  \           SUCCESS 4 Map1: { 4 : 1.43 , 7 : 0 }\nMap               SUCCESS 4 Map2:\
-  \ { 4 : 1.43 }\nMap               SUCCESS 4 Map3: { 4 : 1.43 , 7 : 0 }\nMap    \
-  \           SUCCESS 4 Map4: { 4 : 1.43 , 7 : 0 }\nMap               SUCCESS  Erased\
-  \ :  True True True True\nMap               SUCCESS 5 Map1: { 7 : 0 }\nMap     \
-  \          SUCCESS 5 Map2: {  }\nMap               SUCCESS 5 Map3: { 7 : 0 }\nMap\
-  \               SUCCESS 5 Map4: { 7 : 0 }\nMap               SUCCESS  Count key\
-  \    0 :  0 0 0 0\nMap               SUCCESS  Count key    1 :  0 0 0 0\nMap   \
-  \            SUCCESS  Count key    7 :  1 0 1 1\nMap               SUCCESS  Count\
-  \ key -100 :  0 0 0 0\nMap               SUCCESS  Inserting key -13 1st:  True True\
-  \ True True\nMap               SUCCESS 1 Map1: { -13 : 2.58 , 7 : 0 }\nMap     \
-  \          SUCCESS 1 Map2: { -13 : 2.58 }\nMap               SUCCESS 1 Map3: { -13\
-  \ : 2.58 , 7 : 0 }\nMap               SUCCESS 1 Map4: { -13 : 2.58 , 7 : 0 }\nMap\
-  \               SUCCESS      CONST:   map2['1']: 0, map3['1']: 0, map4['1']: 0\n\
-  Map               SUCCESS 2 Map1: { -13 : 2.58 , 7 : 0 }\nMap               SUCCESS\
-  \ 2 Map2: { -13 : 2.58 }\nMap               SUCCESS 2 Map3: { -13 : 2.58 , 7 : 0\
-  \ }\nMap               SUCCESS 2 Map4: { -13 : 2.58 , 7 : 0 }\nMap             \
-  \  SUCCESS  NON-CONST:   map1['7']: 0, map2['7']: 0, map3['7']: 0, map4['7']: 0\n\
-  Map               SUCCESS 3 Map1: { -13 : 2.58 , 7 : 0 }\nMap               SUCCESS\
-  \ 3 Map2: { -13 : 2.58 }\nMap               SUCCESS 3 Map3: { -13 : 2.58 , 7 : 0\
-  \ }\nMap               SUCCESS 3 Map4: { -13 : 2.58 , 7 : 0 }\nMap             \
-  \  SUCCESS  Inserting key -13 2nd:  False False False False\nMap               SUCCESS\
-  \ 4 Map1: { -13 : 2.58 , 7 : 0 }\nMap               SUCCESS 4 Map2: { -13 : 2.58\
-  \ }\nMap               SUCCESS 4 Map3: { -13 : 2.58 , 7 : 0 }\nMap             \
-  \  SUCCESS 4 Map4: { -13 : 2.58 , 7 : 0 }\nMap               SUCCESS 5 Map1: { -13\
-  \ : 2.58 , 7 : 0 }\nMap               SUCCESS 5 Map2: { -13 : 2.58 }\nMap      \
-  \         SUCCESS 5 Map3: { -13 : 2.58 , 7 : 0 }\nMap               SUCCESS 5 Map4:\
-  \ { -13 : 2.58 , 7 : 0 }\nMap               SUCCESS  Count key    0 :  0 0 0 0\n\
-  Map               SUCCESS  Count key    1 :  0 0 0 0\nMap               SUCCESS\
-  \  Count key    7 :  1 0 1 1\nMap               SUCCESS  Count key -100 :  0 0 0\
-  \ 0\nMap               SUCCESS  Inserting key -1 1st:  True True True True\nMap\
-  \               SUCCESS 1 Map1: { -13 : 2.58 , -1 : -2.18 , 7 : 0 }\nMap       \
-  \        SUCCESS 1 Map2: { -13 : 2.58 , -1 : -2.18 }\nMap               SUCCESS\
-  \ 1 Map3: { -13 : 2.58 , -1 : -2.18 , 7 : 0 }\nMap               SUCCESS 1 Map4:\
-  \ { -13 : 2.58 , -1 : -2.18 , 7 : 0 }\nMap               SUCCESS      CONST:   map2['1']:\
-  \ 0, map3['1']: 0, map4['1']: 0\nMap               SUCCESS 2 Map1: { -13 : 2.58\
-  \ , -1 : -2.18 , 7 : 0 }\nMap               SUCCESS 2 Map2: { -13 : 2.58 , -1 :\
-  \ -2.18 }\nMap               SUCCESS 2 Map3: { -13 : 2.58 , -1 : -2.18 , 7 : 0 }\n\
-  Map               SUCCESS 2 Map4: { -13 : 2.58 , -1 : -2.18 , 7 : 0 }\nMap     \
-  \          SUCCESS  NON-CONST:   map1['7']: 0, map2['7']: 0, map3['7']: 0, map4['7']:\
-  \ 0\nMap               SUCCESS 3 Map1: { -13 : 2.58 , -1 : -2.18 , 7 : 0 }\nMap\
-  \               SUCCESS 3 Map2: { -13 : 2.58 , -1 : -2.18 }\nMap               SUCCESS\
-  \ 3 Map3: { -13 : 2.58 , -1 : -2.18 , 7 : 0 }\nMap               SUCCESS 3 Map4:\
-  \ { -13 : 2.58 , -1 : -2.18 , 7 : 0 }\nMap               SUCCESS  Inserting key\
-  \ -1 2nd:  False False False False\nMap               SUCCESS 4 Map1: { -13 : 2.58\
-  \ , -1 : -2.18 , 7 : 0 }\nMap               SUCCESS 4 Map2: { -13 : 2.58 , -1 :\
-  \ -2.18 }\nMap               SUCCESS 4 Map3: { -13 : 2.58 , -1 : -2.18 , 7 : 0 }\n\
-  Map               SUCCESS 4 Map4: { -13 : 2.58 , -1 : -2.18 , 7 : 0 }\nMap     \
-  \          SUCCESS 5 Map1: { -13 : 2.58 , -1 : -2.18 , 7 : 0 }\nMap            \
-  \   SUCCESS 5 Map2: { -13 : 2.58 , -1 : -2.18 }\nMap               SUCCESS 5 Map3:\
-  \ { -13 : 2.58 , -1 : -2.18 , 7 : 0 }\nMap               SUCCESS 5 Map4: { -13 :\
-  \ 2.58 , -1 : -2.18 , 7 : 0 }\nMap               SUCCESS  Count key    0 :  0 0\
-  \ 0 0\nMap               SUCCESS  Count key    1 :  0 0 0 0\nMap               SUCCESS\
-  \  Count key    7 :  1 0 1 1\nMap               SUCCESS  Count key -100 :  0 0 0\
-  \ 0\nMap               SUCCESS  Inserting key 0 1st:  True True True True\nMap \
-  \              SUCCESS 1 Map1: { -13 : 2.58 , -1 : -2.18 , 0 : -0.87 , 7 : 0 }\n\
-  Map               SUCCESS 1 Map2: { -13 : 2.58 , -1 : -2.18 , 0 : -0.87 }\nMap \
-  \              SUCCESS 1 Map3: { -13 : 2.58 , -1 : -2.18 , 0 : -0.87 , 7 : 0 }\n\
-  Map               SUCCESS 1 Map4: { -13 : 2.58 , -1 : -2.18 , 0 : -0.87 , 7 : 0\
-  \ }\nMap               SUCCESS      CONST:   map2['1']: 0, map3['1']: 0, map4['1']:\
-  \ 0\nMap               SUCCESS 2 Map1: { -13 : 2.58 , -1 : -2.18 , 0 : -0.87 , 7\
-  \ : 0 }\nMap               SUCCESS 2 Map2: { -13 : 2.58 , -1 : -2.18 , 0 : -0.87\
-  \ }\nMap               SUCCESS 2 Map3: { -13 : 2.58 , -1 : -2.18 , 0 : -0.87 , 7\
-  \ : 0 }\nMap               SUCCESS 2 Map4: { -13 : 2.58 , -1 : -2.18 , 0 : -0.87\
-  \ , 7 : 0 }\nMap               SUCCESS  NON-CONST:   map1['7']: 0, map2['7']: 0,\
-  \ map3['7']: 0, map4['7']: 0\nMap               SUCCESS 3 Map1: { -13 : 2.58 , -1\
-  \ : -2.18 , 0 : -0.87 , 7 : 0 }\nMap               SUCCESS 3 Map2: { -13 : 2.58\
-  \ , -1 : -2.18 , 0 : -0.87 }\nMap               SUCCESS 3 Map3: { -13 : 2.58 , -1\
-  \ : -2.18 , 0 : -0.87 , 7 : 0 }\nMap               SUCCESS 3 Map4: { -13 : 2.58\
-  \ , -1 : -2.18 , 0 : -0.87 , 7 : 0 }\nMap               SUCCESS  Inserting key 0\
-  \ 2nd:  False False False False\nMap               SUCCESS 4 Map1: { -13 : 2.58\
-  \ , -1 : -2.18 , 0 : -0.87 , 7 : 0 }\nMap               SUCCESS 4 Map2: { -13 :\
-  \ 2.58 , -1 : -2.18 , 0 : -0.87 }\nMap               SUCCESS 4 Map3: { -13 : 2.58\
-  \ , -1 : -2.18 , 0 : -0.87 , 7 : 0 }\nMap               SUCCESS 4 Map4: { -13 :\
-  \ 2.58 , -1 : -2.18 , 0 : -0.87 , 7 : 0 }\nMap               SUCCESS  Erased : \
-  \ True True True True\nMap               SUCCESS 5 Map1: { -13 : 2.58 , -1 : -2.18\
-  \ , 7 : 0 }\nMap               SUCCESS 5 Map2: { -13 : 2.58 , -1 : -2.18 }\nMap\
-  \               SUCCESS 5 Map3: { -13 : 2.58 , -1 : -2.18 , 7 : 0 }\nMap       \
-  \        SUCCESS 5 Map4: { -13 : 2.58 , -1 : -2.18 , 7 : 0 }\nMap              \
-  \ SUCCESS  Count key    0 :  0 0 0 0\nMap               SUCCESS  Count key    1\
-  \ :  0 0 0 0\nMap               SUCCESS  Count key    7 :  1 0 1 1\nMap        \
-  \       SUCCESS  Count key -100 :  0 0 0 0\nMap               SUCCESS  Inserting\
-  \ key 15 1st:  True True True True\nMap               SUCCESS 1 Map1: { -13 : 2.58\
-  \ , -1 : -2.18 , 7 : 0 , 15 : -0.54 }\nMap               SUCCESS 1 Map2: { -13 :\
-  \ 2.58 , -1 : -2.18 , 15 : -0.54 }\nMap               SUCCESS 1 Map3: { -13 : 2.58\
-  \ , -1 : -2.18 , 7 : 0 , 15 : -0.54 }\nMap               SUCCESS 1 Map4: { -13 :\
-  \ 2.58 , -1 : -2.18 , 7 : 0 , 15 : -0.54 }\nMap               SUCCESS      CONST:\
-  \   map2['1']: 0, map3['1']: 0, map4['1']: 0\nMap               SUCCESS 2 Map1:\
-  \ { -13 : 2.58 , -1 : -2.18 , 7 : 0 , 15 : -0.54 }\nMap               SUCCESS 2\
-  \ Map2: { -13 : 2.58 , -1 : -2.18 , 15 : -0.54 }\nMap               SUCCESS 2 Map3:\
-  \ { -13 : 2.58 , -1 : -2.18 , 7 : 0 , 15 : -0.54 }\nMap               SUCCESS 2\
-  \ Map4: { -13 : 2.58 , -1 : -2.18 , 7 : 0 , 15 : -0.54 }\nMap               SUCCESS\
-  \  NON-CONST:   map1['7']: 0, map2['7']: 0, map3['7']: 0, map4['7']: 0\nMap    \
-  \           SUCCESS 3 Map1: { -13 : 2.58 , -1 : -2.18 , 7 : 0 , 15 : -0.54 }\nMap\
-  \               SUCCESS 3 Map2: { -13 : 2.58 , -1 : -2.18 , 15 : -0.54 }\nMap  \
-  \             SUCCESS 3 Map3: { -13 : 2.58 , -1 : -2.18 , 7 : 0 , 15 : -0.54 }\n\
-  Map               SUCCESS 3 Map4: { -13 : 2.58 , -1 : -2.18 , 7 : 0 , 15 : -0.54\
-  \ }\nMap               SUCCESS  Inserting key 15 2nd:  False False False False\n\
-  Map               SUCCESS 4 Map1: { -13 : 2.58 , -1 : -2.18 , 7 : 0 , 15 : -0.54\
-  \ }\nMap               SUCCESS 4 Map2: { -13 : 2.58 , -1 : -2.18 , 15 : -0.54 }\n\
-  Map               SUCCESS 4 Map3: { -13 : 2.58 , -1 : -2.18 , 7 : 0 , 15 : -0.54\
-  \ }\nMap               SUCCESS 4 Map4: { -13 : 2.58 , -1 : -2.18 , 7 : 0 , 15 :\
-  \ -0.54 }\nMap               SUCCESS 5 Map1: { -13 : 2.58 , -1 : -2.18 , 7 : 0 ,\
-  \ 15 : -0.54 }\nMap               SUCCESS 5 Map2: { -13 : 2.58 , -1 : -2.18 , 15\
-  \ : -0.54 }\nMap               SUCCESS 5 Map3: { -13 : 2.58 , -1 : -2.18 , 7 : 0\
-  \ , 15 : -0.54 }\nMap               SUCCESS 5 Map4: { -13 : 2.58 , -1 : -2.18 ,\
-  \ 7 : 0 , 15 : -0.54 }\nMap               SUCCESS  Count key    0 :  0 0 0 0\nMap\
-  \               SUCCESS  Count key    1 :  0 0 0 0\nMap               SUCCESS  Count\
-  \ key    7 :  1 0 1 1\nMap               SUCCESS  Count key -100 :  0 0 0 0\nMap\
-  \               SUCCESS  Inserting key -22 1st:  True True True True\nMap      \
-  \         SUCCESS 1 Map1: { -22 : 0.09 , -13 : 2.58 , -1 : -2.18 , 7 : 0 , 15 :\
-  \ -0.54 }\nMap               SUCCESS 1 Map2: { -22 : 0.09 , -13 : 2.58 , -1 : -2.18\
-  \ , 15 : -0.54 }\nMap               SUCCESS 1 Map3: { -22 : 0.09 , -13 : 2.58 ,\
-  \ -1 : -2.18 , 7 : 0 , 15 : -0.54 }\nMap               SUCCESS 1 Map4: { -22 : 0.09\
-  \ , -13 : 2.58 , -1 : -2.18 , 7 : 0 , 15 : -0.54 }\nMap               SUCCESS  \
-  \    CONST:   map2['1']: 0, map3['1']: 0, map4['1']: 0\nMap               SUCCESS\
-  \ 2 Map1: { -22 : 0.09 , -13 : 2.58 , -1 : -2.18 , 7 : 0 , 15 : -0.54 }\nMap   \
-  \            SUCCESS 2 Map2: { -22 : 0.09 , -13 : 2.58 , -1 : -2.18 , 15 : -0.54\
-  \ }\nMap               SUCCESS 2 Map3: { -22 : 0.09 , -13 : 2.58 , -1 : -2.18 ,\
-  \ 7 : 0 , 15 : -0.54 }\nMap               SUCCESS 2 Map4: { -22 : 0.09 , -13 : 2.58\
-  \ , -1 : -2.18 , 7 : 0 , 15 : -0.54 }\nMap               SUCCESS  NON-CONST:   map1['7']:\
-  \ 0, map2['7']: 0, map3['7']: 0, map4['7']: 0\nMap               SUCCESS 3 Map1:\
-  \ { -22 : 0.09 , -13 : 2.58 , -1 : -2.18 , 7 : 0 , 15 : -0.54 }\nMap           \
-  \    SUCCESS 3 Map2: { -22 : 0.09 , -13 : 2.58 , -1 : -2.18 , 15 : -0.54 }\nMap\
-  \               SUCCESS 3 Map3: { -22 : 0.09 , -13 : 2.58 , -1 : -2.18 , 7 : 0 ,\
-  \ 15 : -0.54 }\nMap               SUCCESS 3 Map4: { -22 : 0.09 , -13 : 2.58 , -1\
-  \ : -2.18 , 7 : 0 , 15 : -0.54 }\nMap               SUCCESS  Inserting key -22 2nd:\
-  \  False False False False\nMap               SUCCESS 4 Map1: { -22 : 0.09 , -13\
-  \ : 2.58 , -1 : -2.18 , 7 : 0 , 15 : -0.54 }\nMap               SUCCESS 4 Map2:\
-  \ { -22 : 0.09 , -13 : 2.58 , -1 : -2.18 , 15 : -0.54 }\nMap               SUCCESS\
-  \ 4 Map3: { -22 : 0.09 , -13 : 2.58 , -1 : -2.18 , 7 : 0 , 15 : -0.54 }\nMap   \
-  \            SUCCESS 4 Map4: { -22 : 0.09 , -13 : 2.58 , -1 : -2.18 , 7 : 0 , 15\
-  \ : -0.54 }\nMap               SUCCESS  Erased :  True True True True\nMap     \
-  \          SUCCESS 5 Map1: { -13 : 2.58 , -1 : -2.18 , 7 : 0 , 15 : -0.54 }\nMap\
-  \               SUCCESS 5 Map2: { -13 : 2.58 , -1 : -2.18 , 15 : -0.54 }\nMap  \
-  \             SUCCESS 5 Map3: { -13 : 2.58 , -1 : -2.18 , 7 : 0 , 15 : -0.54 }\n\
-  Map               SUCCESS 5 Map4: { -13 : 2.58 , -1 : -2.18 , 7 : 0 , 15 : -0.54\
-  \ }\nMap               SUCCESS  Count key    0 :  0 0 0 0\nMap               SUCCESS\
-  \  Count key    1 :  0 0 0 0\nMap               SUCCESS  Count key    7 :  1 0 1\
-  \ 1\nMap               SUCCESS  Count key -100 :  0 0 0 0\nApplicationMgr      \
-  \ INFO Application Manager Stopped successfully\nMap               SUCCESS\nMap\
-  \               SUCCESS  FINALIZE\nMap               SUCCESS  \tTested maps :\n\
-  Map               SUCCESS  \t1) std::map<int,double,std::less<int>,std::allocator<std::pair<int\
-  \ const ,double> > >\nMap               SUCCESS  \t2) GaudiUtils::VectorMap<int,double,std::less<int\
-  \ const >,std::allocator<std::pair<int,double> > >\nMap               SUCCESS  \t\
-  3) GaudiUtils::Map<int,double,std::map<int,double,std::less<int>,std::allocator<std::pair<int\
-  \ const ,double> > > >\nMap               SUCCESS  \t4) GaudiUtils::HashMap<int,double,GaudiUtils::Hash<int>,std::map<int,double,std::less<int>,std::allocator<std::pair<int\
-  \ const ,double> > > >\nEventLoopMgr         INFO Histograms converted successfully\
-  \ according to request.\nApplicationMgr       INFO Application Manager Finalized\
-  \ successfully\nApplicationMgr       INFO Application Manager Terminated successfully\n"
-histos: {}
-ttrees: {}
diff --git a/GaudiTestSuite/tests/pytest/refs/Maps.yaml b/GaudiTestSuite/tests/pytest/refs/Maps.yaml
index 34fbc9af05d523a29b018c57a7677182f514844d..5d55c41f3d1ce55d0987a8a3049a2e747088a40a 100644
--- a/GaudiTestSuite/tests/pytest/refs/Maps.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/Maps.yaml
@@ -282,8 +282,7 @@ stdout: "JobOptionsSvc        INFO Job options successfully file Maps.opts\nAppl
   \ const>,std::allocator<std::pair<int,double> > >\nMap               SUCCESS  \t\
   3) GaudiUtils::Map<int,double,std::map<int,double,std::less<int>,std::allocator<std::pair<int\
   \ const,double> > > >\nMap               SUCCESS  \t4) GaudiUtils::HashMap<int,double,GaudiUtils::Hash<int>,std::unordered_map<int,double,GaudiUtils::Hash<int>,std::equal_to<int>,std::allocator<std::pair<int\
-  \ const,double> > > >\nEventLoopMgr         INFO Histograms converted successfully\
-  \ according to request.\nApplicationMgr       INFO Application Manager Finalized\
-  \ successfully\nApplicationMgr       INFO Application Manager Terminated successfully"
+  \ const,double> > > >\nApplicationMgr       INFO Application Manager Finalized successfully\n\
+  ApplicationMgr       INFO Application Manager Terminated successfully"
 histos: {}
 ttrees: {}
diff --git a/GaudiTestSuite/tests/pytest/refs/MetaDataSvc.yaml b/GaudiTestSuite/tests/pytest/refs/MetaDataSvc.yaml
index b4f85df1959469e73fc1f2928ff023c90030af17..3707faa2fa1120597cc75bc900d9e1fb7182cd53 100644
--- a/GaudiTestSuite/tests/pytest/refs/MetaDataSvc.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/MetaDataSvc.yaml
@@ -98,7 +98,7 @@ stdout: |-
   EventLoopMgr.AutoRetrieveTools:True
   EventLoopMgr.CheckToolDeps:True
   EventLoopMgr.EvtSel:'NONE'
-  EventLoopMgr.HistogramPersistency:''
+  EventLoopMgr.HistogramPersistency:'ROOT'
   EventLoopMgr.OutStream:[  ]
   EventLoopMgr.OutputLevel:3
   EventLoopMgr.PrintControlFlowExpression:False
diff --git a/GaudiTestSuite/tests/pytest/refs/MultiInput/Read.yaml b/GaudiTestSuite/tests/pytest/refs/MultiInput/Read.yaml
index 28f27c5a652c42220da9dc6c6df24f1c7bff555e..07f3d5c8ba51eaca90682cccba2f3ca827a376c0 100644
--- a/GaudiTestSuite/tests/pytest/refs/MultiInput/Read.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/MultiInput/Read.yaml
@@ -237,7 +237,6 @@ stdout: |-
   Gaudi::TestSuit...   INFO Base event tracks: 21
   Gaudi::TestSuit...   INFO Extra event tracks: 88
   ApplicationMgr       INFO Application Manager Stopped successfully
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   ToolSvc              INFO Removing all tools created by ToolSvc
   ApplicationMgr       INFO Application Manager Finalized successfully
   ApplicationMgr       INFO Application Manager Terminated successfully
diff --git a/GaudiTestSuite/tests/pytest/refs/MultiMergers.yaml b/GaudiTestSuite/tests/pytest/refs/MultiMergers.yaml
index d58c8276ba0f3e77c15050273bb2606dc3af0fae..fc4aaf16f5dd0a7bc963fac67dd4e72acd5b4ba1 100644
--- a/GaudiTestSuite/tests/pytest/refs/MultiMergers.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/MultiMergers.yaml
@@ -22,7 +22,6 @@ stdout: |-
   MergerFilterFai...   INFO i: 2 i: 3
   MergerFilterFai...   INFO Filter failed
   ApplicationMgr       INFO Application Manager Stopped successfully
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   ApplicationMgr       INFO Application Manager Finalized successfully
   ApplicationMgr       INFO Application Manager Terminated successfully
 histos: {}
diff --git a/GaudiTestSuite/tests/pytest/refs/ProduceConsume.yaml b/GaudiTestSuite/tests/pytest/refs/ProduceConsume.yaml
index 9dec4a881a22b6d7329725a3ba7fee5586660a94..e7cf229616c33fef831f4005d007a81b0e91655e 100644
--- a/GaudiTestSuite/tests/pytest/refs/ProduceConsume.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/ProduceConsume.yaml
@@ -202,7 +202,6 @@ stdout: |-
   OpaqueProducer    SUCCESS My Eventually is about to be destroyed
   CountingConsumer     INFO Number of counters : 3
   ApplicationMgr       INFO Application Manager Stopped successfully
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   ToolSvc              INFO Removing all tools created by ToolSvc
   ApplicationMgr       INFO Application Manager Finalized successfully
   ApplicationMgr       INFO Application Manager Terminated successfully
diff --git a/GaudiTestSuite/tests/pytest/refs/Properties.yaml b/GaudiTestSuite/tests/pytest/refs/Properties.yaml
index c41d72876999ebf6377a6a09dafcb4859c3bc064..b5d7c7ad4c6dc238cda59ae60e42813dc85a909a 100644
--- a/GaudiTestSuite/tests/pytest/refs/Properties.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/Properties.yaml
@@ -386,7 +386,6 @@ stdout: |-
   ApplicationMgr       INFO Application Manager Stopped successfully
   PropertyAlg          INFO finalizing....
   PropertyProxy        INFO finalizing....
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   ApplicationMgr       INFO Application Manager Finalized successfully
   ApplicationMgr       INFO Application Manager Terminated successfully
 histos: {}
diff --git a/GaudiTestSuite/tests/pytest/refs/Properties2.yaml b/GaudiTestSuite/tests/pytest/refs/Properties2.yaml
index ac4be5840a5fe9694f0169101b787933e4137157..eedbd7a3e6fb98b7e4ff65a8fb488bbe0f0c2cb3 100644
--- a/GaudiTestSuite/tests/pytest/refs/Properties2.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/Properties2.yaml
@@ -385,7 +385,6 @@ stdout: |-
   ApplicationMgr       INFO Application Manager Stopped successfully
   PropertyAlg          INFO finalizing....
   PropertyProxy        INFO finalizing....
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   ApplicationMgr       INFO Application Manager Finalized successfully
   ApplicationMgr       INFO Application Manager Terminated successfully
 histos: {}
diff --git a/GaudiTestSuite/tests/pytest/refs/Properties_py.yaml b/GaudiTestSuite/tests/pytest/refs/Properties_py.yaml
index dcb33c55434ae4cf9b4528d4fb9f8e4bbf8367d3..9b5968a5209a1d489d35f47c3851262e8ef3116e 100644
--- a/GaudiTestSuite/tests/pytest/refs/Properties_py.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/Properties_py.yaml
@@ -384,7 +384,6 @@ stdout: |-
   ApplicationMgr       INFO Application Manager Stopped successfully
   PropertyAlg          INFO finalizing....
   PropertyProxy        INFO finalizing....
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   ApplicationMgr       INFO Application Manager Finalized successfully
   ApplicationMgr       INFO Application Manager Terminated successfully
 histos: {}
diff --git a/GaudiTestSuite/tests/pytest/refs/QotdAlg.yaml b/GaudiTestSuite/tests/pytest/refs/QotdAlg.yaml
index a51cf79c3f8e22e928e032af79e43cce3dedef0b..3a64ec0b8a52785b5a7a340d2c0d91eaec9ce75a 100644
--- a/GaudiTestSuite/tests/pytest/refs/QotdAlg.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/QotdAlg.yaml
@@ -145,7 +145,6 @@ stdout: |-
                Qotd1   INFO Finalizing...
                Qotd2   INFO Finalizing...
                Qotd3   INFO Finalizing...
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   ApplicationMgr       INFO Application Manager Finalized successfully
   ApplicationMgr       INFO Application Manager Terminated successfully
 histos: {}
diff --git a/GaudiTestSuite/tests/pytest/refs/ROOT_IO/CollRead.yaml b/GaudiTestSuite/tests/pytest/refs/ROOT_IO/CollRead.yaml
index 2703a772f17d540d7ba7bfa29af86ca4b9d6ffd0..1868d3d3939b1c7d92cae3af8467e47d25315ea0 100644
--- a/GaudiTestSuite/tests/pytest/refs/ROOT_IO/CollRead.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/ROOT_IO/CollRead.yaml
@@ -183,7 +183,6 @@ stdout: "{'ApplicationMgr': {'EvtMax': -1,\n                    'ExtSvc': ['TagC
   \ INFO ========= EVENT:1000 RUN:999 TIME:1577837801.0 0 (0) 1 (1) 2 (2)\nGaudi::RootNTup...\
   \   INFO End of input Ntuple.\nEventLoopMgr         INFO No more events in event\
   \ selection\nApplicationMgr       INFO Application Manager Stopped successfully\n\
-  EventLoopMgr         INFO Histograms converted successfully according to request.\n\
   ToolSvc              INFO Removing all tools created by ToolSvc\nApplicationMgr\
   \       INFO Application Manager Finalized successfully\nApplicationMgr       INFO\
   \ Application Manager Terminated successfully\nNumber of MyTrack instances:2"
diff --git a/GaudiTestSuite/tests/pytest/refs/ROOT_IO/CollWrite.yaml b/GaudiTestSuite/tests/pytest/refs/ROOT_IO/CollWrite.yaml
index 4ddcaaf04052a654216c8943b310e894a831cab7..d282cd14f8ad1fb58a22a34d566f6fb96797d6e8 100644
--- a/GaudiTestSuite/tests/pytest/refs/ROOT_IO/CollWrite.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/ROOT_IO/CollWrite.yaml
@@ -74,7 +74,6 @@ stdout: |-
   Writer               INFO ================ EVENT:1000 RUN:999 ====== N(Track)=55 PASSED selection (>=50) ============
   EventLoopMgr         INFO No more events in event selection
   ApplicationMgr       INFO Application Manager Stopped successfully
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   ToolSvc              INFO Removing all tools created by ToolSvc
   EvtTupleSvc          INFO NTuples saved successfully
   ApplicationMgr       INFO Application Manager Finalized successfully
diff --git a/GaudiTestSuite/tests/pytest/refs/ROOT_IO/NewInputRead.yaml b/GaudiTestSuite/tests/pytest/refs/ROOT_IO/NewInputRead.yaml
index 88c925568d0e4f3a4ebebd7be6eddf773094460b..1845c94b9de49b5273da8f833ee8d7e09c872496 100644
--- a/GaudiTestSuite/tests/pytest/refs/ROOT_IO/NewInputRead.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/ROOT_IO/NewInputRead.yaml
@@ -970,7 +970,6 @@ stdout: |-
   ReadAlg              INFO ========= EVENT:10 RUN:999 TIME:1577836810.01 0 (0) 1 (1) 2 (2)
   EventLoopMgr         INFO No more events in event selection
   ApplicationMgr       INFO Application Manager Stopped successfully
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   EventSelector       DEBUG finalize()
   ToolSvc              INFO Removing all tools created by ToolSvc
   ApplicationMgr       INFO Application Manager Finalized successfully
diff --git a/GaudiTestSuite/tests/pytest/refs/ROOT_IO/NewInputWrite.yaml b/GaudiTestSuite/tests/pytest/refs/ROOT_IO/NewInputWrite.yaml
index 66b807b5232c5fa49b27ae6107f36da2be1c9a02..9e32cab0d2cc0da3790bfa7d342d5011b61e58be 100644
--- a/GaudiTestSuite/tests/pytest/refs/ROOT_IO/NewInputWrite.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/ROOT_IO/NewInputWrite.yaml
@@ -56,8 +56,6 @@ stdout: |-
   ToolSvc           VERBOSE Created tool DataStreamTool/EventSelector.DataStreamTool
   EventSelector.D...  DEBUG Selection root:/Event CLID:110
   EventSelector        INFO Stream:EventSelector.DataStreamTool_1 Def:DATAFILE='PFN:ROOTIO.2.dst'  SVC='Gaudi::RootEvtSelector' OPT='READ'
-  HistogramDataSvc  VERBOSE ServiceLocatorHelper::service: found service IncidentSvc
-  HistogramDataSvc  VERBOSE ServiceLocatorHelper::service: found service HistogramPersistencySvc
   ApplicationMgr       INFO Application Manager Initialized successfully
   ServiceManager      DEBUG Starting service FileRecordDataSvc
   ServiceManager      DEBUG Starting service AppMgrRunable
@@ -73,8 +71,6 @@ stdout: |-
   ServiceManager      DEBUG Starting service ToolSvc
   ToolSvc             DEBUG START transition for AlgTools
   ToolSvc           VERBOSE EventSelector.DataStreamTool::start()
-  ServiceManager      DEBUG Starting service HistogramPersistencySvc
-  ServiceManager      DEBUG Starting service HistogramDataSvc
   ServiceManager      DEBUG Starting service EventSelector
   ServiceManager      DEBUG Starting service EventLoopMgr
   ApplicationMgr       INFO Application Manager Started successfully
@@ -432,8 +428,6 @@ stdout: |-
   EventLoopMgr         INFO No more events in event selection
   ServiceManager      DEBUG Stopping service EventLoopMgr
   ServiceManager      DEBUG Stopping service EventSelector
-  ServiceManager      DEBUG Stopping service HistogramDataSvc
-  ServiceManager      DEBUG Stopping service HistogramPersistencySvc
   ServiceManager      DEBUG Stopping service ToolSvc
   ToolSvc             DEBUG STOP transition for AlgTools
   ToolSvc           VERBOSE EventSelector.DataStreamTool::stop()
@@ -451,7 +445,6 @@ stdout: |-
   ApplicationMgr       INFO Application Manager Stopped successfully
   ServiceManager      DEBUG Finalizing service EventLoopMgr
   NewRootDst           INFO Events output: 10
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   ServiceManager      DEBUG Finalizing service EventSelector
   EventSelector       DEBUG finalize()
   ServiceManager      DEBUG Finalizing service ToolSvc
@@ -473,13 +466,9 @@ stdout: |-
   ServiceManager      DEBUG Finalizing service IncidentSvc
   ServiceManager      DEBUG Finalizing service AppMgrRunable
   ServiceManager      DEBUG Finalizing service FileRecordDataSvc
-  ServiceManager      DEBUG Finalizing service HistogramDataSvc
-  ServiceManager      DEBUG Finalizing service HistogramPersistencySvc
   ServiceManager      DEBUG Looping over all active services...
-  ServiceManager      DEBUG ---- MessageSvc (refCount = 26)
+  ServiceManager      DEBUG ---- MessageSvc (refCount = 24)
   ServiceManager      DEBUG ---- JobOptionsSvc (refCount = 2)
-  ServiceManager      DEBUG ---- HistogramPersistencySvc (refCount = 2)
-  ServiceManager      DEBUG ---- HistogramDataSvc (refCount = 3)
   ServiceManager      DEBUG ---- FileRecordDataSvc (refCount = 3)
   ServiceManager      DEBUG ---- AppMgrRunable (refCount = 3)
   ServiceManager      DEBUG ---- IncidentSvc (refCount = 3)
diff --git a/GaudiTestSuite/tests/pytest/refs/ROOT_IO/NewWrite.yaml b/GaudiTestSuite/tests/pytest/refs/ROOT_IO/NewWrite.yaml
index eafb962680f324916753969931268cf3cecdfd95..0abe4492629282ebb48adbf7820f9636b908cf80 100644
--- a/GaudiTestSuite/tests/pytest/refs/ROOT_IO/NewWrite.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/ROOT_IO/NewWrite.yaml
@@ -51,8 +51,6 @@ stdout: |-
   RootDst             DEBUG output handles: 0
   EventLoopMgr      WARNING Unable to locate service "EventSelector"
   EventLoopMgr      WARNING No events will be processed from external input.
-  HistogramDataSvc  VERBOSE ServiceLocatorHelper::service: found service IncidentSvc
-  HistogramDataSvc  VERBOSE ServiceLocatorHelper::service: found service HistogramPersistencySvc
   ApplicationMgr       INFO Application Manager Initialized successfully
   ServiceManager      DEBUG Starting service FileRecordDataSvc
   ServiceManager      DEBUG Starting service AppMgrRunable
@@ -65,8 +63,6 @@ stdout: |-
   ServiceManager      DEBUG Starting service FileCatalog
   ServiceManager      DEBUG Starting service IODataManager
   ServiceManager      DEBUG Starting service RootCnvSvc
-  ServiceManager      DEBUG Starting service HistogramPersistencySvc
-  ServiceManager      DEBUG Starting service HistogramDataSvc
   ServiceManager      DEBUG Starting service EventLoopMgr
   ApplicationMgr       INFO Application Manager Started successfully
   RndmGenSvc.Engine    INFO Generator engine type:CLHEP::RanluxEngine
@@ -76,8 +72,6 @@ stdout: |-
   WriteAlg          VERBOSE ServiceLocatorHelper::service: found service EventDataSvc
   ServiceManager      DEBUG Stopping service EventLoopMgr
   ServiceManager      DEBUG Stopping service RndmGenSvc
-  ServiceManager      DEBUG Stopping service HistogramDataSvc
-  ServiceManager      DEBUG Stopping service HistogramPersistencySvc
   ServiceManager      DEBUG Stopping service RootCnvSvc
   ServiceManager      DEBUG Stopping service IODataManager
   ServiceManager      DEBUG Stopping service FileCatalog
@@ -92,10 +86,7 @@ stdout: |-
   ApplicationMgr       INFO Application Manager Stopped successfully
   ServiceManager      DEBUG Finalizing service EventLoopMgr
   RootDst              INFO Events output: 10
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   ServiceManager      DEBUG Finalizing service RndmGenSvc
-  ServiceManager      DEBUG Finalizing service HistogramDataSvc
-  ServiceManager      DEBUG Finalizing service HistogramPersistencySvc
   ServiceManager      DEBUG Finalizing service RootCnvSvc
   ServiceManager      DEBUG Finalizing service IODataManager
   ServiceManager      DEBUG Finalizing service FileCatalog
@@ -108,7 +99,7 @@ stdout: |-
   ServiceManager      DEBUG Finalizing service AppMgrRunable
   ServiceManager      DEBUG Finalizing service FileRecordDataSvc
   ServiceManager      DEBUG Looping over all active services...
-  ServiceManager      DEBUG ---- MessageSvc (refCount = 25)
+  ServiceManager      DEBUG ---- MessageSvc (refCount = 23)
   ServiceManager      DEBUG ---- JobOptionsSvc (refCount = 2)
   ServiceManager      DEBUG ---- RndmGenSvc.Engine (refCount = 2)
   ServiceManager      DEBUG ---- FileRecordDataSvc (refCount = 3)
@@ -122,8 +113,6 @@ stdout: |-
   ServiceManager      DEBUG ---- FileCatalog (refCount = 2)
   ServiceManager      DEBUG ---- IODataManager (refCount = 2)
   ServiceManager      DEBUG ---- RootCnvSvc (refCount = 2)
-  ServiceManager      DEBUG ---- HistogramPersistencySvc (refCount = 2)
-  ServiceManager      DEBUG ---- HistogramDataSvc (refCount = 3)
   ServiceManager      DEBUG ---- RndmGenSvc (refCount = 2)
   ServiceManager      DEBUG ---- EventLoopMgr (refCount = 3)
   ApplicationMgr       INFO Application Manager Finalized successfully
diff --git a/GaudiTestSuite/tests/pytest/refs/ROOT_IO/Read.yaml b/GaudiTestSuite/tests/pytest/refs/ROOT_IO/Read.yaml
index b71396d6547940a4617bf2915f469a37c1cbc696..eae8d190124d598e69f36556a18e02023fbdb520 100644
--- a/GaudiTestSuite/tests/pytest/refs/ROOT_IO/Read.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/ROOT_IO/Read.yaml
@@ -2393,7 +2393,6 @@ stdout: |-
   ReadAlg             DEBUG       0.111706  0.115527  0.112686 Collisions:  0 (2)  1 (3)  2 (4)
   EventLoopMgr         INFO No more events in event selection
   ApplicationMgr       INFO Application Manager Stopped successfully
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   EventSelector       DEBUG finalize()
   ToolSvc              INFO Removing all tools created by ToolSvc
   ApplicationMgr       INFO Application Manager Finalized successfully
diff --git a/GaudiTestSuite/tests/pytest/refs/ROOT_IO/Write.yaml b/GaudiTestSuite/tests/pytest/refs/ROOT_IO/Write.yaml
index e40e4ca735b6c2cfb62ef7173ed74ddffda7909d..9b91b7d1876c401be86e960af180948677fd0346 100644
--- a/GaudiTestSuite/tests/pytest/refs/ROOT_IO/Write.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/ROOT_IO/Write.yaml
@@ -91,8 +91,6 @@ stdout: |-
   FileRecords         DEBUG output handles: 0
   EventLoopMgr      WARNING Unable to locate service "EventSelector"
   EventLoopMgr      WARNING No events will be processed from external input.
-  HistogramDataSvc  VERBOSE ServiceLocatorHelper::service: found service IncidentSvc
-  HistogramDataSvc  VERBOSE ServiceLocatorHelper::service: found service HistogramPersistencySvc
   ApplicationMgr       INFO Application Manager Initialized successfully
   ServiceManager      DEBUG Starting service FileRecordDataSvc
   ServiceManager      DEBUG Starting service AppMgrRunable
@@ -105,8 +103,6 @@ stdout: |-
   ServiceManager      DEBUG Starting service FileCatalog
   ServiceManager      DEBUG Starting service IODataManager
   ServiceManager      DEBUG Starting service RootCnvSvc
-  ServiceManager      DEBUG Starting service HistogramPersistencySvc
-  ServiceManager      DEBUG Starting service HistogramDataSvc
   ServiceManager      DEBUG Starting service EventLoopMgr
   ApplicationMgr       INFO Application Manager Started successfully
   RndmGenSvc.Engine    INFO Generator engine type:CLHEP::RanluxEngine
@@ -1268,8 +1264,6 @@ stdout: |-
   ReadAlg             DEBUG       0.111706  0.115527  0.112686 Collisions:  0 (-1)  1 (-1)  2 (-1)
   ServiceManager      DEBUG Stopping service EventLoopMgr
   ServiceManager      DEBUG Stopping service RndmGenSvc
-  ServiceManager      DEBUG Stopping service HistogramDataSvc
-  ServiceManager      DEBUG Stopping service HistogramPersistencySvc
   ServiceManager      DEBUG Stopping service RootCnvSvc
   ServiceManager      DEBUG Stopping service IODataManager
   ServiceManager      DEBUG Stopping service FileCatalog
@@ -1288,10 +1282,7 @@ stdout: |-
   FileRecords          INFO Set up File Summary Record
   FileRecords       VERBOSE will not fire incidents
   FileRecords          INFO Events output: 1
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   ServiceManager      DEBUG Finalizing service RndmGenSvc
-  ServiceManager      DEBUG Finalizing service HistogramDataSvc
-  ServiceManager      DEBUG Finalizing service HistogramPersistencySvc
   ServiceManager      DEBUG Finalizing service RootCnvSvc
   ServiceManager      DEBUG Finalizing service IODataManager
   ServiceManager      DEBUG Finalizing service FileCatalog
@@ -1304,7 +1295,7 @@ stdout: |-
   ServiceManager      DEBUG Finalizing service AppMgrRunable
   ServiceManager      DEBUG Finalizing service FileRecordDataSvc
   ServiceManager      DEBUG Looping over all active services...
-  ServiceManager      DEBUG ---- MessageSvc (refCount = 27)
+  ServiceManager      DEBUG ---- MessageSvc (refCount = 25)
   ServiceManager      DEBUG ---- JobOptionsSvc (refCount = 2)
   ServiceManager      DEBUG ---- RndmGenSvc.Engine (refCount = 2)
   ServiceManager      DEBUG ---- FileRecordDataSvc (refCount = 3)
@@ -1318,8 +1309,6 @@ stdout: |-
   ServiceManager      DEBUG ---- FileCatalog (refCount = 2)
   ServiceManager      DEBUG ---- IODataManager (refCount = 2)
   ServiceManager      DEBUG ---- RootCnvSvc (refCount = 2)
-  ServiceManager      DEBUG ---- HistogramPersistencySvc (refCount = 2)
-  ServiceManager      DEBUG ---- HistogramDataSvc (refCount = 3)
   ServiceManager      DEBUG ---- RndmGenSvc (refCount = 2)
   ServiceManager      DEBUG ---- EventLoopMgr (refCount = 3)
   ApplicationMgr       INFO Application Manager Finalized successfully
diff --git a/GaudiTestSuite/tests/pytest/refs/ROOT_IO/Write630FwdCompat.yaml b/GaudiTestSuite/tests/pytest/refs/ROOT_IO/Write630FwdCompat.yaml
index c36f1ce1430357c6e8606c838dbe5d1aa0815ad3..7f8cf7105ec5620904529038cad40a1324d3bee9 100644
--- a/GaudiTestSuite/tests/pytest/refs/ROOT_IO/Write630FwdCompat.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/ROOT_IO/Write630FwdCompat.yaml
@@ -64,7 +64,6 @@ stdout: |-
   RootMini             INFO Events output: 1000
   FileRecords          INFO Set up File Summary Record
   FileRecords          INFO Events output: 1
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   ApplicationMgr       INFO Application Manager Finalized successfully
   ApplicationMgr       INFO Application Manager Terminated successfully
 histos: {}
diff --git a/GaudiTestSuite/tests/pytest/refs/ReEntAlg.yaml b/GaudiTestSuite/tests/pytest/refs/ReEntAlg.yaml
index d473468fcf755acf93123a22ca19a3009ac48056..0823d3f0722620de06d3574fce19e17909c43e73 100644
--- a/GaudiTestSuite/tests/pytest/refs/ReEntAlg.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/ReEntAlg.yaml
@@ -51,7 +51,6 @@ stdout: |-
   HiveSlimEventLo...   INFO 0 events were SKIPed
   ApplicationMgr       INFO Application Manager Stopped successfully
   ReEntAlg             INFO finalize()
-  HiveSlimEventLo...   INFO Histograms converted successfully according to request.
   AvalancheSchedu...   INFO Joining Scheduler thread
   ApplicationMgr       INFO Application Manager Finalized successfully
   ApplicationMgr       INFO Application Manager Terminated successfully
diff --git a/GaudiTestSuite/tests/pytest/refs/StatSvcAlg.yaml b/GaudiTestSuite/tests/pytest/refs/StatSvcAlg.yaml
index 48e8c01bb80b8db764623316d52c1e1e8606805c..5dfc76290cf86b9494dab71f8d49956d52bdd688 100644
--- a/GaudiTestSuite/tests/pytest/refs/StatSvcAlg.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/StatSvcAlg.yaml
@@ -9,7 +9,6 @@ stdout: |-
   ApplicationMgr       INFO Application Manager Initialized successfully
   ApplicationMgr       INFO Application Manager Started successfully
   ApplicationMgr       INFO Application Manager Stopped successfully
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
   ******Stat******     INFO  The Final stat Table (ordered)
   ******Stat******     INFO  |    Counter     |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
diff --git a/GaudiTestSuite/tests/pytest/refs/THistRead.dbg.yaml b/GaudiTestSuite/tests/pytest/refs/THistRead.dbg.yaml
index 51fef50d70b17724e3632e0e35ecc9c8932c37c4..c197d3824ffd40704500059ccac7d77c6c9c825c 100644
--- a/GaudiTestSuite/tests/pytest/refs/THistRead.dbg.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/THistRead.dbg.yaml
@@ -92,8 +92,7 @@ stdout: "JobOptionsSvc        INFO Job options successfully file THistRead.opts\
   \ tuple2.rt  size: ###\e[m\nTHistSvc            DEBUG stream: read2  name: tuple3.rt\
   \  size: ###\e[m\nTHistSvc            DEBUG stream: read1  name: tuple2.rt  size:\
   \ ###\e[m\nTHistSvc            DEBUG stream: read2  name: tuple3.rt  size: ###\e\
-  [m\nApplicationMgr       INFO Application Manager Stopped successfully\e[m\nEventLoopMgr\
-  \         INFO Histograms converted successfully according to request.\e[m\nTHistSvc\
+  [m\nApplicationMgr       INFO Application Manager Stopped successfully\e[m\nTHistSvc\
   \            DEBUG dumping THistSvc contents\nm_hlist:  size: 5\n - id: /read1/xxx/1Dgauss\
   \ t: 0 s: 0 M: ######## m: 0 o: 0x######## T: 1 TH1F :: [0x########] 1 {[0x########]}\n\
   \ - id: /read2/2Dgauss t: 0 s: 0 M: ######## m: 0 o: 0x######## T: 1 TH2F :: [0x########]\
diff --git a/GaudiTestSuite/tests/pytest/refs/THistRead.yaml b/GaudiTestSuite/tests/pytest/refs/THistRead.yaml
index 15f17c337aa0e807172462ec5721845848959e37..a414f64dc411657ecff0a60392ec45bed0e921b1 100644
--- a/GaudiTestSuite/tests/pytest/refs/THistRead.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/THistRead.yaml
@@ -56,8 +56,7 @@ stdout: "JobOptionsSvc        INFO Job options successfully file THistRead.opts\
   \      WARNING No events will be processed from external input.\e[m\nApplicationMgr\
   \       INFO Application Manager Initialized successfully\e[m\nApplicationMgr  \
   \     INFO Application Manager Started successfully\e[m\nApplicationMgr       INFO\
-  \ Application Manager Stopped successfully\e[m\nEventLoopMgr         INFO Histograms\
-  \ converted successfully according to request.\e[m\nTHistSvc            DEBUG dumping\
+  \ Application Manager Stopped successfully\e[m\nTHistSvc            DEBUG dumping\
   \ THistSvc contents\nm_hlist:  size: 5\n - id: /read1/xxx/1Dgauss t: 0 s: 0 M: ########\
   \ m: 0 o: 0x######## T: 1 TH1F :: [0x########] 1 {[0x########]}\n - id: /read2/2Dgauss\
   \ t: 0 s: 0 M: ######## m: 0 o: 0x######## T: 1 TH2F :: [0x########] 1 {[0x########]}\n\
diff --git a/GaudiTestSuite/tests/pytest/refs/THistWrite.dbg.yaml b/GaudiTestSuite/tests/pytest/refs/THistWrite.dbg.yaml
index 0aa4d0b6c3ba60ef8c394ecf5fbcbfd078aac928..ed3fcaa300190e738936359067f1d96c64681a31 100644
--- a/GaudiTestSuite/tests/pytest/refs/THistWrite.dbg.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/THistWrite.dbg.yaml
@@ -228,8 +228,7 @@ stdout: "JobOptionsSvc        INFO Job options successfully file THistWrite.opts
   \        DEBUG stream: rec  name: tuple3.rt  size: ###\e[m\nTHistSvc           \
   \ DEBUG stream: upd  name: tuple2.rt  size: ###\e[m\nApplicationMgr       INFO Application\
   \ Manager Stopped successfully\e[m\nTHistWrite           INFO Finalizing...\e[m\n\
-  THistSvc            DEBUG vhid for /temp/TempHist7 is empty. deleting\e[m\nEventLoopMgr\
-  \         INFO Histograms converted successfully according to request.\e[m\nTHistSvc\
+  THistSvc            DEBUG vhid for /temp/TempHist7 is empty. deleting\e[m\nTHistSvc\
   \            DEBUG dumping THistSvc contents\nm_hlist:  size: 12\n - id: /new/Tree2\
   \ t: 1 s: 0 M: ######## m: 0 o: 0x######## T: 1 TH1F :: [0x########] 1 {[0x########]}\n\
   \ - id: /rec/gauss2d t: 0 s: 0 M: ######## m: 0 o: 0x######## T: 1 TH2F :: [0x########]\
diff --git a/GaudiTestSuite/tests/pytest/refs/THistWrite.yaml b/GaudiTestSuite/tests/pytest/refs/THistWrite.yaml
index 9495dfbc1383027b51942823e5f7d22bfc785faa..a08abb3f12763b816a2152aaed51238fe168f55e 100644
--- a/GaudiTestSuite/tests/pytest/refs/THistWrite.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/THistWrite.yaml
@@ -196,8 +196,7 @@ stdout: "JobOptionsSvc        INFO Job options successfully file THistWrite.opts
   \ t: 0 s: 1 M: ######## m: 0x######## o: 0x######## T: 1 TH3F\e[m\nApplicationMgr\
   \       INFO Application Manager Stopped successfully\e[m\nTHistWrite          \
   \ INFO Finalizing...\e[m\nTHistSvc            DEBUG vhid for /temp/TempHist7 is\
-  \ empty. deleting\e[m\nEventLoopMgr         INFO Histograms converted successfully\
-  \ according to request.\e[m\nTHistSvc            DEBUG dumping THistSvc contents\n\
+  \ empty. deleting\e[m\nTHistSvc            DEBUG dumping THistSvc contents\n\
   m_hlist:  size: 12\n - id: /new/Tree2 t: 1 s: 0 M: ######## m: 0 o: 0x######## T:\
   \ 1 TH1F :: [0x########] 1 {[0x########]}\n - id: /rec/gauss2d t: 0 s: 0 M: ########\
   \ m: 0 o: 0x######## T: 1 TH2F :: [0x########] 1 {[0x########]}\n - id: /rec/gauss2d_shared\
diff --git a/GaudiTestSuite/tests/pytest/refs/TemplatedAlg.yaml b/GaudiTestSuite/tests/pytest/refs/TemplatedAlg.yaml
index 5d2d1143ce3524b42030335187e23780ff3a137c..147f9738a50dcbe1009928d163f8734fdd711347 100644
--- a/GaudiTestSuite/tests/pytest/refs/TemplatedAlg.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/TemplatedAlg.yaml
@@ -13,7 +13,6 @@ stdout: |-
   ApplicationMgr       INFO Application Manager Initialized successfully
   ApplicationMgr       INFO Application Manager Started successfully
   ApplicationMgr       INFO Application Manager Stopped successfully
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   ApplicationMgr       INFO Application Manager Finalized successfully
   ApplicationMgr       INFO Application Manager Terminated successfully
 histos: {}
diff --git a/GaudiTestSuite/tests/pytest/refs/TemplatedAlg_pyopts.yaml b/GaudiTestSuite/tests/pytest/refs/TemplatedAlg_pyopts.yaml
index a0cf82cb4d601e029ee118a81c515c061caa68cd..e69006f4495a2476cc1c9af5a03ef3ba99034889 100644
--- a/GaudiTestSuite/tests/pytest/refs/TemplatedAlg_pyopts.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/TemplatedAlg_pyopts.yaml
@@ -12,7 +12,6 @@ stdout: |-
   ApplicationMgr       INFO Application Manager Initialized successfully
   ApplicationMgr       INFO Application Manager Started successfully
   ApplicationMgr       INFO Application Manager Stopped successfully
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   ApplicationMgr       INFO Application Manager Finalized successfully
   ApplicationMgr       INFO Application Manager Terminated successfully
 histos: {}
diff --git a/GaudiTestSuite/tests/pytest/refs/ToolHandles.yaml b/GaudiTestSuite/tests/pytest/refs/ToolHandles.yaml
index be79c806335157e904df287138c03646ac1f12b0..0dfedd0b6a5a6ba66861e83f1b0b2693bf0be7fc 100644
--- a/GaudiTestSuite/tests/pytest/refs/ToolHandles.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/ToolHandles.yaml
@@ -56,7 +56,6 @@ stdout: |-
   THDataProducer2      INFO executing IntDataProducer, storing 7.0 into /Event/MyFloat
   HiveSlimEventLo...   INFO 0 events were SKIPed
   ApplicationMgr       INFO Application Manager Stopped successfully
-  HiveSlimEventLo...   INFO Histograms converted successfully according to request.
   AvalancheSchedu...   INFO Joining Scheduler thread
   ToolSvc              INFO Removing all tools created by ToolSvc
   ApplicationMgr       INFO Application Manager Finalized successfully
diff --git a/GaudiTestSuite/tests/pytest/refs/anydata.yaml b/GaudiTestSuite/tests/pytest/refs/anydata.yaml
index 061437790300c0db19bf373b834b1735469d0831..e1879a7ddccbc1537fad7f23c2a636e9a27d38d7 100644
--- a/GaudiTestSuite/tests/pytest/refs/anydata.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/anydata.yaml
@@ -20,7 +20,6 @@ stdout: |-
   AnyDataGetAlgor...   INFO Got std::vector<int,std::allocator<int> > from TestAnyData/Two: [0, 1, 2, 3]
   AnyDataGetAlgor...   INFO AnyDataHandler holds:42 84
   ApplicationMgr       INFO Application Manager Stopped successfully
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   ApplicationMgr       INFO Application Manager Finalized successfully
   ApplicationMgr       INFO Application Manager Terminated successfully
 histos: {}
diff --git a/GaudiTestSuite/tests/pytest/refs/anyview.yaml b/GaudiTestSuite/tests/pytest/refs/anyview.yaml
index c1ba787bf34be1a42fd48e173c0bf8a124f4b5cd..6f2c589f0ab183ac30d6452f5157482dbcd15821 100644
--- a/GaudiTestSuite/tests/pytest/refs/anyview.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/anyview.yaml
@@ -16,7 +16,6 @@ stdout: |-
   GetIntView           INFO got a span with data at : 0x########
   GetIntView           INFO 1 2 3 5 8 13 21 34
   ApplicationMgr       INFO Application Manager Stopped successfully
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   ApplicationMgr       INFO Application Manager Finalized successfully
   ApplicationMgr       INFO Application Manager Terminated successfully
 histos: {}
diff --git a/GaudiTestSuite/tests/pytest/refs/conditional_output/read.yaml b/GaudiTestSuite/tests/pytest/refs/conditional_output/read.yaml
index 51f8d7d89ff8697885c7cc622ff4914a3de2ef17..bdd9e60689799d43d7f9a8bd539516a93edb341b 100644
--- a/GaudiTestSuite/tests/pytest/refs/conditional_output/read.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/conditional_output/read.yaml
@@ -105,7 +105,6 @@ stdout: |-
   DataReader        WARNING Cannot retrieve object 'D'
   EventLoopMgr         INFO No more events in event selection
   ApplicationMgr       INFO Application Manager Stopped successfully
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   ToolSvc              INFO Removing all tools created by ToolSvc
   ApplicationMgr       INFO Application Manager Finalized successfully
   ApplicationMgr       INFO Application Manager Terminated successfully
diff --git a/GaudiTestSuite/tests/pytest/refs/conditional_output/write.yaml b/GaudiTestSuite/tests/pytest/refs/conditional_output/write.yaml
index 6d61a770341096d1ebbc41192261d51cbf6469da..37d14d3132812a5caca840c6b4778278aae06580 100644
--- a/GaudiTestSuite/tests/pytest/refs/conditional_output/write.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/conditional_output/write.yaml
@@ -79,8 +79,6 @@ stdout: |-
   OutputStream        DEBUG output handles: 0
   EventLoopMgr      WARNING Unable to locate service "EventSelector"
   EventLoopMgr      WARNING No events will be processed from external input.
-  HistogramDataSvc  VERBOSE ServiceLocatorHelper::service: found service IncidentSvc
-  HistogramDataSvc  VERBOSE ServiceLocatorHelper::service: found service HistogramPersistencySvc
   ApplicationMgr       INFO Application Manager Initialized successfully
   ServiceManager      DEBUG Starting service FileRecordDataSvc
   ServiceManager      DEBUG Starting service AppMgrRunable
@@ -93,8 +91,6 @@ stdout: |-
   ServiceManager      DEBUG Starting service FileCatalog
   ServiceManager      DEBUG Starting service IODataManager
   ServiceManager      DEBUG Starting service RootCnvSvc
-  ServiceManager      DEBUG Starting service HistogramPersistencySvc
-  ServiceManager      DEBUG Starting service HistogramDataSvc
   ServiceManager      DEBUG Starting service EventLoopMgr
   ApplicationMgr       INFO Application Manager Started successfully
   AlgExecStateSvc   VERBOSE reset(0)
@@ -179,8 +175,6 @@ stdout: |-
   DataCreator          INFO Adding 'D'
   OutputStream        DEBUG Algorithm 'EvenEvents' fired. Adding [0x########, 0x########, 0x########, 0x########]
   ServiceManager      DEBUG Stopping service EventLoopMgr
-  ServiceManager      DEBUG Stopping service HistogramDataSvc
-  ServiceManager      DEBUG Stopping service HistogramPersistencySvc
   ServiceManager      DEBUG Stopping service RootCnvSvc
   ServiceManager      DEBUG Stopping service IODataManager
   ServiceManager      DEBUG Stopping service FileCatalog
@@ -195,9 +189,6 @@ stdout: |-
   ApplicationMgr       INFO Application Manager Stopped successfully
   ServiceManager      DEBUG Finalizing service EventLoopMgr
   OutputStream         INFO Events output: 10
-  EventLoopMgr         INFO Histograms converted successfully according to request.
-  ServiceManager      DEBUG Finalizing service HistogramDataSvc
-  ServiceManager      DEBUG Finalizing service HistogramPersistencySvc
   ServiceManager      DEBUG Finalizing service RootCnvSvc
   ServiceManager      DEBUG Finalizing service IODataManager
   ServiceManager      DEBUG Finalizing service FileCatalog
@@ -210,7 +201,7 @@ stdout: |-
   ServiceManager      DEBUG Finalizing service AppMgrRunable
   ServiceManager      DEBUG Finalizing service FileRecordDataSvc
   ServiceManager      DEBUG Looping over all active services...
-  ServiceManager      DEBUG ---- MessageSvc (refCount = 23)
+  ServiceManager      DEBUG ---- MessageSvc (refCount = 21)
   ServiceManager      DEBUG ---- JobOptionsSvc (refCount = 2)
   ServiceManager      DEBUG ---- FileRecordDataSvc (refCount = 3)
   ServiceManager      DEBUG ---- AppMgrRunable (refCount = 3)
@@ -223,8 +214,6 @@ stdout: |-
   ServiceManager      DEBUG ---- FileCatalog (refCount = 2)
   ServiceManager      DEBUG ---- IODataManager (refCount = 2)
   ServiceManager      DEBUG ---- RootCnvSvc (refCount = 2)
-  ServiceManager      DEBUG ---- HistogramPersistencySvc (refCount = 2)
-  ServiceManager      DEBUG ---- HistogramDataSvc (refCount = 3)
   ServiceManager      DEBUG ---- EventLoopMgr (refCount = 3)
   ApplicationMgr       INFO Application Manager Finalized successfully
   ApplicationMgr       INFO Application Manager Terminated successfully
diff --git a/GaudiTestSuite/tests/pytest/refs/google_auditors/cpu_profiler.yaml b/GaudiTestSuite/tests/pytest/refs/google_auditors/cpu_profiler.yaml
index f95617b5380f2c3514f5e72a7401ac3edc57418f..cfd181b09926c1e34feddd52a83c1cc447f5e16b 100644
--- a/GaudiTestSuite/tests/pytest/refs/google_auditors/cpu_profiler.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/google_auditors/cpu_profiler.yaml
@@ -41,7 +41,6 @@ stdout: |-
   ApplicationMgr       INFO Application Manager Stopped successfully
   Google::CPUProf...   INFO Starting Auditor for HelloWorld:Finalize
   HelloWorld           INFO finalizing....
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
   ChronoStatSvc.f...   INFO  Service finalized successfully
   ApplicationMgr       INFO Application Manager Finalized successfully
diff --git a/GaudiTestSuite/tests/pytest/refs/google_auditors/heap_checker.yaml b/GaudiTestSuite/tests/pytest/refs/google_auditors/heap_checker.yaml
index c7ff17e8817c99015ecc2e7a9c6a3c0c58fe5df6..34fc6211882f34e7aec8769ba8148af8f99e7ac9 100644
--- a/GaudiTestSuite/tests/pytest/refs/google_auditors/heap_checker.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/google_auditors/heap_checker.yaml
@@ -41,7 +41,6 @@ stdout: |-
   ApplicationMgr       INFO Application Manager Stopped successfully
   Google::HeapChe...   INFO Starting Auditor for HelloWorld:Finalize
   HelloWorld           INFO finalizing....
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
   ChronoStatSvc.f...   INFO  Service finalized successfully
   ApplicationMgr       INFO Application Manager Finalized successfully
diff --git a/GaudiTestSuite/tests/pytest/refs/google_auditors/heap_profiler.yaml b/GaudiTestSuite/tests/pytest/refs/google_auditors/heap_profiler.yaml
index f2a7afcf91fc0bbb6febc13504b5442afed276c8..fcff7936af700c43868a9413799c242f2a2bd2e3 100644
--- a/GaudiTestSuite/tests/pytest/refs/google_auditors/heap_profiler.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/google_auditors/heap_profiler.yaml
@@ -41,7 +41,6 @@ stdout: |-
   ApplicationMgr       INFO Application Manager Stopped successfully
   Google::HeapPro...   INFO Starting Auditor for HelloWorld:Finalize
   HelloWorld           INFO finalizing....
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   *****Chrono*****     INFO  The Final CPU consumption ( Chrono ) Table (ordered)
   ChronoStatSvc.f...   INFO  Service finalized successfully
   ApplicationMgr       INFO Application Manager Finalized successfully
diff --git a/GaudiTestSuite/tests/pytest/refs/jira/gaudi_971.yaml b/GaudiTestSuite/tests/pytest/refs/jira/gaudi_971.yaml
index b98c43aa21a0da4403e4e019432697a8716e8d62..e21810ce48be8e5bbeb71069e1129f91b47d4088 100644
--- a/GaudiTestSuite/tests/pytest/refs/jira/gaudi_971.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/jira/gaudi_971.yaml
@@ -1222,7 +1222,6 @@ stdout: |-
   ReadAlg             DEBUG       0.111706  0.115527  0.112686 Collisions:  0 (2)  1 (3)  2 (4)
   EventLoopMgr         INFO No more events in event selection
   ApplicationMgr       INFO Application Manager Stopped successfully
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   EventSelector       DEBUG finalize()
   ToolSvc              INFO Removing all tools created by ToolSvc
   ApplicationMgr       INFO Application Manager Finalized successfully
diff --git a/GaudiTestSuite/tests/pytest/refs/ns_props.yaml b/GaudiTestSuite/tests/pytest/refs/ns_props.yaml
index 333ae7ea2b687187273ab0d02ceeab8438ad87ec..b219734cb2d5278afeaf7f383b18fe9bb8cc26e6 100644
--- a/GaudiTestSuite/tests/pytest/refs/ns_props.yaml
+++ b/GaudiTestSuite/tests/pytest/refs/ns_props.yaml
@@ -8,7 +8,6 @@ stdout: |-
   EventSelector        INFO End of event input reached.
   EventLoopMgr         INFO No more events in event selection
   ApplicationMgr       INFO Application Manager Stopped successfully
-  EventLoopMgr         INFO Histograms converted successfully according to request.
   ToolSvc              INFO Removing all tools created by ToolSvc
   ApplicationMgr       INFO Application Manager Finalized successfully
   ApplicationMgr       INFO Application Manager Terminated successfully
diff --git a/cmake/tests/testGaudiInstallation.cmake b/cmake/tests/testGaudiInstallation.cmake
index 05c666678f44d517f29cc36cc9016c1409a7e60c..0ffe8c577cad47f4528cb9c8e038ab026c255143 100644
--- a/cmake/tests/testGaudiInstallation.cmake
+++ b/cmake/tests/testGaudiInstallation.cmake
@@ -1,5 +1,5 @@
 #####################################################################################
-# (c) Copyright 2020-2024 CERN for the benefit of the LHCb and ATLAS collaborations #
+# (c) Copyright 2020-2025 CERN for the benefit of the LHCb and ATLAS collaborations #
 #                                                                                   #
 # This software is distributed under the terms of the Apache version 2 licence,     #
 # copied verbatim in the file "LICENSE".                                            #
@@ -99,7 +99,7 @@ elseif(DEFINED TEST_GAUDI_INSTALL_FILES_EXIST) # check some files that should be
         message(FATAL_ERROR "Include directory not installed correctly,"
             " Aida2ROOT.h not found in include/GaudiUtils/")
     endif()
-    if(NOT EXISTS ${GAUDI_INSTALL_DIR}/include/GaudiCommonSvc/Axis.h)
+    if(GAUDI_USE_AIDA AND NOT EXISTS ${GAUDI_INSTALL_DIR}/include/GaudiCommonSvc/Axis.h)
         message(FATAL_ERROR "Include directory not installed correctly,"
             " Axis.h not found in include/GaudiCommonSvc/")
     endif()