diff --git a/Core/Examples/StandardSimulations.cpp b/Core/Examples/StandardSimulations.cpp
index dd16bdbaf1551155faafa729425df9571e61b658..b2d2dda38ae5e0c39c2b1105b2fc3dd803cd4d42 100644
--- a/Core/Examples/StandardSimulations.cpp
+++ b/Core/Examples/StandardSimulations.cpp
@@ -94,7 +94,6 @@ std::unique_ptr<GISASSimulation> StdSimulations::MiniZPolarizedGISAS(const Multi
 }
 
 
-
 //! Basic GISAS simulation with the detector phi[0,2], theta[0,2].
 
 std::unique_ptr<GISASSimulation> StdSimulations::BasicGISAS(const MultiLayer& sample)
@@ -163,7 +162,8 @@ std::unique_ptr<GISASSimulation> StdSimulations::GISASWithMasks(const MultiLayer
 
 //! GISAS simulation with detector resolution.
 
-std::unique_ptr<GISASSimulation> StdSimulations::MiniGISASDetectorResolution(const MultiLayer& sample)
+std::unique_ptr<GISASSimulation>
+StdSimulations::MiniGISASDetectorResolution(const MultiLayer& sample)
 {
     std::unique_ptr<GISASSimulation> result = MiniGISAS(sample);
     ResolutionFunction2DGaussian resfunc(0.0025, 0.0025);
@@ -223,7 +223,8 @@ std::unique_ptr<GISASSimulation> StdSimulations::RectDetectorPerpToSample(const
 
 //! GISAS simulation with the rectangular detector perpendicular to the direct beam.
 
-std::unique_ptr<GISASSimulation> StdSimulations::RectDetectorPerpToDirectBeam(const MultiLayer& sample)
+std::unique_ptr<GISASSimulation>
+StdSimulations::RectDetectorPerpToDirectBeam(const MultiLayer& sample)
 {
     Beam beam(1.0, 1 * angstrom, Direction(0.2 * deg, 0));
     RectangularDetector det(rdet_nbinsx, rdet_width, rdet_nbinsy, rdet_height);
@@ -233,7 +234,8 @@ std::unique_ptr<GISASSimulation> StdSimulations::RectDetectorPerpToDirectBeam(co
 
 //! GISAS simulation with the rectangular detector perpendicular to the reflected beam.
 
-std::unique_ptr<GISASSimulation> StdSimulations::RectDetectorPerpToReflectedBeam(const MultiLayer& sample)
+std::unique_ptr<GISASSimulation>
+StdSimulations::RectDetectorPerpToReflectedBeam(const MultiLayer& sample)
 {
     Beam beam(1.0, 1 * angstrom, Direction(0.2 * deg, 0));
     RectangularDetector det(rdet_nbinsx, rdet_width, rdet_nbinsy, rdet_height);
@@ -244,7 +246,8 @@ std::unique_ptr<GISASSimulation> StdSimulations::RectDetectorPerpToReflectedBeam
 //! GISAS simulation with the rectangular detector perpendicular to the reflected beam when
 //! the coordinates of direct beam are known.
 
-std::unique_ptr<GISASSimulation> StdSimulations::RectDetectorPerpToReflectedBeamDpos(const MultiLayer& sample)
+std::unique_ptr<GISASSimulation>
+StdSimulations::RectDetectorPerpToReflectedBeamDpos(const MultiLayer& sample)
 {
     Beam beam(1.0, 1 * angstrom, Direction(0.2 * deg, 0));
     RectangularDetector det(rdet_nbinsx, rdet_width, rdet_nbinsy, rdet_height);
diff --git a/Tests/Functional/Core/Fitting/SimfitTestPlan.h b/Tests/Functional/Core/Fitting/SimfitTestPlan.h
index 7406854ef59d0870e891d267c07bb677c9d241cf..f22d6f3e8620de23af4eb9e1faad6c8a3185ff69 100644
--- a/Tests/Functional/Core/Fitting/SimfitTestPlan.h
+++ b/Tests/Functional/Core/Fitting/SimfitTestPlan.h
@@ -34,7 +34,8 @@ public:
 
 protected:
     virtual std::unique_ptr<FitObjective> createFitObjective() const;
-//    virtual std::unique_ptr<ISimulation> createSimulation(const mumufit::Parameters& params) const;
+    //    virtual std::unique_ptr<ISimulation> createSimulation(const mumufit::Parameters& params)
+    //    const;
 
     //! Creates sample for given set of fit parameters.
     virtual std::unique_ptr<MultiLayer> createMultiLayer(const mumufit::Parameters&) const
diff --git a/Tests/Functional/ProStd/StdTestSimulations.cpp b/Tests/Functional/ProStd/StdTestSimulations.cpp
index d1825d14c40b8c4657678ccd3de662e092e1474b..cdd7d29044f1a284cbe50d666d20fb69b9810457 100644
--- a/Tests/Functional/ProStd/StdTestSimulations.cpp
+++ b/Tests/Functional/ProStd/StdTestSimulations.cpp
@@ -201,8 +201,8 @@ StdTestSimulations::SpecularDivergentBeam(const MultiLayer& sample)
     return result;
 }
 
-std::unique_ptr<SpecularSimulation> StdTestSimulations::TOFRWithRelativeResolution(
-    const MultiLayer& sample)
+std::unique_ptr<SpecularSimulation>
+StdTestSimulations::TOFRWithRelativeResolution(const MultiLayer& sample)
 {
     FixedBinAxis qs("axis", 500, 0.0, 1.0);
     QzScan q_scan(qs);
@@ -215,8 +215,8 @@ std::unique_ptr<SpecularSimulation> StdTestSimulations::TOFRWithRelativeResoluti
     return result;
 }
 
-std::unique_ptr<SpecularSimulation> StdTestSimulations::TOFRWithPointwiseResolution(
-    const MultiLayer& sample)
+std::unique_ptr<SpecularSimulation>
+StdTestSimulations::TOFRWithPointwiseResolution(const MultiLayer& sample)
 {
     FixedBinAxis qs("axis", 500, 0.0, 1.0);
     QzScan q_scan(qs);
diff --git a/Tests/Functional/Std/StandardTests.h b/Tests/Functional/Std/StandardTests.h
index 735e70ed8c15584515663f6cc260555228f81fb7..a3acefc52a2c39b64860982fbfdd7d2c94319374 100644
--- a/Tests/Functional/Std/StandardTests.h
+++ b/Tests/Functional/Std/StandardTests.h
@@ -19,8 +19,8 @@
 #ifndef BORNAGAIN_TESTS_FUNCTIONAL_STD_STANDARDTESTS_H
 #define BORNAGAIN_TESTS_FUNCTIONAL_STD_STANDARDTESTS_H
 
-#include "Core/Examples/StandardSimulations.h"
 #include "Core/Background/ConstantBackground.h"
+#include "Core/Examples/StandardSimulations.h"
 #include "Core/Simulation/DepthProbeSimulation.h"
 #include "Core/Simulation/GISASSimulation.h"
 #include "Core/Simulation/OffSpecularSimulation.h"
@@ -473,8 +473,7 @@ TEST_F(Std, SphericalDetWithRoi)
 {
     std::unique_ptr<const MultiLayer> sample(CylindersAndPrismsBuilder().buildSample());
     auto sim = StdSimulations::SphericalDetWithRoi(*sample);
-    EXPECT_TRUE(
-        run("SphericalDetWithRoi", *sim, 1e-10));
+    EXPECT_TRUE(run("SphericalDetWithRoi", *sim, 1e-10));
 }
 
 TEST_F(Std, RectDetWithRoi)