diff --git a/modules/src/TecModule.cc b/modules/src/TecModule.cc
index 1cc56406edddf8244955a1ca24f6f51bebf87202..d3b73efb55a06817d677a457705d30803fabb816 100644
--- a/modules/src/TecModule.cc
+++ b/modules/src/TecModule.cc
@@ -564,7 +564,6 @@ std::vector<std::shared_ptr<TecFrame>> TecModule::doTecCommunication(std::vector
 
 /**********************************************************************************************************************/
 
-
 void TecModule::ErrorLog::append(const std::string& e) {
   errorStatus = true;
   errorMessage = errorMessage + e + "\n";
diff --git a/tests/executable_src/testAllParameters.cc b/tests/executable_src/testAllParameters.cc
index 087958b66744baede3b84d89af6dbcbc7d0313d2..35107fa6cb836c1f75ebecfb1f5b1e57fd1279c9 100644
--- a/tests/executable_src/testAllParameters.cc
+++ b/tests/executable_src/testAllParameters.cc
@@ -5,16 +5,15 @@
 #define BOOST_TEST_MODULE testAllParameters
 
 // Only after defining the name include the unit test header.
-#include <boost/test/included/unit_test.hpp>
-
 #include "Server.h"
 #include "TecDummy.h"
-
 #include "TecParameters.h"
 
 #include <ChimeraTK/ApplicationCore/TestFacility.h>
 #include <ChimeraTK/BackendFactory.h>
 
+#include <boost/test/included/unit_test.hpp>
+
 #include <random>
 
 using namespace boost::unit_test_framework;
@@ -62,7 +61,6 @@ BOOST_FIXTURE_TEST_CASE(testControlSystemVariables, Fixture_t) {
       BOOST_ASSERT(false);
     }
 
-
     // if this variable exists, it has to be
     try {
       pv = pvManager->getProcessVariable("/TecModule0/" + params.pvName + "_enaPeriodicRead");
diff --git a/tests/executable_src/testCrcErrors.cc b/tests/executable_src/testCrcErrors.cc
index 050d0b7dd9249a6c77c9e6fdcbb53bb26bc003d1..2415c08c7be5ba2d573e256ab8276680d9da4716 100644
--- a/tests/executable_src/testCrcErrors.cc
+++ b/tests/executable_src/testCrcErrors.cc
@@ -4,14 +4,14 @@
 // Define a name for the test module.
 #define BOOST_TEST_MODULE testCrcError
 // Only after defining the name include the unit test header.
-#include <boost/test/included/unit_test.hpp>
-
 #include "Server.h"
 #include "TecDummy.h"
 
 #include <ChimeraTK/ApplicationCore/TestFacility.h>
 #include <ChimeraTK/BackendFactory.h>
 
+#include <boost/test/included/unit_test.hpp>
+
 using namespace boost::unit_test_framework;
 
 struct Fixture_t {
diff --git a/tests/executable_src/testErrorCodes.cc b/tests/executable_src/testErrorCodes.cc
index 0ab642bdf161b3df96e715d14461accdd529cba8..cac218aca6cffdd6c3ef9c41c5a056068c816791 100644
--- a/tests/executable_src/testErrorCodes.cc
+++ b/tests/executable_src/testErrorCodes.cc
@@ -4,14 +4,14 @@
 // Define a name for the test module.
 #define BOOST_TEST_MODULE testErrorCodes
 // Only after defining the name include the unit test header.
-#include <boost/test/included/unit_test.hpp>
-
 #include "Server.h"
 #include "TecDummy.h"
 
 #include <ChimeraTK/ApplicationCore/TestFacility.h>
 #include <ChimeraTK/BackendFactory.h>
 
+#include <boost/test/included/unit_test.hpp>
+
 using namespace boost::unit_test_framework;
 
 struct Fixture_t {
diff --git a/tests/executable_src/testHeartbeat.cc b/tests/executable_src/testHeartbeat.cc
index 2e76d4a3b9a480a7a1f467817f5ac5fd98d757f7..a92aecf8323cd7e70b613bd67cfcd04573b3a99e 100644
--- a/tests/executable_src/testHeartbeat.cc
+++ b/tests/executable_src/testHeartbeat.cc
@@ -4,14 +4,13 @@
 // Define a name for the test module.
 #define BOOST_TEST_MODULE testHeartbeat
 // Only after defining the name include the unit test header.
-#include <boost/test/included/unit_test.hpp>
-
-
 #include "Server.h"
 #include "TecDummy.h"
 
 #include <ChimeraTK/ApplicationCore/TestFacility.h>
 
+#include <boost/test/included/unit_test.hpp>
+
 namespace ctk = ChimeraTK;
 
 // Declare the server instance
diff --git a/tests/executable_src/testReadOnDemand.cc b/tests/executable_src/testReadOnDemand.cc
index 25efa36a42c672b510f7ae3c43cba582bf56ea3c..415dbeaa9950d8dab2cad58f975aad311477866c 100644
--- a/tests/executable_src/testReadOnDemand.cc
+++ b/tests/executable_src/testReadOnDemand.cc
@@ -4,12 +4,13 @@
 // Define a name for the test module.
 #define BOOST_TEST_MODULE testRead
 // Only after defining the name include the unit test header.
-#include <boost/test/included/unit_test.hpp>
-
-#include <ChimeraTK/ApplicationCore/TestFacility.h>
 #include "Server.h"
 #include "TecDummy.h"
 
+#include <ChimeraTK/ApplicationCore/TestFacility.h>
+
+#include <boost/test/included/unit_test.hpp>
+
 using namespace boost::unit_test_framework;
 using namespace ChimeraTK;
 
diff --git a/tests/executable_src/testReadPeriodic.cc b/tests/executable_src/testReadPeriodic.cc
index 22bea07e1f8896c980bb21e87e6f12c910dfba23..6dfc38aefa9858c120caf947f3b1f3d312c3099f 100644
--- a/tests/executable_src/testReadPeriodic.cc
+++ b/tests/executable_src/testReadPeriodic.cc
@@ -4,12 +4,13 @@
 // Define a name for the test module.
 #define BOOST_TEST_MODULE testReadPriodic
 // Only after defining the name include the unit test header.
-#include <boost/test/included/unit_test.hpp>
-
-#include <ChimeraTK/ApplicationCore/TestFacility.h>
 #include "Server.h"
 #include "TecDummy.h"
 
+#include <ChimeraTK/ApplicationCore/TestFacility.h>
+
+#include <boost/test/included/unit_test.hpp>
+
 using namespace boost::unit_test_framework;
 using namespace ChimeraTK;
 
diff --git a/tests/executable_src/testTecModule.cc b/tests/executable_src/testTecModule.cc
index 5454598c495c26042855d25cc7402244597bc1dc..09730c60c3cb5c4588724c2a7d821639afb5e3de 100644
--- a/tests/executable_src/testTecModule.cc
+++ b/tests/executable_src/testTecModule.cc
@@ -4,11 +4,11 @@
 // Define a name for the test module.
 #define BOOST_TEST_MODULE testTemplateServer
 // Only after defining the name include the unit test header.
-#include <boost/test/included/unit_test.hpp>
+#include "Server.h"
 
 #include <ChimeraTK/ApplicationCore/TestFacility.h>
 
-#include "Server.h"
+#include <boost/test/included/unit_test.hpp>
 
 // Declare the server instance
 static Server theServer{"tec_dummy"};
diff --git a/tests/executable_src/testTimeout.cc b/tests/executable_src/testTimeout.cc
index 554a4205f5eb8f241902fdf2aef29f5ebb071866..406d7e022f15bae321a33126daf8521adbc95968 100644
--- a/tests/executable_src/testTimeout.cc
+++ b/tests/executable_src/testTimeout.cc
@@ -4,12 +4,14 @@
 // Define a name for the test module.
 #define BOOST_TEST_MODULE testTimeout
 // Only after defining the name include the unit test header.
-#include <boost/test/included/unit_test.hpp>
-#include <ChimeraTK/ApplicationCore/TestFacility.h>
-#include <ChimeraTK/BackendFactory.h>
 #include "Server.h"
 #include "TecDummy.h"
 
+#include <ChimeraTK/ApplicationCore/TestFacility.h>
+#include <ChimeraTK/BackendFactory.h>
+
+#include <boost/test/included/unit_test.hpp>
+
 using namespace boost::unit_test_framework;
 
 struct Fixture_t {
diff --git a/tests/executable_src/testWrite.cc b/tests/executable_src/testWrite.cc
index fa2ac6dc6371a35b260480e77a764ef90051a676..f1becd4084f3fcc9a9432de5818d6f0239de851c 100644
--- a/tests/executable_src/testWrite.cc
+++ b/tests/executable_src/testWrite.cc
@@ -4,12 +4,14 @@
 // Define a name for the test module.
 #define BOOST_TEST_MODULE testWrite
 // Only after defining the name include the unit test header.
-#include <boost/test/included/unit_test.hpp>
-#include <ChimeraTK/ApplicationCore/TestFacility.h>
-#include <ChimeraTK/BackendFactory.h>
 #include "Server.h"
 #include "TecDummy.h"
 
+#include <ChimeraTK/ApplicationCore/TestFacility.h>
+#include <ChimeraTK/BackendFactory.h>
+
+#include <boost/test/included/unit_test.hpp>
+
 using namespace boost::unit_test_framework;
 
 struct Fixture_t {
diff --git a/tests/include/TecDummy.h b/tests/include/TecDummy.h
index 4ca4d25d463c11cbbf3143cc45365d91aa004994..698b7bdc4786850edcf0f8270181d0e340b5e433 100644
--- a/tests/include/TecDummy.h
+++ b/tests/include/TecDummy.h
@@ -3,13 +3,12 @@
 
 #pragma once
 
-#include <ChimeraTK/DummyBackend.h>
-#include <ChimeraTK/BackendFactory.h>
-#include <ChimeraTK/DummyRegisterAccessor.h>
-
+#include "TecErrorCode.h"
 #include <tec/TecFrame.h>
 
-#include "TecErrorCode.h"
+#include <ChimeraTK/BackendFactory.h>
+#include <ChimeraTK/DummyBackend.h>
+#include <ChimeraTK/DummyRegisterAccessor.h>
 
 struct TecDummy : ChimeraTK::DummyBackend {
   explicit TecDummy(const std::string& mapFileName) : DummyBackend(mapFileName) {
@@ -59,8 +58,8 @@ struct TecDummy : ChimeraTK::DummyBackend {
   // time again.
   size_t loopDoneDelay{0};
 
-  // Map containing error flags which will be sent back as a reply during the next communication for the given parameter.
-  // A value of zero or the absence of a value results in no error being generated.
+  // Map containing error flags which will be sent back as a reply during the next communication for the given
+  // parameter. A value of zero or the absence of a value results in no error being generated.
   std::map<TecFrame::TecParameter, TecErrorCode> errorFlags;
 
  protected:
diff --git a/tests/src/TecDummy.cc b/tests/src/TecDummy.cc
index 2c8dbb3a2d8906b3a95a65bd293a798a96654960..9ab7a04264e889d9eb0be0e7335088c736b96011 100644
--- a/tests/src/TecDummy.cc
+++ b/tests/src/TecDummy.cc
@@ -2,11 +2,12 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
 #include "TecDummy.h"
-#include <arpa/inet.h>
 
+#include <arpa/inet.h>
 #include <tec/TecFrame.h>
 
 #include <boost/crc.hpp>
+
 #include <sstream>
 
 // Read-only tec variables as per tec communication specification document