diff --git a/k4FWCore/components/PodioInput.h b/k4FWCore/components/PodioInput.h
index 1b286b0a..db70b69f 100644
--- a/k4FWCore/components/PodioInput.h
+++ b/k4FWCore/components/PodioInput.h
@@ -19,8 +19,8 @@
 #ifndef FWCORE_PODIOINPUT_H
 #define FWCORE_PODIOINPUT_H
 // Gaudi
-#include "Gaudi/Property.h"
 #include "Gaudi/Functional/Consumer.h"
+#include "Gaudi/Property.h"
 
 // STL
 #include <string>
diff --git a/test/k4FWCoreTest/src/components/ExampleEventHeaderConsumer.cpp b/test/k4FWCoreTest/src/components/ExampleEventHeaderConsumer.cpp
index db233fda..7f1f6d70 100644
--- a/test/k4FWCoreTest/src/components/ExampleEventHeaderConsumer.cpp
+++ b/test/k4FWCoreTest/src/components/ExampleEventHeaderConsumer.cpp
@@ -22,8 +22,8 @@
 
 #include "k4FWCore/BaseClass.h"
 
-#include <Gaudi/Property.h>
 #include <Gaudi/Functional/Consumer.h>
+#include <Gaudi/Property.h>
 #include <GaudiKernel/ISvcLocator.h>
 
 #include <fmt/core.h>
diff --git a/test/k4FWCoreTest/src/components/ExampleFunctionalConsumer.cpp b/test/k4FWCoreTest/src/components/ExampleFunctionalConsumer.cpp
index e4068049..8631d239 100644
--- a/test/k4FWCoreTest/src/components/ExampleFunctionalConsumer.cpp
+++ b/test/k4FWCoreTest/src/components/ExampleFunctionalConsumer.cpp
@@ -17,8 +17,8 @@
  * limitations under the License.
  */
 
-#include "Gaudi/Property.h"
 #include "Gaudi/Functional/Consumer.h"
+#include "Gaudi/Property.h"
 
 #include "edm4hep/MCParticleCollection.h"
 
diff --git a/test/k4FWCoreTest/src/components/ExampleFunctionalConsumerMultiple.cpp b/test/k4FWCoreTest/src/components/ExampleFunctionalConsumerMultiple.cpp
index 4bc3eca8..127cd4fe 100644
--- a/test/k4FWCoreTest/src/components/ExampleFunctionalConsumerMultiple.cpp
+++ b/test/k4FWCoreTest/src/components/ExampleFunctionalConsumerMultiple.cpp
@@ -17,8 +17,8 @@
  * limitations under the License.
  */
 
-#include "Gaudi/Property.h"
 #include "Gaudi/Functional/Consumer.h"
+#include "Gaudi/Property.h"
 
 #include "edm4hep/MCParticleCollection.h"
 #include "edm4hep/SimTrackerHitCollection.h"
diff --git a/test/k4FWCoreTest/src/components/ExampleFunctionalProducer.cpp b/test/k4FWCoreTest/src/components/ExampleFunctionalProducer.cpp
index 787b8911..52e649b0 100644
--- a/test/k4FWCoreTest/src/components/ExampleFunctionalProducer.cpp
+++ b/test/k4FWCoreTest/src/components/ExampleFunctionalProducer.cpp
@@ -17,8 +17,8 @@
  * limitations under the License.
  */
 
-#include "Gaudi/Property.h"
 #include "Gaudi/Functional/Producer.h"
+#include "Gaudi/Property.h"
 #include "k4FWCore/BaseClass.h"
 
 #include "edm4hep/MCParticleCollection.h"
diff --git a/test/k4FWCoreTest/src/components/ExampleFunctionalProducerMultiple.cpp b/test/k4FWCoreTest/src/components/ExampleFunctionalProducerMultiple.cpp
index 64d266e4..2a5bc97d 100644
--- a/test/k4FWCoreTest/src/components/ExampleFunctionalProducerMultiple.cpp
+++ b/test/k4FWCoreTest/src/components/ExampleFunctionalProducerMultiple.cpp
@@ -17,8 +17,8 @@
  * limitations under the License.
  */
 
-#include "Gaudi/Property.h"
 #include "Gaudi/Functional/Producer.h"
+#include "Gaudi/Property.h"
 #include "k4FWCore/BaseClass.h"
 
 #include "edm4hep/MCParticleCollection.h"
diff --git a/test/k4FWCoreTest/src/components/ExampleFunctionalTransformer.cpp b/test/k4FWCoreTest/src/components/ExampleFunctionalTransformer.cpp
index 03770cfc..7405cba8 100644
--- a/test/k4FWCoreTest/src/components/ExampleFunctionalTransformer.cpp
+++ b/test/k4FWCoreTest/src/components/ExampleFunctionalTransformer.cpp
@@ -17,8 +17,8 @@
  * limitations under the License.
  */
 
-#include "Gaudi/Property.h"
 #include "Gaudi/Functional/Transformer.h"
+#include "Gaudi/Property.h"
 
 #include "edm4hep/MCParticleCollection.h"
 #include "edm4hep/MutableMCParticle.h"
