diff --git a/Calorimeter/CaloRec/python/CaloTopoClusterConfig.py b/Calorimeter/CaloRec/python/CaloTopoClusterConfig.py
index 604fe60492f9fd06b882ea0a157d162d7d0f4f7d..4afcf7ace0d176848dddb514696512b2322b42cf 100644
--- a/Calorimeter/CaloRec/python/CaloTopoClusterConfig.py
+++ b/Calorimeter/CaloRec/python/CaloTopoClusterConfig.py
@@ -235,8 +235,9 @@ def getTopoCalibMoments(configFlags):
 # Maybe offline reco options should be extracted from flags elsewhere
 def CaloTopoClusterCfg(configFlags,cellsname="AllCalo",clustersname="",doLCCalib=None,sequenceName='AthAlgSeq'):
     result=ComponentAccumulator()
-    from AthenaCommon.AlgSequence import AthSequencer
-    result.addSequence(AthSequencer(sequenceName))
+    if (sequenceName != 'AthAlgSeq'):
+        from AthenaCommon.AlgSequence import AthSequencer
+        result.addSequence(AthSequencer(sequenceName))
 
     if not clustersname: clustersname = "CaloTopoClusters"
 
@@ -265,8 +266,11 @@ def CaloTopoClusterCfg(configFlags,cellsname="AllCalo",clustersname="",doLCCalib
     from TileConditions.TileConditionsConfig import tileCondCfg
     result.merge(tileCondCfg(configFlags))
 
-    theCaloClusterSnapshot=CaloClusterSnapshot(OutputName=clustersname,SetCrossLinks=True)
-
+    if not doLCCalib:
+         theCaloClusterSnapshot=CaloClusterSnapshot(OutputName=clustersname+"snapshot",SetCrossLinks=True)
+    else:
+        theCaloClusterSnapshot=CaloClusterSnapshot(OutputName=clustersname,SetCrossLinks=True)
+         
     # maker tools
     TopoMaker = CaloTopoClusterMaker("TopoMaker")
         
@@ -346,15 +350,14 @@ def CaloTopoClusterCfg(configFlags,cellsname="AllCalo",clustersname="",doLCCalib
         doLCCalib = configFlags.Calo.TopoCluster.doTopoClusterLocalCalib
     if doLCCalib:
         CaloTopoCluster.ClusterCorrectionTools += [theCaloClusterSnapshot]
-        if not clustersname:
-            CaloTopoCluster.ClustersOutputName="CaloCalTopoClusters"
+        #if not clustersname:
+        CaloTopoCluster.ClustersOutputName="CaloCalTopoClusters"
         CaloTopoCluster.ClusterCorrectionTools += getTopoClusterLocalCalibTools(configFlags)
 
-        # Needed?
-        from CaloRec import CaloClusterTopoCoolFolder
+        from CaloRec.CaloTopoClusterConfig import caloTopoCoolFolderCfg
+        result.merge(caloTopoCoolFolderCfg(configFlags))
 
     result.addEventAlgo(CaloTopoCluster,primary=True,sequenceName=sequenceName)
-
     return result
 
 
@@ -370,7 +373,7 @@ if __name__=="__main__":
 
     #log.setLevel(DEBUG)
 
-    ConfigFlags.Input.Files = ["myESD-data.pool.root"]
+    ConfigFlags.Input.Files = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecExRecoTest/mc16_13TeV.361022.Pythia8EvtGen_A14NNPDF23LO_jetjet_JZ2W.recon.ESD.e3668_s3170_r10572_homeMade.pool.root"]
     ConfigFlags.Output.ESDFileName="esdOut.pool.root"
 
     ConfigFlags.lock()
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_calotopoclustering_fromesd_newJobConfig.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_calotopoclustering_fromesd_newJobConfig.sh
new file mode 100755
index 0000000000000000000000000000000000000000..530dd9931cea456bbde692e403deb41c110f17ef
--- /dev/null
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_calotopoclustering_fromesd_newJobConfig.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# art-description: Athena runs topoclustering from an ESD file
+# art-type: grid
+# art-include: master/Athena
+
+python $Athena_DIR/python/CaloRec/CaloTopoClusterConfig.py | tee temp.log
+echo "art-result: ${PIPESTATUS[0]}"
+
+test_postProcessing_Errors.sh temp.log
diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_pflow_and_jets_fromesd_newJobConfig.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_pflow_and_jets_fromesd_newJobConfig.sh
new file mode 100755
index 0000000000000000000000000000000000000000..86cd62a24238de490e0d69207edb00870a1b667c
--- /dev/null
+++ b/Reconstruction/RecExample/RecExRecoTest/test/test_recexreco_art_pflow_and_jets_fromesd_newJobConfig.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# art-description: Athena runs topoclustering from an ESD file
+# art-type: grid
+# art-include: master/Athena
+
+python $Athena_DIR/python/eflowRec/PFRun3Config.py | tee temp.log
+echo "art-result: ${PIPESTATUS[0]}"
+
+test_postProcessing_Errors.sh temp.log
diff --git a/Reconstruction/eflowRec/python/PFRun3Config.py b/Reconstruction/eflowRec/python/PFRun3Config.py
index 40ea28bf3b291137f817c22c8336634c8f3f5125..ccf5e16f3a4fc839b10a5d0e02f0383becdb8f48 100644
--- a/Reconstruction/eflowRec/python/PFRun3Config.py
+++ b/Reconstruction/eflowRec/python/PFRun3Config.py
@@ -157,7 +157,7 @@ def PFCfg(inputFlags,**kwargs):
     #Alias calibrated topoclusters, if they exist already, such that overwrite won't fial
     from SGComps.AddressRemappingConfig import InputRenameCfg
     result.merge(InputRenameCfg("xAOD::CaloClusterContainer","CaloCalTopoClusters",""))
-
+    
     #Setup up general geometry
     from AtlasGeoModel.GeoModelConfig import GeoModelCfg
     result.merge(GeoModelCfg(inputFlags))
@@ -221,7 +221,7 @@ def PFCfg(inputFlags,**kwargs):
     #Configure topocluster algorithmsm, and associated conditions
     from CaloRec.CaloTopoClusterConfig import CaloTopoClusterCfg
     result.merge(CaloTopoClusterCfg(inputFlags))
-
+    
     from CaloRec.CaloTopoClusterConfig import caloTopoCoolFolderCfg
     result.merge(caloTopoCoolFolderCfg(inputFlags))
 
@@ -240,7 +240,7 @@ def PFCfg(inputFlags,**kwargs):
     PFOChargedCreatorAlgorithm, PFONeutralCreatorAlgorithm = getPFOCreators(inputFlags)
     result.addEventAlgo(PFOChargedCreatorAlgorithm)
     result.addEventAlgo(PFONeutralCreatorAlgorithm)
-    
+
     return result
 
 if __name__=="__main__":