diff --git a/Core/Beam/FootprintFactorGaussian.cpp b/Core/Beam/FootprintFactorGaussian.cpp
index d87a786b12efc934b60261924a7d6d9e5b4bcb1b..dddd27ca78adb319c0a9e8b2778a65c14a8d312f 100644
--- a/Core/Beam/FootprintFactorGaussian.cpp
+++ b/Core/Beam/FootprintFactorGaussian.cpp
@@ -14,8 +14,8 @@
 
 #include "Core/Beam/FootprintFactorGaussian.h"
 #include "Core/Basics/MathConstants.h"
-#include "Core/Tools/PythonFormatting.h"
 #include "Core/Tools/MathFunctions.h"
+#include "Core/Tools/PythonFormatting.h"
 
 FootprintFactorGaussian::FootprintFactorGaussian(double width_ratio) : IFootprintFactor(width_ratio)
 {
diff --git a/Core/Export/SampleToPython.cpp b/Core/Export/SampleToPython.cpp
index b8c5cad51b21d5e70f443e1b6187181d718ab8d5..d346a3c6028b1424728d6b0b0c505c4b04936ece 100644
--- a/Core/Export/SampleToPython.cpp
+++ b/Core/Export/SampleToPython.cpp
@@ -15,7 +15,6 @@
 #include "Core/Export/SampleToPython.h"
 #include "Core/Aggregate/ParticleLayout.h"
 #include "Core/Export/INodeUtils.h"
-#include "Core/Tools/PythonFormatting.h"
 #include "Core/Export/SampleLabelHandler.h"
 #include "Core/Lattice/Lattice.h"
 #include "Core/Material/Material.h"
@@ -31,6 +30,7 @@
 #include "Core/Particle/ParticleCoreShell.h"
 #include "Core/Particle/ParticleDistribution.h"
 #include "Core/Scattering/IFormFactor.h"
+#include "Core/Tools/PythonFormatting.h"
 #include "Core/includeIncludes/InterferenceFunctions.h"
 #include <iomanip>
 #include <map>
diff --git a/Core/Export/SimulationToPython.cpp b/Core/Export/SimulationToPython.cpp
index 983a09aaaf61791b82372be78abaf355be4bfe58..ea19e637d842051c86845a667fb4c63132482b02 100644
--- a/Core/Export/SimulationToPython.cpp
+++ b/Core/Export/SimulationToPython.cpp
@@ -18,7 +18,6 @@
 #include "Core/Computation/ConstantBackground.h"
 #include "Core/Computation/PoissonNoiseBackground.h"
 #include "Core/Export/INodeUtils.h"
-#include "Core/Tools/PythonFormatting.h"
 #include "Core/Export/SampleToPython.h"
 #include "Core/Instrument/ConvolutionDetectorResolution.h"
 #include "Core/Instrument/ISpecularScan.h"
@@ -30,6 +29,7 @@
 #include "Core/Simulation/GISASSimulation.h"
 #include "Core/Simulation/OffSpecSimulation.h"
 #include "Core/Simulation/SpecularSimulation.h"
+#include "Core/Tools/PythonFormatting.h"
 #include <iomanip>
 
 using namespace PythonFormatting;
diff --git a/Core/Instrument/AngularSpecScan.cpp b/Core/Instrument/AngularSpecScan.cpp
index 6d87ec67c97bfb66e74f9ce106067faec14a91b8..6513c1a9c63588eb1ae84634e47cc66004663d17 100644
--- a/Core/Instrument/AngularSpecScan.cpp
+++ b/Core/Instrument/AngularSpecScan.cpp
@@ -16,11 +16,11 @@
 #include "Core/Beam/IFootprintFactor.h"
 #include "Core/Binning/FixedBinAxis.h"
 #include "Core/Binning/PointwiseAxis.h"
-#include "Core/Tools/PythonFormatting.h"
 #include "Core/Instrument/ScanResolution.h"
 #include "Core/Parametrization/ParameterSample.h"
 #include "Core/Parametrization/RangedDistributions.h"
 #include "Core/SimulationElement/SpecularSimulationElement.h"
+#include "Core/Tools/PythonFormatting.h"
 #include "Fit/Tools/RealLimits.h"
 
 namespace
diff --git a/Core/Instrument/QSpecScan.cpp b/Core/Instrument/QSpecScan.cpp
index 0b0c8b83ee894225dc1d42dcbd12c7a448c27118..dd5d30a2563320561a90e18b585c9f3a8e6b7fc9 100644
--- a/Core/Instrument/QSpecScan.cpp
+++ b/Core/Instrument/QSpecScan.cpp
@@ -15,11 +15,11 @@
 #include "Core/Instrument/QSpecScan.h"
 #include "Core/Binning/FixedBinAxis.h"
 #include "Core/Binning/PointwiseAxis.h"
-#include "Core/Tools/PythonFormatting.h"
 #include "Core/Instrument/ScanResolution.h"
 #include "Core/Parametrization/ParameterSample.h"
 #include "Core/Parametrization/RangedDistributions.h"
 #include "Core/SimulationElement/SpecularSimulationElement.h"
+#include "Core/Tools/PythonFormatting.h"
 #include "Fit/Tools/RealLimits.h"
 
 namespace
diff --git a/Core/Instrument/ScanResolution.cpp b/Core/Instrument/ScanResolution.cpp
index 464bb2cd76e516dba22b7fcd1f6c505af12610cf..a5afec61e2b21018737eb6e9e142f16c0c5e687b 100644
--- a/Core/Instrument/ScanResolution.cpp
+++ b/Core/Instrument/ScanResolution.cpp
@@ -13,8 +13,8 @@
 // ************************************************************************** //
 
 #include "Core/Instrument/ScanResolution.h"
-#include "Core/Tools/PythonFormatting.h"
 #include "Core/Parametrization/RangedDistributions.h"
+#include "Core/Tools/PythonFormatting.h"
 
 namespace
 {
diff --git a/Core/Parametrization/RangedDistributions.cpp b/Core/Parametrization/RangedDistributions.cpp
index 5ea705224b01f1815c69132f06286b3de1221d42..51b43748a2539ee475f851f642c5a8cb82855bcc 100644
--- a/Core/Parametrization/RangedDistributions.cpp
+++ b/Core/Parametrization/RangedDistributions.cpp
@@ -13,9 +13,9 @@
 // ************************************************************************** //
 
 #include "Core/Parametrization/RangedDistributions.h"
-#include "Core/Tools/PythonFormatting.h"
 #include "Core/Parametrization/Distributions.h"
 #include "Core/Parametrization/ParameterSample.h"
+#include "Core/Tools/PythonFormatting.h"
 #include <limits>
 
 namespace
diff --git a/Core/Tools/PyEmbeddedUtils.cpp b/Core/Tools/PyEmbeddedUtils.cpp
index 831fe6ec116c4643b1cc236f24f7915d81a05830..279516677382b6c4c0d0759410bcfafa91ab866e 100644
--- a/Core/Tools/PyEmbeddedUtils.cpp
+++ b/Core/Tools/PyEmbeddedUtils.cpp
@@ -13,9 +13,9 @@
 // ************************************************************************** //
 
 #include "Core/Tools/PyEmbeddedUtils.h"
-#include "Core/Tools/PythonFormatting.h"
 #include "Core/Multilayer/MultiLayer.h"
 #include "Core/Tools/PythonCore.h"
+#include "Core/Tools/PythonFormatting.h"
 #include "Core/Tools/SysUtils.h"
 #include <iostream>
 #include <stdexcept>
diff --git a/GUI/coregui/Models/JobModelFunctions.cpp b/GUI/coregui/Models/JobModelFunctions.cpp
index 5ea8e6047f817b5b93999790c2fb2696a90b5732..ac3caee92ffa8f8c67a259e3a3cb07818f6ba6e3 100644
--- a/GUI/coregui/Models/JobModelFunctions.cpp
+++ b/GUI/coregui/Models/JobModelFunctions.cpp
@@ -274,8 +274,8 @@ void createFitContainers(JobItem* jobItem)
 
     fitSuiteItem = model->insertNewItem("FitSuite", jobItem->index(), -1, JobItem::T_FIT_SUITE);
 
-    SessionItem* parsContainerItem = fitSuiteItem->getItem(
-        FitSuiteItem::T_FIT_PARAMETERS_CONTAINER);
+    SessionItem* parsContainerItem =
+        fitSuiteItem->getItem(FitSuiteItem::T_FIT_PARAMETERS_CONTAINER);
     if (parsContainerItem != nullptr) {
         throw GUIHelpers::Error("JobModel::createFitContainers() -> Error. Attempt to create "
                                 "a second FitParameterContainer.");
diff --git a/GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.cpp b/GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.cpp
index 802a4f464a3ec92d0356c0f96b4d5c37255dcbcc..6332bfff06213b1a28783943273fb45b390f42ce 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.cpp
@@ -13,9 +13,9 @@
 // ************************************************************************** //
 
 #include "GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.h"
-#include "Core/Tools/PythonFormatting.h"
 #include "Core/Instrument/Histogram1D.h"
 #include "Core/Instrument/Histogram2D.h"
+#include "Core/Tools/PythonFormatting.h"
 #include "GUI/coregui/Models/IntensityDataItem.h"
 #include "GUI/coregui/Models/MaskItems.h"
 #include "GUI/coregui/Models/ProjectionItems.h"
diff --git a/Tests/Functional/Core/CoreSpecial/BatchSimulation.cpp b/Tests/Functional/Core/CoreSpecial/BatchSimulation.cpp
index 5731c0851aa694a3632581ec8ade32a2cf9b3a84..c722ad6829ed1f8e6a64e853cfb77f2be74bd87b 100644
--- a/Tests/Functional/Core/CoreSpecial/BatchSimulation.cpp
+++ b/Tests/Functional/Core/CoreSpecial/BatchSimulation.cpp
@@ -19,7 +19,9 @@
 #include <iostream>
 #include <memory>
 
-class BatchSimulation : public ::testing::Test {};
+class BatchSimulation : public ::testing::Test
+{
+};
 
 TEST_F(BatchSimulation, BatchSimulation)
 {
diff --git a/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp b/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp
index 98fb450666421653cb63c1efb835cf64682ac325..702f25cd378fc9f1c49b70a301f5e61cfffe2629 100644
--- a/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp
+++ b/Tests/Functional/Core/CoreSpecial/CoreIOPathTest.cpp
@@ -42,7 +42,9 @@ bool test_io(const OutputData<double>* data, const std::string& file_name)
 
 } // namespace
 
-class CoreIOPathTest : public ::testing::Test {};
+class CoreIOPathTest : public ::testing::Test
+{
+};
 
 TEST_F(CoreIOPathTest, CoreIOPath)
 {
@@ -63,6 +65,6 @@ TEST_F(CoreIOPathTest, CoreIOPath)
     // tests file writing and directory creation when dirname contains cyrillic characters
     boost::filesystem::path test_subdir_rus(dirname_rus);
     FileSystemUtils::createDirectories((test_dir / test_subdir / test_subdir_rus).string());
-    EXPECT_TRUE(test_io(data.get(),
-                        (test_dir / test_subdir / test_subdir_rus / test_file).string()));
+    EXPECT_TRUE(
+        test_io(data.get(), (test_dir / test_subdir / test_subdir_rus / test_file).string()));
 }
diff --git a/Tests/Functional/Core/CoreSpecial/FourierTransformationTest.cpp b/Tests/Functional/Core/CoreSpecial/FourierTransformationTest.cpp
index 11c7aec7dc27c8a04c9437690e674c3bff339122..ad044d81421bf1b5ff588c9d473d8e9f2d7905cb 100644
--- a/Tests/Functional/Core/CoreSpecial/FourierTransformationTest.cpp
+++ b/Tests/Functional/Core/CoreSpecial/FourierTransformationTest.cpp
@@ -34,11 +34,14 @@ std::vector<std::string> inputImages()
 }
 
 //! Returns location of images to test fft.
-std::string inputImageDir() { return BATesting::CoreReferenceDir(); }
+std::string inputImageDir()
+{
+    return BATesting::CoreReferenceDir();
+}
 
 //! Returns file names with paths to test fft.
 std::vector<std::string> inputImageNames()
-    {
+{
     std::vector<std::string> result;
     for (auto name : inputImages())
         result.push_back(FileSystemUtils::jointPath(inputImageDir(), name));
@@ -47,17 +50,23 @@ std::vector<std::string> inputImageNames()
 }
 
 //! Returns name of directory with fft images for reference.
-std::string fftReferenceDir() { return BATesting::CoreReferenceDir(); }
+std::string fftReferenceDir()
+{
+    return BATesting::CoreReferenceDir();
+}
 
 //! Returns name of fft image based on given image name.
 std::string fftReferenceImage(const std::string& input_image)
-    {
+{
     auto filename = FileSystemUtils::filename(input_image);
     return FileSystemUtils::jointPath(fftReferenceDir(), "FourierTransformation_" + filename);
 }
 
 //! Returns name of directory for output fft images.
-std::string outputDir() { return BATesting::CoreOutputDir(); }
+std::string outputDir()
+{
+    return BATesting::CoreOutputDir();
+}
 
 //! Runs test over one image. Returns true upon success.
 bool test_fft(const std::string& input_image_name, const std::string& reference_fft_name)
@@ -105,8 +114,9 @@ bool test_fft(const std::string& input_image_name, const std::string& reference_
 
 } // namespace
 
-
-class FourierTransformationTest : public ::testing::Test {};
+class FourierTransformationTest : public ::testing::Test
+{
+};
 
 TEST_F(FourierTransformationTest, FourierTransformation)
 {
diff --git a/Tests/Functional/Core/CoreStandardTest/CoreStandardTest.cpp b/Tests/Functional/Core/CoreStandardTest/CoreStandardTest.cpp
index 9c335b1d52e8990a315a1037fc691b6bf7012738..c983109e50d599a0a4ed926dc3dd7abc881e1166 100644
--- a/Tests/Functional/Core/CoreStandardTest/CoreStandardTest.cpp
+++ b/Tests/Functional/Core/CoreStandardTest/CoreStandardTest.cpp
@@ -26,7 +26,7 @@ bool CoreStandardTest::runTest()
     std::unique_ptr<OutputData<double>> reference;
 
     // Load reference if available
-    assert(m_name!="");
+    assert(m_name != "");
     try {
         reference.reset(IntensityDataIOFactory::readOutputData(
             FileSystemUtils::jointPath(BATesting::CoreReferenceDir(), m_name + ".int.gz")));
diff --git a/Tests/Functional/Core/SelfConsistenceTest/SelfConsistenceTest.cpp b/Tests/Functional/Core/SelfConsistenceTest/SelfConsistenceTest.cpp
index 17d28c3b1b9318ae1082b0e9498888e35c4c70fe..a7d3f73df384ac0c1d0d3cffa32e3af749a4e0ab 100644
--- a/Tests/Functional/Core/SelfConsistenceTest/SelfConsistenceTest.cpp
+++ b/Tests/Functional/Core/SelfConsistenceTest/SelfConsistenceTest.cpp
@@ -33,8 +33,7 @@ std::string composeName(std::string d_name, std::string test_name, size_t index)
 SelfConsistenceTest::SelfConsistenceTest(const std::string& name,
                                          std::vector<std::unique_ptr<Simulation>> simulations,
                                          double threshold)
-    : m_name(name), m_simulations(std::move(simulations)),
-      m_threshold(threshold)
+    : m_name(name), m_simulations(std::move(simulations)), m_threshold(threshold)
 {
     assert(m_simulations.size() >= 2); // need at least two simulations to compare
 }
diff --git a/Tests/Functional/Core/SelfConsistenceTest/SelfConsistenceTestService.cpp b/Tests/Functional/Core/SelfConsistenceTest/SelfConsistenceTestService.cpp
index 8f3b26ef28e99b485c2939ae9d9dc3c6256dd835..ba62e333cfdc069c93700373a93e0480ccd2eca6 100644
--- a/Tests/Functional/Core/SelfConsistenceTest/SelfConsistenceTestService.cpp
+++ b/Tests/Functional/Core/SelfConsistenceTest/SelfConsistenceTestService.cpp
@@ -34,7 +34,7 @@ bool SelfConsistenceTestService::execute(int argc, char** argv)
         simulations.push_back(std::move(simulation));
     }
 
-    auto test = std::make_unique<SelfConsistenceTest>(info.m_test_name,
-                                                      std::move(simulations), info.m_threshold);
+    auto test = std::make_unique<SelfConsistenceTest>(info.m_test_name, std::move(simulations),
+                                                      info.m_threshold);
     return test->runTest();
 }
diff --git a/Tests/Functional/Python/PyEmbedded/TestCases.cpp b/Tests/Functional/Python/PyEmbedded/TestCases.cpp
index 5b0e58b70e2c0d94fd89f340711964aa5305076e..226d0ece36c9cd2500a950b29a5c35e0713a041c 100644
--- a/Tests/Functional/Python/PyEmbedded/TestCases.cpp
+++ b/Tests/Functional/Python/PyEmbedded/TestCases.cpp
@@ -16,12 +16,12 @@
 #include "BABuild.h"
 #include "BAVersion.h"
 #include "Core/Export/ExportToPython.h"
-#include "Core/Tools/PythonFormatting.h"
 #include "Core/Multilayer/MultiLayer.h"
 #include "Core/StandardSamples/SampleBuilderFactory.h"
 #include "Core/Tools/PyEmbeddedUtils.h"
 #include "Core/Tools/PyImport.h"
 #include "Core/Tools/PythonCore.h"
+#include "Core/Tools/PythonFormatting.h"
 #include "Core/Tools/SysUtils.h"
 #include <iostream>
 #include <sstream>
diff --git a/Tests/Functional/Python/PyStandard/PyStandardTest.cpp b/Tests/Functional/Python/PyStandard/PyStandardTest.cpp
index 8e047a46c5609bf07b42d4bf44537e33beec35af..37e19d2f9f59a486fa6e1c289f7e89f4c9977c83 100644
--- a/Tests/Functional/Python/PyStandard/PyStandardTest.cpp
+++ b/Tests/Functional/Python/PyStandard/PyStandardTest.cpp
@@ -27,9 +27,8 @@
 bool PyStandardTest::runTest()
 {
     // Set output data filename, and remove old output files
-    assert(m_name!="");
-    std::string output_name =
-        FileSystemUtils::jointPath(BATesting::PyStandardOutputDir(), m_name);
+    assert(m_name != "");
+    std::string output_name = FileSystemUtils::jointPath(BATesting::PyStandardOutputDir(), m_name);
     std::string output_path = output_name + ".ref.int.gz";
     std::remove(output_path.c_str());
     std::cout << "Removed old output " << output_path << "\n";
diff --git a/Tests/Functional/TestMachinery/IStandardTest.cpp b/Tests/Functional/TestMachinery/IStandardTest.cpp
index dbf8a4b77ec1f772b4456288b083b95e01a1d537..455e7d01960e9bd75ca24a961bbc417744a2e456 100644
--- a/Tests/Functional/TestMachinery/IStandardTest.cpp
+++ b/Tests/Functional/TestMachinery/IStandardTest.cpp
@@ -15,10 +15,9 @@
 #include "Tests/Functional/TestMachinery/IStandardTest.h"
 #include "Core/Simulation/Simulation.h"
 
-IStandardTest::IStandardTest(const std::string& name,
-                             const Simulation& simulation, double threshold)
-    : m_name(name), m_reference_simulation(simulation.clone()),
-      m_threshold(threshold)
+IStandardTest::IStandardTest(const std::string& name, const Simulation& simulation,
+                             double threshold)
+    : m_name(name), m_reference_simulation(simulation.clone()), m_threshold(threshold)
 {
 }
 
diff --git a/Tests/Functional/TestMachinery/IStandardTest.h b/Tests/Functional/TestMachinery/IStandardTest.h
index 3125af88116d26efe929f88a355bd68367d4fac8..a852e49565c979ed63d707042e8af38f3d3b5d80 100644
--- a/Tests/Functional/TestMachinery/IStandardTest.h
+++ b/Tests/Functional/TestMachinery/IStandardTest.h
@@ -28,8 +28,7 @@ class GISASSimulation;
 class BA_CORE_API_ IStandardTest : public IFunctionalTest
 {
 public:
-    IStandardTest(const std::string& name,
-                  const Simulation& simulation, double threshold);
+    IStandardTest(const std::string& name, const Simulation& simulation, double threshold);
 
     ~IStandardTest();
 
diff --git a/Tests/Functional/TestMachinery/ObjectiveTestFunctions.h b/Tests/Functional/TestMachinery/ObjectiveTestFunctions.h
index 336863181f8efb660781718afc76dfe4f5675c4b..14a304424031d3d05bdddcdd5ce01a13a65ea465 100644
--- a/Tests/Functional/TestMachinery/ObjectiveTestFunctions.h
+++ b/Tests/Functional/TestMachinery/ObjectiveTestFunctions.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef OBJECTIVETESTFUNCTIONS_G
-#define OBJECTIVETESTFUNCTIONS_G
+#ifndef BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_OBJECTIVETESTFUNCTIONS_H
+#define BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_OBJECTIVETESTFUNCTIONS_H
 
 #include "Wrap/WinDllMacros.h"
 #include <vector>
@@ -32,4 +32,4 @@ BA_CORE_API_ double DecayingSin(double x, const std::vector<double>& par);
 
 } // namespace TestFunctions
 
-#endif
+#endif // BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_OBJECTIVETESTFUNCTIONS_H
diff --git a/Tests/Functional/TestMachinery/StandardTestService.h b/Tests/Functional/TestMachinery/StandardTestService.h
index fcf1e4fe1c429d9ab2e62764bc56cd0131e4f3dc..515c253bd06b28327ea069d628774f2e3fd1f000 100644
--- a/Tests/Functional/TestMachinery/StandardTestService.h
+++ b/Tests/Functional/TestMachinery/StandardTestService.h
@@ -30,8 +30,8 @@ public:
     bool execute(int argc, char** argv);
 
 private:
-    virtual IFunctionalTest* createStdTest(const std::string& name,
-                                           const Simulation& simulation, double threshold) = 0;
+    virtual IFunctionalTest* createStdTest(const std::string& name, const Simulation& simulation,
+                                           double threshold) = 0;
 };
 
 //! @brief
@@ -43,8 +43,8 @@ template <typename T> class StandardTestService : public StandardTestServiceBase
 {
 
 private:
-    IFunctionalTest* createStdTest(const std::string& name,
-                                   const Simulation& simulation, double threshold) override
+    IFunctionalTest* createStdTest(const std::string& name, const Simulation& simulation,
+                                   double threshold) override
     {
         return new T(name, simulation, threshold);
     }
diff --git a/Tests/Functional/TestMachinery/TestService.h b/Tests/Functional/TestMachinery/TestService.h
index e1a889bbe7be422d5d3b0450cf5c27c8c31ea66b..4e27e54bccc4fcc5c5543b139adda5cc91d2ff33 100644
--- a/Tests/Functional/TestMachinery/TestService.h
+++ b/Tests/Functional/TestMachinery/TestService.h
@@ -29,9 +29,9 @@ template <typename T> class BA_CORE_API_ TestService
 public:
     bool execute(int argc, char** argv)
     {
-        assert(argc>1);
+        assert(argc > 1);
         std::string test_name = argv[1];
-        assert(test_name!="");
+        assert(test_name != "");
         assert(m_test_factory.contains(test_name));
         auto test = m_test_factory.createTest(test_name);
         assert(test);
diff --git a/Tests/Performance/Benchmark.h b/Tests/Performance/Benchmark.h
index d3865dc4cb4d7f40c54a19f4539594f212c74dcb..a1b7d1007f853f5fc77688248014b676fea9bf87 100644
--- a/Tests/Performance/Benchmark.h
+++ b/Tests/Performance/Benchmark.h
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_BENCHMARK_H
-#define BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_BENCHMARK_H
+#ifndef BORNAGAIN_TESTS_PERFORMANCE_BENCHMARK_H
+#define BORNAGAIN_TESTS_PERFORMANCE_BENCHMARK_H
 
 #include "Core/Tools/OrderedMap.h"
 #include "Fit/Tools/WallclockTimer.h"
@@ -62,4 +62,4 @@ private:
     BenchmarkMap m_data;
 };
 
-#endif // BORNAGAIN_TESTS_FUNCTIONAL_TESTMACHINERY_BENCHMARK_H
+#endif // BORNAGAIN_TESTS_PERFORMANCE_BENCHMARK_H
diff --git a/Tests/Performance/Core/CoreIO.cpp b/Tests/Performance/Core/CoreIO.cpp
index 241ff676c3b2da71f527ca3dad9011aee864baec..e735b2e6698783ddbc3acfe8a30d236cf907ea50 100644
--- a/Tests/Performance/Core/CoreIO.cpp
+++ b/Tests/Performance/Core/CoreIO.cpp
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#include "Core/Instrument/OutputData.h"
 #include "Core/InputOutput/IntensityDataIOFactory.h"
+#include "Core/Instrument/OutputData.h"
 #include "Core/Tools/Numeric.h"
 #include "Tests/Performance/Benchmark.h"
 #include <boost/format.hpp>
@@ -22,21 +22,22 @@
 #include <iostream>
 #include <random>
 
-namespace {
+namespace
+{
 
-    struct TestResults {
-        int m_nx;
-        int m_ny;
-        std::string m_file_format;
-        bool m_data_type;
-        double m_create_data_time;
-        double m_clone_data_time;
-        double m_read_time;
-        double m_write_time;
-        double m_biggest_diff;
-    };
+struct TestResults {
+    int m_nx;
+    int m_ny;
+    std::string m_file_format;
+    bool m_data_type;
+    double m_create_data_time;
+    double m_clone_data_time;
+    double m_read_time;
+    double m_write_time;
+    double m_biggest_diff;
+};
 
-    std::vector<TestResults> results;
+std::vector<TestResults> results;
 
 std::unique_ptr<OutputData<double>> createData(int nx, int ny, bool fill)
 {
@@ -140,7 +141,7 @@ std::string report()
 
 } // namespace
 
-int main ()
+int main()
 {
     bool success(true);
 
diff --git a/Tests/Performance/Core/Mesocrystal.cpp b/Tests/Performance/Core/Mesocrystal.cpp
index 3ec3fd3149bdf51480e9add430bd2251e578d216..138d035a4691b97aaf347855a11f570f9c1698b5 100644
--- a/Tests/Performance/Core/Mesocrystal.cpp
+++ b/Tests/Performance/Core/Mesocrystal.cpp
@@ -12,6 +12,7 @@
 //
 // ************************************************************************** //
 
+#include "Core/Particle/MesoCrystal.h"
 #include "Core/Aggregate/ParticleLayout.h"
 #include "Core/HardParticle/FormFactorCylinder.h"
 #include "Core/Instrument/RectangularDetector.h"
@@ -24,9 +25,7 @@
 #include "Core/Multilayer/LayerRoughness.h"
 #include "Core/Multilayer/MultiLayer.h"
 #include "Core/Parametrization/Units.h"
-#include "Core/Parametrization/Units.h"
 #include "Core/Particle/Crystal.h"
-#include "Core/Particle/MesoCrystal.h"
 #include "Core/Particle/Particle.h"
 #include "Core/Particle/ParticleComposition.h"
 #include "Core/Simulation/GISASSimulation.h"
@@ -64,7 +63,6 @@ Lattice createLattice(double a, double c)
 
 } // namespace
 
-
 using Units::deg;
 using Units::nm;
 
@@ -192,7 +190,6 @@ MesoCrystalPerformanceBuilder::createMeso(Material material, const IFormFactor&
     return std::make_unique<MesoCrystal>(npc, form_factor);
 }
 
-
 int main()
 {
     GISASSimulation simulation;
diff --git a/Tests/Performance/Core/Threading.cpp b/Tests/Performance/Core/Threading.cpp
index 6629ef4ec74077dfb3bbf1a19b3e063c88ca183e..2eb6b1608e290685c34ac53a5e4e862dbf14444b 100644
--- a/Tests/Performance/Core/Threading.cpp
+++ b/Tests/Performance/Core/Threading.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tests/Performance/Core/MultiThreadPerformanceTest.cpp
+//! @file      Tests/Performance/Core/Threading.cpp
 //! @brief     Implements MultiThreadPerformanceTest class
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,7 +12,6 @@
 //
 // ************************************************************************** //
 
-#include "Tests/Performance/Core/ThreadingComponents.h"
 #include "Core/Multilayer/MultiLayer.h"
 #include "Core/Parametrization/Distributions.h"
 #include "Core/Parametrization/ParameterPattern.h"
@@ -20,20 +19,20 @@
 #include "Core/Simulation/GISASSimulation.h"
 #include "Core/StandardSamples/CylindersBuilder.h"
 #include "Core/StandardSamples/ParaCrystalBuilder.h"
+#include "Tests/Performance/Core/ThreadingComponents.h"
 #include <algorithm>
 #include <boost/format.hpp>
 #include <chrono>
 #include <functional>
 #include <iomanip>
 #include <iostream>
+#include <map>
 #include <memory>
 #include <thread>
-#include <map>
 #include <vector>
 
 using namespace TestComponents;
 
-
 //! Functional test to validate multi-thread performance.
 //! Two aspects are addressed: performance scaling with number of threads, influence of
 //! simulation settings on scaling.
@@ -124,7 +123,6 @@ std::vector<size_t> threads_to_measure()
 
 } // namespace
 
-
 bool MultiThreadPerformanceTest::runTest()
 {
     std::cout << "MultiThreadPerformanceTest::runTest()" << std::endl;
diff --git a/Tests/Performance/Core/Threading.h b/Tests/Performance/Core/Threading.h
index ad9bdb094aee442f6bede58fb2ea30d3bd701504..73dc5a527c24cce91e8994421d7bbd801f11ea96 100644
--- a/Tests/Performance/Core/Threading.h
+++ b/Tests/Performance/Core/Threading.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tests/Performance/Core/MultiThreadPerformanceTest.h
+//! @file      Tests/Performance/Core/Threading.h
 //! @brief     Defines MultiThreadPerformanceTest class
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_TESTS_CORE_PERFORMANCE_MULTITHREADPERFORMANCETEST_H
-#define BORNAGAIN_TESTS_CORE_PERFORMANCE_MULTITHREADPERFORMANCETEST_H
+#ifndef BORNAGAIN_TESTS_PERFORMANCE_CORE_THREADING_H
+#define BORNAGAIN_TESTS_PERFORMANCE_CORE_THREADING_H
 
 #include <map>
 #include <vector>
@@ -51,4 +51,4 @@ private:
     TestResult test_case(const std::string& sim_type, int nrepetitions, int nthreads) const;
 };
 
-#endif // BORNAGAIN_TESTS_CORE_PERFORMANCE_MULTITHREADPERFORMANCETEST_H
+#endif // BORNAGAIN_TESTS_PERFORMANCE_CORE_THREADING_H
diff --git a/Tests/Performance/Core/ThreadingComponents.cpp b/Tests/Performance/Core/ThreadingComponents.cpp
index f9be983eef3c4694d8eb7c92e179b6916c52511c..8cd0827b15094cb32af1c81b43373fc2f567e17e 100644
--- a/Tests/Performance/Core/ThreadingComponents.cpp
+++ b/Tests/Performance/Core/ThreadingComponents.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tests/Performance/Core/MultiThreadPerformanceTestComponents.cpp
+//! @file      Tests/Performance/Core/ThreadingComponents.cpp
 //! @brief     Defines TestComponents namespace
 //!
 //! @homepage  http://www.bornagainproject.org
diff --git a/Tests/Performance/Core/ThreadingComponents.h b/Tests/Performance/Core/ThreadingComponents.h
index 0a73eb755c730632c1c1bf7d73c478bed2df2437..6c8dca18d4e8609f211148b5531857074b456e3a 100644
--- a/Tests/Performance/Core/ThreadingComponents.h
+++ b/Tests/Performance/Core/ThreadingComponents.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tests/Performance/Core/MultiThreadPerformanceTestComponents.h
+//! @file      Tests/Performance/Core/ThreadingComponents.h
 //! @brief     Defines TestComponents namespace
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_TESTS_CORE_PERFORMANCE_MULTITHREADPERFORMANCETESTCOMPONENTS_H
-#define BORNAGAIN_TESTS_CORE_PERFORMANCE_MULTITHREADPERFORMANCETESTCOMPONENTS_H
+#ifndef BORNAGAIN_TESTS_PERFORMANCE_CORE_THREADINGCOMPONENTS_H
+#define BORNAGAIN_TESTS_PERFORMANCE_CORE_THREADINGCOMPONENTS_H
 
 #include <memory>
 
@@ -37,4 +37,4 @@ std::unique_ptr<Simulation> CreateMCGISAS();
 
 } // namespace TestComponents
 
-#endif // BORNAGAIN_TESTS_CORE_PERFORMANCE_MULTITHREADPERFORMANCETESTCOMPONENTS_H
+#endif // BORNAGAIN_TESTS_PERFORMANCE_CORE_THREADINGCOMPONENTS_H
diff --git a/Tests/Performance/GUI/CsvImportAssistantPerformanceTest.cpp b/Tests/Performance/GUI/CsvImportAssistantPerformanceTest.cpp
index 33c4bd06ced90c568aba441a0afcba0dd93b8e2f..aedd91255290a4c9f9c827a943c4f1ec0e7a95c0 100644
--- a/Tests/Performance/GUI/CsvImportAssistantPerformanceTest.cpp
+++ b/Tests/Performance/GUI/CsvImportAssistantPerformanceTest.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tests/Functional/GUI/GUISpecial/CsvImportAssistantPerformanceTest.cpp
+//! @file      Tests/Performance/GUI/CsvImportAssistantPerformanceTest.cpp
 //! @brief     Implements GUI performance functional test.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -90,7 +90,6 @@ bool CsvImportAssistantPerformanceTest::runTest()
     return true;
 }
 
-
 int main()
 {
     return !CsvImportAssistantPerformanceTest().runTest();
diff --git a/Tests/Performance/GUI/CsvImportAssistantPerformanceTest.h b/Tests/Performance/GUI/CsvImportAssistantPerformanceTest.h
index eba5be9d368412a7568e8be43329473b642fdece..e32a706521e806c0101a47857927ee816859010f 100644
--- a/Tests/Performance/GUI/CsvImportAssistantPerformanceTest.h
+++ b/Tests/Performance/GUI/CsvImportAssistantPerformanceTest.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tests/Functional/GUI/GUISpecial/CsvImportAssistantPerformanceTest.h
+//! @file      Tests/Performance/GUI/CsvImportAssistantPerformanceTest.h
 //! @brief     Defines GUI performance functional test.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_TESTS_FUNCTIONAL_GUI_GUISPECIAL_CSVIMPORTASSISTANTPERFORMANCETEST_H
-#define BORNAGAIN_TESTS_FUNCTIONAL_GUI_GUISPECIAL_CSVIMPORTASSISTANTPERFORMANCETEST_H
+#ifndef BORNAGAIN_TESTS_PERFORMANCE_GUI_CSVIMPORTASSISTANTPERFORMANCETEST_H
+#define BORNAGAIN_TESTS_PERFORMANCE_GUI_CSVIMPORTASSISTANTPERFORMANCETEST_H
 
 #include "GUI/coregui/Models/SpecularDataItem.h"
 #include <QString>
@@ -37,4 +37,4 @@ protected:
         {12.0, 13.0, 14.0, 15.0}, {16.0, 17.0, 18.0, 19.0}, {20.0, 21.0, 22.0, 23.0}};
 };
 
-#endif // BORNAGAIN_TESTS_FUNCTIONAL_GUI_GUISPECIAL_CSVIMPORTASSISTANTPERFORMANCETEST_H
+#endif // BORNAGAIN_TESTS_PERFORMANCE_GUI_CSVIMPORTASSISTANTPERFORMANCETEST_H
diff --git a/Tests/Performance/GUI/GUIPerformanceTest.cpp b/Tests/Performance/GUI/GUIPerformanceTest.cpp
index 4c1f0555d5d429646de05e081f03aabd3d296225..1d5c749dd464084216ecd41e4d4d7efc9a9d9743 100644
--- a/Tests/Performance/GUI/GUIPerformanceTest.cpp
+++ b/Tests/Performance/GUI/GUIPerformanceTest.cpp
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tests/Functional/GUI/GUISpecial/GUIPerformanceTest.cpp
+//! @file      Tests/Performance/GUI/GUIPerformanceTest.cpp
 //! @brief     Implements GUI performance functional test.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -166,7 +166,6 @@ void GUIPerformanceTest::test_real_time()
     }
 }
 
-
 int main()
 {
     return !GUIPerformanceTest().runTest();
diff --git a/Tests/Performance/GUI/GUIPerformanceTest.h b/Tests/Performance/GUI/GUIPerformanceTest.h
index d87fbf7d249c3e801b1819a90660d5dceb205f6f..38b6b6a994e42e7c7ac367e75f3f658d9a6d40eb 100644
--- a/Tests/Performance/GUI/GUIPerformanceTest.h
+++ b/Tests/Performance/GUI/GUIPerformanceTest.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit scattering at grazing incidence
 //
-//! @file      Tests/Functional/GUI/GUISpecial/GUIPerformanceTest.h
+//! @file      Tests/Performance/GUI/GUIPerformanceTest.h
 //! @brief     Defines GUI performance functional test.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -12,8 +12,8 @@
 //
 // ************************************************************************** //
 
-#ifndef BORNAGAIN_TESTS_FUNCTIONAL_GUI_GUISPECIAL_GUIPERFORMANCETEST_H
-#define BORNAGAIN_TESTS_FUNCTIONAL_GUI_GUISPECIAL_GUIPERFORMANCETEST_H
+#ifndef BORNAGAIN_TESTS_PERFORMANCE_GUI_GUIPERFORMANCETEST_H
+#define BORNAGAIN_TESTS_PERFORMANCE_GUI_GUIPERFORMANCETEST_H
 
 #include <QString>
 #include <memory>
@@ -38,4 +38,4 @@ private:
     QString m_sample_name;
 };
 
-#endif // BORNAGAIN_TESTS_FUNCTIONAL_GUI_GUISPECIAL_GUIPERFORMANCETEST_H
+#endif // BORNAGAIN_TESTS_PERFORMANCE_GUI_GUIPERFORMANCETEST_H
diff --git a/Tests/UnitTests/Core/Fitting/FitObjectiveTest.cpp b/Tests/UnitTests/Core/Fitting/FitObjectiveTest.cpp
index 0ac875630214fde9a8bd66dc81ccea907c293c0a..da36b0ef628130c1a8757ddd8f199c3c364bac9e 100644
--- a/Tests/UnitTests/Core/Fitting/FitObjectiveTest.cpp
+++ b/Tests/UnitTests/Core/Fitting/FitObjectiveTest.cpp
@@ -1,7 +1,7 @@
 #include "Core/Fitting/FitObjective.h"
 #include "Fit/Kernel/Parameters.h"
-#include "Tests/UnitTests/Core/Fitting/FittingTestHelper.h"
 #include "Tests/GTestWrapper/google_test.h"
+#include "Tests/UnitTests/Core/Fitting/FittingTestHelper.h"
 
 class FitObjectiveTest : public ::testing::Test
 {
diff --git a/Tests/UnitTests/Core/Fitting/SimDataPairTest.cpp b/Tests/UnitTests/Core/Fitting/SimDataPairTest.cpp
index 056a6a0e0064dc36490877c814216bb3b88f050f..352a4527ad8dd68ad123f1172664f638b704637a 100644
--- a/Tests/UnitTests/Core/Fitting/SimDataPairTest.cpp
+++ b/Tests/UnitTests/Core/Fitting/SimDataPairTest.cpp
@@ -1,7 +1,7 @@
 #include "Core/Fitting/SimDataPair.h"
 #include "Fit/Kernel/Parameters.h"
-#include "Tests/UnitTests/Core/Fitting/FittingTestHelper.h"
 #include "Tests/GTestWrapper/google_test.h"
+#include "Tests/UnitTests/Core/Fitting/FittingTestHelper.h"
 
 class SimDataPairTest : public ::testing::Test
 {
diff --git a/Tests/UnitTests/GUI/TestComboProperty.cpp b/Tests/UnitTests/GUI/TestComboProperty.cpp
index eaa76b70f246859c17de6593e2c467a16f429832..c46bab05731570e7641102ec91ffbaaa929e6765 100644
--- a/Tests/UnitTests/GUI/TestComboProperty.cpp
+++ b/Tests/UnitTests/GUI/TestComboProperty.cpp
@@ -1,7 +1,7 @@
 #include "GUI/coregui/Models/ComboProperty.h"
+#include "Tests/GTestWrapper/google_test.h"
 #include "Tests/UnitTests/GUI/Comparators.h"
 #include "Tests/UnitTests/GUI/test_utils.h"
-#include "Tests/GTestWrapper/google_test.h"
 
 class TestComboProperty : public ::testing::Test
 {
diff --git a/Tests/UnitTests/GUI/TestComponentProxyModel.cpp b/Tests/UnitTests/GUI/TestComponentProxyModel.cpp
index 4ea40f867a4997fe7c05761ffd729d03f1d3a031..b123d3e22c50c33b476383549983e917daa4b5c8 100644
--- a/Tests/UnitTests/GUI/TestComponentProxyModel.cpp
+++ b/Tests/UnitTests/GUI/TestComponentProxyModel.cpp
@@ -8,8 +8,8 @@
 #include "GUI/coregui/Models/ProxyModelStrategy.h"
 #include "GUI/coregui/Models/SessionModel.h"
 #include "GUI/coregui/Models/VectorItem.h"
-#include "Tests/UnitTests/GUI/test_utils.h"
 #include "Tests/GTestWrapper/google_test.h"
+#include "Tests/UnitTests/GUI/test_utils.h"
 #include <QDebug>
 #include <QSignalSpy>
 
diff --git a/Tests/UnitTests/GUI/TestDataItemViews.cpp b/Tests/UnitTests/GUI/TestDataItemViews.cpp
index f5a1eecdb6544b18acd28ddc82b0ce6ba03d0551..55262970f313a5c4086200c009e0bacc5875868d 100644
--- a/Tests/UnitTests/GUI/TestDataItemViews.cpp
+++ b/Tests/UnitTests/GUI/TestDataItemViews.cpp
@@ -8,8 +8,8 @@
 #include "GUI/coregui/mainwindow/projectdocument.h"
 #include "GUI/coregui/utils/GUIHelpers.h"
 #include "GUI/coregui/utils/MessageService.h"
-#include "Tests/UnitTests/GUI/test_utils.h"
 #include "Tests/GTestWrapper/google_test.h"
+#include "Tests/UnitTests/GUI/test_utils.h"
 
 class TestDataItemViews : public ::testing::Test
 {
diff --git a/Tests/UnitTests/GUI/TestExternalProperty.cpp b/Tests/UnitTests/GUI/TestExternalProperty.cpp
index 4cbae7c8e920023003e0a77ac296d508cf3fa984..91d10c472687f1e79ad26351c37daf3617379e8e 100644
--- a/Tests/UnitTests/GUI/TestExternalProperty.cpp
+++ b/Tests/UnitTests/GUI/TestExternalProperty.cpp
@@ -1,7 +1,7 @@
 #include "GUI/coregui/Views/MaterialEditor/ExternalProperty.h"
+#include "Tests/GTestWrapper/google_test.h"
 #include "Tests/UnitTests/GUI/Comparators.h"
 #include "Tests/UnitTests/GUI/test_utils.h"
-#include "Tests/GTestWrapper/google_test.h"
 
 class TestExternalProperty : public ::testing::Test
 {
diff --git a/Tests/UnitTests/GUI/TestGUI.cpp b/Tests/UnitTests/GUI/TestGUI.cpp
index 5ad0aef0f9151951a32f4dc3942d8a23b0eab7ca..758ffbef2a4314feab2b711150b0adbccf73e7c3 100644
--- a/Tests/UnitTests/GUI/TestGUI.cpp
+++ b/Tests/UnitTests/GUI/TestGUI.cpp
@@ -1,5 +1,5 @@
-#include "Tests/UnitTests/GUI/Comparators.h"
 #include "Tests/GTestWrapper/google_test.h"
+#include "Tests/UnitTests/GUI/Comparators.h"
 #include <QAbstractItemModel>
 #include <QCoreApplication>
 
diff --git a/Tests/UnitTests/GUI/TestGroupItem.cpp b/Tests/UnitTests/GUI/TestGroupItem.cpp
index 47e5fa3f650454922f990a86ef09d27aa1c5f17f..c3f787268a5911f6330cad854b5c6e0eb963429e 100644
--- a/Tests/UnitTests/GUI/TestGroupItem.cpp
+++ b/Tests/UnitTests/GUI/TestGroupItem.cpp
@@ -4,8 +4,8 @@
 #include "GUI/coregui/Models/SessionItemUtils.h"
 #include "GUI/coregui/Models/SessionModel.h"
 #include "GUI/coregui/utils/GUIHelpers.h"
-#include "Tests/UnitTests/GUI/test_utils.h"
 #include "Tests/GTestWrapper/google_test.h"
+#include "Tests/UnitTests/GUI/test_utils.h"
 
 class TestGroupItem : public ::testing::Test
 {
diff --git a/Tests/UnitTests/GUI/TestLinkInstrument.cpp b/Tests/UnitTests/GUI/TestLinkInstrument.cpp
index dd2347b077491b53b61e3b4152993a194c6e7ff5..deba17008662f3e897174409bb36d56bfe32aee6 100644
--- a/Tests/UnitTests/GUI/TestLinkInstrument.cpp
+++ b/Tests/UnitTests/GUI/TestLinkInstrument.cpp
@@ -7,8 +7,8 @@
 #include "GUI/coregui/Models/RealDataModel.h"
 #include "GUI/coregui/Models/RectangularDetectorItem.h"
 #include "GUI/coregui/Views/ImportDataWidgets/LinkInstrumentManager.h"
-#include "Tests/UnitTests/GUI/test_utils.h"
 #include "Tests/GTestWrapper/google_test.h"
+#include "Tests/UnitTests/GUI/test_utils.h"
 #include <QSignalSpy>
 #include <QTest>
 
diff --git a/Tests/UnitTests/GUI/TestOutputDataIOService.cpp b/Tests/UnitTests/GUI/TestOutputDataIOService.cpp
index d4d33b352eac41c015104fb34b337a0b53e78cb5..ac3e4b1cd733abb33e5be6dc2209d41acbc01bde 100644
--- a/Tests/UnitTests/GUI/TestOutputDataIOService.cpp
+++ b/Tests/UnitTests/GUI/TestOutputDataIOService.cpp
@@ -13,8 +13,8 @@
 #include "GUI/coregui/mainwindow/ProjectUtils.h"
 #include "GUI/coregui/utils/GUIHelpers.h"
 #include "GUI/coregui/utils/ImportDataInfo.h"
-#include "Tests/UnitTests/GUI/test_utils.h"
 #include "Tests/GTestWrapper/google_test.h"
+#include "Tests/UnitTests/GUI/test_utils.h"
 #include <QTest>
 #include <memory>
 
diff --git a/Tests/UnitTests/GUI/TestProjectDocument.cpp b/Tests/UnitTests/GUI/TestProjectDocument.cpp
index 63e83900dd7765c5f72b5f45425cae023ab6474b..631e0337626f7c836ca0150f676e49e1504cb875 100644
--- a/Tests/UnitTests/GUI/TestProjectDocument.cpp
+++ b/Tests/UnitTests/GUI/TestProjectDocument.cpp
@@ -8,8 +8,8 @@
 #include "GUI/coregui/mainwindow/ProjectUtils.h"
 #include "GUI/coregui/mainwindow/projectdocument.h"
 #include "GUI/coregui/utils/GUIHelpers.h"
-#include "Tests/UnitTests/GUI/test_utils.h"
 #include "Tests/GTestWrapper/google_test.h"
+#include "Tests/UnitTests/GUI/test_utils.h"
 #include <QFileInfo>
 #include <QSignalSpy>
 
diff --git a/Tests/UnitTests/GUI/TestSaveService.cpp b/Tests/UnitTests/GUI/TestSaveService.cpp
index 0653d72a731e4c84f68056252cc5dd9f76c8a880..5fd970a354cc7c4895276f5bbbb4c3e80b49dea8 100644
--- a/Tests/UnitTests/GUI/TestSaveService.cpp
+++ b/Tests/UnitTests/GUI/TestSaveService.cpp
@@ -10,8 +10,8 @@
 #include "GUI/coregui/mainwindow/SaveService.h"
 #include "GUI/coregui/mainwindow/projectdocument.h"
 #include "GUI/coregui/utils/GUIHelpers.h"
-#include "Tests/UnitTests/GUI/test_utils.h"
 #include "Tests/GTestWrapper/google_test.h"
+#include "Tests/UnitTests/GUI/test_utils.h"
 #include <QSignalSpy>
 
 class TestSaveService : public ::testing::Test
diff --git a/Tests/UnitTests/GUI/TestSavingSpecularData.cpp b/Tests/UnitTests/GUI/TestSavingSpecularData.cpp
index 3a1ff3951e72dcb2f36962d0a750bfa980b0a81e..09013952ad644d9762c98d3c86d3d466f6d89267 100644
--- a/Tests/UnitTests/GUI/TestSavingSpecularData.cpp
+++ b/Tests/UnitTests/GUI/TestSavingSpecularData.cpp
@@ -15,8 +15,8 @@
 #include "GUI/coregui/mainwindow/OutputDataIOService.h"
 #include "GUI/coregui/mainwindow/ProjectUtils.h"
 #include "GUI/coregui/utils/GUIHelpers.h"
-#include "Tests/UnitTests/GUI/test_utils.h"
 #include "Tests/GTestWrapper/google_test.h"
+#include "Tests/UnitTests/GUI/test_utils.h"
 #include <QTest>
 
 class TestSavingSpecularData : public ::testing::Test
diff --git a/Tests/UnitTests/GUI/TestSessionItemController.cpp b/Tests/UnitTests/GUI/TestSessionItemController.cpp
index 797fb2246722005afc247dfd8b120b8e856a2cc7..2aa0c065398523a11aebfb45ed65accc914e7763 100644
--- a/Tests/UnitTests/GUI/TestSessionItemController.cpp
+++ b/Tests/UnitTests/GUI/TestSessionItemController.cpp
@@ -1,8 +1,8 @@
 #include "GUI/coregui/Models/AxesItems.h"
 #include "GUI/coregui/Models/SessionModel.h"
 #include "GUI/coregui/Views/CommonWidgets/SessionItemController.h"
-#include "Tests/UnitTests/GUI/TestSessionItemControllerHelper.h"
 #include "Tests/GTestWrapper/google_test.h"
+#include "Tests/UnitTests/GUI/TestSessionItemControllerHelper.h"
 #include <QObject>
 
 class TestSessionItemController : public ::testing::Test
diff --git a/Tests/UnitTests/Numeric/FormFactorSpecializationTest.cpp b/Tests/UnitTests/Numeric/FormFactorSpecializationTest.cpp
index fefee168820905e128b30b1528b64814f978d303..36dd38dc7acd66a6f2e2ea0b3ed1345ffde8d6dc 100644
--- a/Tests/UnitTests/Numeric/FormFactorSpecializationTest.cpp
+++ b/Tests/UnitTests/Numeric/FormFactorSpecializationTest.cpp
@@ -1,6 +1,6 @@
 #include "Core/includeIncludes/HardParticles.h"
-#include "Tests/UnitTests/Numeric/FormFactorTest.h"
 #include "Tests/GTestWrapper/google_test.h"
+#include "Tests/UnitTests/Numeric/FormFactorTest.h"
 
 //! Compare form factor for particle shapes A and B, where A is given special
 //! parameter values so that it coincides with the more symmetric B.
diff --git a/Tests/UnitTests/Numeric/FormFactorSymmetryTest.cpp b/Tests/UnitTests/Numeric/FormFactorSymmetryTest.cpp
index 2a4d7f41d4c7a6a8e51a0f8d9e75ad6f34d0caf2..3a9c521b59d8a43a9c3ddf3a6c3b0eded923a34a 100644
--- a/Tests/UnitTests/Numeric/FormFactorSymmetryTest.cpp
+++ b/Tests/UnitTests/Numeric/FormFactorSymmetryTest.cpp
@@ -1,7 +1,7 @@
 #include "Core/Basics/MathConstants.h"
 #include "Core/includeIncludes/HardParticles.h"
-#include "Tests/UnitTests/Numeric/FormFactorTest.h"
 #include "Tests/GTestWrapper/google_test.h"
+#include "Tests/UnitTests/Numeric/FormFactorTest.h"
 
 //! Check that form factors are invariant when q is transformed according to particle symmetry.