diff --git a/test/k4FWCoreTest/src/components/ExampleFunctionalTransformerMultiple.cpp b/test/k4FWCoreTest/src/components/ExampleFunctionalTransformerMultiple.cpp
index 9284671b..65ebef4f 100644
--- a/test/k4FWCoreTest/src/components/ExampleFunctionalTransformerMultiple.cpp
+++ b/test/k4FWCoreTest/src/components/ExampleFunctionalTransformerMultiple.cpp
@@ -17,8 +17,8 @@
  * limitations under the License.
  */
 
-#include "Gaudi/Property.h"
 #include "Gaudi/Functional/Transformer.h"
+#include "Gaudi/Property.h"
 
 #include "edm4hep/MCParticleCollection.h"
 #include "edm4hep/SimTrackerHitCollection.h"
diff --git a/test/k4FWCoreTest/src/components/k4FWCoreTest_AlgorithmWithTFile.h b/test/k4FWCoreTest/src/components/k4FWCoreTest_AlgorithmWithTFile.h
index 492162da..753ac0a6 100644
--- a/test/k4FWCoreTest/src/components/k4FWCoreTest_AlgorithmWithTFile.h
+++ b/test/k4FWCoreTest/src/components/k4FWCoreTest_AlgorithmWithTFile.h
@@ -65,13 +65,15 @@ class k4FWCoreTest_AlgorithmWithTFile : public Gaudi::Algorithm {
   /// Handle for the genparticles to be written
   mutable DataHandle<edm4hep::MCParticleCollection> m_mcParticleHandle{"MCParticles", Gaudi::DataHandle::Writer, this};
   /// Handle for the genvertices to be written
-  mutable DataHandle<edm4hep::SimTrackerHitCollection> m_simTrackerHitHandle{"SimTrackerHit", Gaudi::DataHandle::Writer, this};
+  mutable DataHandle<edm4hep::SimTrackerHitCollection> m_simTrackerHitHandle{"SimTrackerHit", Gaudi::DataHandle::Writer,
+                                                                             this};
 
-  mutable DataHandle<podio::UserDataCollection<float>> m_vectorFloatHandle{"VectorFloat", Gaudi::DataHandle::Writer, this};
+  mutable DataHandle<podio::UserDataCollection<float>> m_vectorFloatHandle{"VectorFloat", Gaudi::DataHandle::Writer,
+                                                                           this};
 
   /// for testing: write a second TFile by user in an algorithm
   mutable Float_t m_value;
-  TFile*  m_file;
-  TTree*  m_tree;
+  TFile*          m_file;
+  TTree*          m_tree;
 };
 #endif /* K4FWCORE_K4FWCORETEST_ALGORITHMWITHTFILE */
diff --git a/test/k4FWCoreTest/src/components/k4FWCoreTest_CheckExampleEventData.h b/test/k4FWCoreTest/src/components/k4FWCoreTest_CheckExampleEventData.h
index c0830383..bef2067f 100644
--- a/test/k4FWCoreTest/src/components/k4FWCoreTest_CheckExampleEventData.h
+++ b/test/k4FWCoreTest/src/components/k4FWCoreTest_CheckExampleEventData.h
@@ -59,8 +59,9 @@ class k4FWCoreTest_CheckExampleEventData : public Gaudi::Algorithm {
   Gaudi::Property<bool> m_keepEventNumberZero{this, "keepEventNumberZero", false,
                                               "Don't add the event number to the dummy values written"};
   /// Handle for the MCParticles to be written
-  mutable DataHandle<edm4hep::MCParticleCollection>    m_mcParticleHandle{"MCParticles", Gaudi::DataHandle::Reader, this};
-  mutable DataHandle<podio::UserDataCollection<float>> m_vectorFloatHandle{"VectorFloat", Gaudi::DataHandle::Reader, this};
+  mutable DataHandle<edm4hep::MCParticleCollection> m_mcParticleHandle{"MCParticles", Gaudi::DataHandle::Reader, this};
+  mutable DataHandle<podio::UserDataCollection<float>> m_vectorFloatHandle{"VectorFloat", Gaudi::DataHandle::Reader,
+                                                                           this};
 
   mutable int m_event{0};
 };
diff --git a/test/k4FWCoreTest/src/components/k4FWCoreTest_CreateExampleEventData.h b/test/k4FWCoreTest/src/components/k4FWCoreTest_CreateExampleEventData.h
index c015e5fe..ea1ef00a 100644
--- a/test/k4FWCoreTest/src/components/k4FWCoreTest_CreateExampleEventData.h
+++ b/test/k4FWCoreTest/src/components/k4FWCoreTest_CreateExampleEventData.h
@@ -68,13 +68,15 @@ class k4FWCoreTest_CreateExampleEventData : public Gaudi::Algorithm {
   /// Handle for the MCParticles to be written
   mutable DataHandle<edm4hep::MCParticleCollection> m_mcParticleHandle{"MCParticles", Gaudi::DataHandle::Writer, this};
   /// Handle for the SimTrackerHits to be written
-  mutable DataHandle<edm4hep::SimTrackerHitCollection> m_simTrackerHitHandle{"SimTrackerHits", Gaudi::DataHandle::Writer, this};
-  mutable DataHandle<edm4hep::TrackerHitCollection>    m_TrackerHitHandle{"TrackerHits", Gaudi::DataHandle::Writer, this};
+  mutable DataHandle<edm4hep::SimTrackerHitCollection> m_simTrackerHitHandle{"SimTrackerHits",
+                                                                             Gaudi::DataHandle::Writer, this};
+  mutable DataHandle<edm4hep::TrackerHitCollection> m_TrackerHitHandle{"TrackerHits", Gaudi::DataHandle::Writer, this};
 
   /// Handle for the Tracks to be written
   mutable DataHandle<edm4hep::TrackCollection> m_trackHandle{"Tracks", Gaudi::DataHandle::Writer, this};
 
-  mutable DataHandle<podio::UserDataCollection<float>> m_vectorFloatHandle{"VectorFloat", Gaudi::DataHandle::Writer, this};
+  mutable DataHandle<podio::UserDataCollection<float>> m_vectorFloatHandle{"VectorFloat", Gaudi::DataHandle::Writer,
+                                                                           this};
 
   mutable int m_event{0};
 };
diff --git a/test/k4FWCoreTest/src/components/k4FWCoreTest_HelloWorldAlg.h b/test/k4FWCoreTest/src/components/k4FWCoreTest_HelloWorldAlg.h
index 5f272cb9..4a39f4fc 100644
--- a/test/k4FWCoreTest/src/components/k4FWCoreTest_HelloWorldAlg.h
+++ b/test/k4FWCoreTest/src/components/k4FWCoreTest_HelloWorldAlg.h
@@ -20,8 +20,8 @@
 #define K4FWCORE_K4FWCORETEST_HELLOWORLDALG
 
 // GAUDI
-#include "Gaudi/Property.h"
 #include "Gaudi/Algorithm.h"
+#include "Gaudi/Property.h"
 
 class k4FWCoreTest_HelloWorldAlg : public Gaudi::Algorithm {
 public:
diff --git a/test/k4FWCoreTest/src/components/k4FWCoreTest_cellID_reader.h b/test/k4FWCoreTest/src/components/k4FWCoreTest_cellID_reader.h
index b2453f36..f6541243 100644
--- a/test/k4FWCoreTest/src/components/k4FWCoreTest_cellID_reader.h
+++ b/test/k4FWCoreTest/src/components/k4FWCoreTest_cellID_reader.h
@@ -53,9 +53,9 @@ class k4FWCoreTest_cellID_reader : public Gaudi::Algorithm {
 
 private:
   /// Handle for the SimTrackerHits to be read
-  mutable DataHandle<edm4hep::SimTrackerHitCollection> m_simTrackerHitReaderHandle{"SimTrackerHits", Gaudi::DataHandle::Reader,
-                                                                           this};
-  mutable MetaDataHandle<std::string>                  m_cellIDHandle{m_simTrackerHitReaderHandle, edm4hep::CellIDEncoding,
-                                             Gaudi::DataHandle::Reader};
+  mutable DataHandle<edm4hep::SimTrackerHitCollection> m_simTrackerHitReaderHandle{"SimTrackerHits",
+                                                                                   Gaudi::DataHandle::Reader, this};
+  mutable MetaDataHandle<std::string> m_cellIDHandle{m_simTrackerHitReaderHandle, edm4hep::CellIDEncoding,
+                                                     Gaudi::DataHandle::Reader};
 };
 #endif /* K4FWCORE_K4FWCORETEST_CELLID */
diff --git a/test/k4FWCoreTest/src/components/k4FWCoreTest_cellID_writer.h b/test/k4FWCoreTest/src/components/k4FWCoreTest_cellID_writer.h
index 130a00ba..824e48dd 100644
--- a/test/k4FWCoreTest/src/components/k4FWCoreTest_cellID_writer.h
+++ b/test/k4FWCoreTest/src/components/k4FWCoreTest_cellID_writer.h
@@ -55,9 +55,9 @@ class k4FWCoreTest_cellID_writer : public Gaudi::Algorithm {
 
 private:
   /// Handle for the SimTrackerHits to be written
-  mutable DataHandle<edm4hep::SimTrackerHitCollection> m_simTrackerHitWriterHandle{"SimTrackerHits", Gaudi::DataHandle::Writer,
-                                                                           this};
-  MetaDataHandle<std::string>                  m_cellIDHandle{m_simTrackerHitWriterHandle, edm4hep::CellIDEncoding,
+  mutable DataHandle<edm4hep::SimTrackerHitCollection> m_simTrackerHitWriterHandle{"SimTrackerHits",
+                                                                                   Gaudi::DataHandle::Writer, this};
+  MetaDataHandle<std::string> m_cellIDHandle{m_simTrackerHitWriterHandle, edm4hep::CellIDEncoding,
                                              Gaudi::DataHandle::Writer};
 };
 #endif /* K4FWCORE_K4FWCORETEST_CELLID_WRITER */