diff --git a/Device/IO/IOFactory.cpp b/Device/IO/IOFactory.cpp
index 28f4d8e107d28d3a6614caee65c6df49240c36f2..6317510b3cf8363fb3027bedbc411e701d671961 100644
--- a/Device/IO/IOFactory.cpp
+++ b/Device/IO/IOFactory.cpp
@@ -50,23 +50,23 @@ Datafield* IOFactory::readDatafield(const std::string& file_name, LoaderSelector
     Datafield* result = nullptr;
 
     if (readAs(bornagain))
-        result = readDatafield(file_name,
-                               [](std::istream& s) { return ReadWriteINT().readDatafield(s); });
+        result = functional_read(file_name,
+                                 [](std::istream& s) { return ReadWriteINT().readDatafield(s); });
 
     else if (readAs(nicos))
-        result = readDatafield(file_name, [](std::istream& s) { return IO::readNicosData(s); });
+        result = functional_read(file_name, [](std::istream& s) { return IO::readNicosData(s); });
 
 #ifdef BA_TIFF_SUPPORT
     else if (readAs(tiff))
-        result = readDatafield(file_name,
-                               [](std::istream& s) { return ReadWriteTiff().readDatafield(s); });
+        result = functional_read(file_name,
+                                 [](std::istream& s) { return ReadWriteTiff().readDatafield(s); });
 #endif
 
     else
         // Try to read ASCII by default. Binary maps to ASCII.
         // If the file is not actually a matrix of numbers,
         // the error will be thrown during the reading.
-        result = readDatafield(
+        result = functional_read(
             file_name, [](std::istream& s) { return ReadWriteNumpyTXT().readDatafield(s); });
 
     ASSERT(result);
@@ -75,26 +75,27 @@ Datafield* IOFactory::readDatafield(const std::string& file_name, LoaderSelector
 
 Datafield* IOFactory::readReflectometryData(const std::string& file_name)
 {
-    return readDatafield(file_name,
-                         [](std::istream& s) { return ReadReflectometry().readDatafield(s); });
+    return functional_read(file_name,
+                           [](std::istream& s) { return ReadReflectometry().readDatafield(s); });
 }
 
 void IOFactory::writeDatafield(const Datafield& data, const std::string& file_name)
 {
     if (DataUtils::Format::isIntFile(file_name))
-        writeDatafield(file_name, [&](std::ostream& s) { ReadWriteINT().writeDatafield(data, s); });
+        functional_write(file_name,
+                         [&](std::ostream& s) { ReadWriteINT().writeDatafield(data, s); });
 #ifdef BA_TIFF_SUPPORT
     else if (DataUtils::Format::isTiffFile(file_name))
-        writeDatafield(file_name,
-                       [&](std::ostream& s) { ReadWriteTiff().writeDatafield(data, s); });
+        functional_write(file_name,
+                         [&](std::ostream& s) { ReadWriteTiff().writeDatafield(data, s); });
 #endif
     else
-        writeDatafield(file_name,
-                       [&](std::ostream& s) { ReadWriteNumpyTXT().writeDatafield(data, s); });
+        functional_write(file_name,
+                         [&](std::ostream& s) { ReadWriteNumpyTXT().writeDatafield(data, s); });
 }
 
-void IOFactory::writeDatafield(const std::string& file_name,
-                               std::function<void(std::ostream&)> writeData)
+void IOFactory::functional_write(const std::string& file_name,
+                                 std::function<void(std::ostream&)> writeData)
 {
     using namespace DataUtils::Format;
 
@@ -149,8 +150,8 @@ void IOFactory::writeSimulationResult(const SimulationResult& result, const std:
     writeDatafield(result.data_field(), file_name);
 }
 
-Datafield* IOFactory::readDatafield(const std::string& file_name,
-                                    std::function<Datafield*(std::istream&)> readData)
+Datafield* IOFactory::functional_read(const std::string& file_name,
+                                      std::function<Datafield*(std::istream&)> readData)
 {
     if (!BaseUtils::Filesystem::IsFileExists(file_name))
         throw std::runtime_error("File does not exist: " + file_name);
diff --git a/Device/IO/IOFactory.h b/Device/IO/IOFactory.h
index e65f96b606120b23fb31204065eb6138c01efb61..bff6565b9d18b340524c123edc5237f04dc17b2c 100644
--- a/Device/IO/IOFactory.h
+++ b/Device/IO/IOFactory.h
@@ -63,11 +63,11 @@ public:
     static void writeSimulationResult(const SimulationResult& result, const std::string& file_name);
 
 private:
-    static Datafield* readDatafield(const std::string& file_name,
-                                    std::function<Datafield*(std::istream&)> readData);
+    static Datafield* functional_read(const std::string& file_name,
+                                      std::function<Datafield*(std::istream&)> readData);
 
-    static void writeDatafield(const std::string& file_name,
-                               std::function<void(std::ostream&)> writeData);
+    static void functional_write(const std::string& file_name,
+                                 std::function<void(std::ostream&)> writeData);
 
     static bool fileTypeMatchesLoaderSelector(const std::string& fileName, LoaderSelector selector);
 };
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Bipyramid4.0.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Bipyramid4.0.int.gz
index 193a75b0ca51caff39fb1026f2f37bbf02775198..9a8128d77cf90af340e4693cc7876917a9725572 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Bipyramid4.0.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Bipyramid4.0.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Bipyramid4.1.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Bipyramid4.1.int.gz
index 25e686cb4ba5067a9e1344e7c23ec6809047bb04..ffa0be0ee6626b10757017aeb37df1560487a29b 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Bipyramid4.1.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Bipyramid4.1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Bipyramid4.2.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Bipyramid4.2.int.gz
index d731b92e7067e63b251d33615d41308e0f9135ff..1b2f80f3be480b9e433c550443f48dd3c0167252 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Bipyramid4.2.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Bipyramid4.2.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Box.0.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Box.0.int.gz
index bb41c2ed52c069c7ad9cd85d114806d10471fe6f..cd4c0ecf7e364a5c14a3be56f938b5a86cc4f165 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Box.0.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Box.0.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Box.1.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Box.1.int.gz
index 177370d625e1d2ef5858ce654f6ecb3dc010f853..61588cd0473bd88553a3e4f4706ef0291fbd1a46 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Box.1.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Box.1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Box.2.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Box.2.int.gz
index a388b8ace74cbdeb0742bc3d54875f0b33189279..0b570a73fa99f494eb8e91239dc3e7d17ddbe032 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Box.2.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Box.2.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/CantellatedCube.0.int.gz b/Tests/ReferenceData/ExamplesMini/ff/CantellatedCube.0.int.gz
index f579222e95c93985e67aa52a1482ef6d8d922f19..a6309dbe967a050d693f57f85cbb14bfab684f32 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/CantellatedCube.0.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/CantellatedCube.0.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/CantellatedCube.1.int.gz b/Tests/ReferenceData/ExamplesMini/ff/CantellatedCube.1.int.gz
index 9955a7128d970377ff4343ac91b99648555c0a96..1ea8b7f18efefcfebf259661ddb2eddfa50af21a 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/CantellatedCube.1.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/CantellatedCube.1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Cone.0.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Cone.0.int.gz
index 708546d0d27bf864bbaf9e36b6b36dc2b6bb37f8..4ffdfbfd119e6646653bcaa79d91d87fe35e6c2f 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Cone.0.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Cone.0.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Cone.1.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Cone.1.int.gz
index 88d37e1ef6cb65842ba2656e54e629e16a20a36b..45e845dc84670474c1ad289f071a5e4b1d3b997e 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Cone.1.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Cone.1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Cone.2.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Cone.2.int.gz
index 4273465d90cd76bbfdea3fcadcd44b7c28fd1b90..432a6edf27c663002cd99b3a9b7a06750ddb5177 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Cone.2.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Cone.2.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Cylinder.0.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Cylinder.0.int.gz
index 6adf4638405352d406411c2419872b4b97e84109..ce7d08a10bf9ec92376873014e5693b9702f3241 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Cylinder.0.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Cylinder.0.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Cylinder.1.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Cylinder.1.int.gz
index 8665548782831c0aae3264c42f074049620d8d22..873d4e491584424dd888022aeb6ca537f6ffef0d 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Cylinder.1.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Cylinder.1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Cylinder.2.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Cylinder.2.int.gz
index 0f776cdc842022953846d37eb8886d0251b013f7..4d824e0d7d8e136855dfc4fe62dec4aef4279539 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Cylinder.2.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Cylinder.2.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Dodecahedron.0.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Dodecahedron.0.int.gz
index 9ca6c66ae660109d261ced221a718be66b2b6751..ea31037698e68c19756f7142b5cece361702c0d6 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Dodecahedron.0.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Dodecahedron.0.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Dodecahedron.1.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Dodecahedron.1.int.gz
index ef56f5118ec4a9d84d05a1e8e1f6e2a0d5a38d1b..2d59d29eb07f374c9fa22536cb743942a368ded6 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Dodecahedron.1.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Dodecahedron.1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Dodecahedron.2.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Dodecahedron.2.int.gz
index 173af9455963995ffb6fbbd4885df04458e78640..bfdb1eb6edbb9b9e508875c3a8ef77ea662f3a37 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Dodecahedron.2.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Dodecahedron.2.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/EllipsoidalCylinder.0.int.gz b/Tests/ReferenceData/ExamplesMini/ff/EllipsoidalCylinder.0.int.gz
index b75dd5ad2d8f088bf3cfa9b373645c6a4db5aa19..f5759c861c57238f50879a673e225a572270a787 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/EllipsoidalCylinder.0.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/EllipsoidalCylinder.0.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/EllipsoidalCylinder.1.int.gz b/Tests/ReferenceData/ExamplesMini/ff/EllipsoidalCylinder.1.int.gz
index d0b511f5fe0c5fac56b725838b72f27962d2fd27..479148c955463e8eae59b5bb17d4611a16df991b 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/EllipsoidalCylinder.1.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/EllipsoidalCylinder.1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/EllipsoidalCylinder.2.int.gz b/Tests/ReferenceData/ExamplesMini/ff/EllipsoidalCylinder.2.int.gz
index 596478fc1d92521c954a39a34280406f335e41cc..a5c2288a58e2fef420d9e1034ba0265277c4ee4c 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/EllipsoidalCylinder.2.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/EllipsoidalCylinder.2.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/HemiEllipsoid.0.int.gz b/Tests/ReferenceData/ExamplesMini/ff/HemiEllipsoid.0.int.gz
index 5a9f2a38eac01acefcb16f440b459ae55b45d3b6..b12dc58e72528a5b6c6064bcb103ee41542929b5 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/HemiEllipsoid.0.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/HemiEllipsoid.0.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/HemiEllipsoid.1.int.gz b/Tests/ReferenceData/ExamplesMini/ff/HemiEllipsoid.1.int.gz
index 76cb44318034ba9b8106426efd709775a9c6565e..4190af5e15799cbe27a8b0140f26366f15637a58 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/HemiEllipsoid.1.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/HemiEllipsoid.1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/HemiEllipsoid.2.int.gz b/Tests/ReferenceData/ExamplesMini/ff/HemiEllipsoid.2.int.gz
index 5fed1b5ef726cefc6f823407d850a5acc6d4266a..8f7c9d0324111ffd9b350a534f50ebbc1bb48e9c 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/HemiEllipsoid.2.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/HemiEllipsoid.2.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/HorizontalCylinder.0.int.gz b/Tests/ReferenceData/ExamplesMini/ff/HorizontalCylinder.0.int.gz
index b4f157ef65fc2a29bc02a4cc517420e478dfcbf4..4afac9a56c7648c74e170c595bfe9662823b1eff 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/HorizontalCylinder.0.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/HorizontalCylinder.0.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/HorizontalCylinder.1.int.gz b/Tests/ReferenceData/ExamplesMini/ff/HorizontalCylinder.1.int.gz
index 0520e11fa63bf8ac7a1f92bf755381b425ed203c..fe01efa9e13138eab24333def31f0f632e5471f0 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/HorizontalCylinder.1.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/HorizontalCylinder.1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/HorizontalCylinder.2.int.gz b/Tests/ReferenceData/ExamplesMini/ff/HorizontalCylinder.2.int.gz
index 8a2e1cda53910a726bed5b402aea77c6aac45dcf..6071619f7b4c29b34d6e4d8f6cdcee13a185f448 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/HorizontalCylinder.2.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/HorizontalCylinder.2.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Icosahedron.0.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Icosahedron.0.int.gz
index d146afbccd5d39c7fe956d128b84992a020717c1..17b9e6449eb62c0de47b0d5e1cc66618efdb71c9 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Icosahedron.0.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Icosahedron.0.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Icosahedron.1.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Icosahedron.1.int.gz
index 6807cf12f03d347936259dea76ef6e29bac62b85..fdd0d93645d33ea7f9a4af793825b8b79c5a13f0 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Icosahedron.1.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Icosahedron.1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Icosahedron.2.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Icosahedron.2.int.gz
index ced3cf0329fd10cbca8b1b88aab9567c83a89a17..4bcc9eb033b83b6882189a5b25bc7c727578431f 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Icosahedron.2.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Icosahedron.2.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/PlatonicOctahedron.0.int.gz b/Tests/ReferenceData/ExamplesMini/ff/PlatonicOctahedron.0.int.gz
index 111a81219279db90cf79f5c3fe408ee5cd0818f5..66917921083d4e348d9c13e61d528bf53cebdb9e 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/PlatonicOctahedron.0.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/PlatonicOctahedron.0.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/PlatonicOctahedron.1.int.gz b/Tests/ReferenceData/ExamplesMini/ff/PlatonicOctahedron.1.int.gz
index 4894c46a9c60566b3a533dd6d208c5f16c5180bc..afa5efcaedd935d5f2b6fc636f489a46e3b0e05f 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/PlatonicOctahedron.1.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/PlatonicOctahedron.1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/PlatonicOctahedron.2.int.gz b/Tests/ReferenceData/ExamplesMini/ff/PlatonicOctahedron.2.int.gz
index b5be2a8bd7024fc14aa21d8369c11afeac1af2f0..fb67ab36aedd04c000c594f8a55db2bda8a6b9cb 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/PlatonicOctahedron.2.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/PlatonicOctahedron.2.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/PlatonicTetrahedron.0.int.gz b/Tests/ReferenceData/ExamplesMini/ff/PlatonicTetrahedron.0.int.gz
index d2ebde612a2d2656aa0201bb02f57e1d73e2d2d8..ab376d5d7b37dcffacf7ebba268b34f18b3dce7f 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/PlatonicTetrahedron.0.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/PlatonicTetrahedron.0.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/PlatonicTetrahedron.1.int.gz b/Tests/ReferenceData/ExamplesMini/ff/PlatonicTetrahedron.1.int.gz
index 0cae908af9d6d15fb8ab6eeb927f0da155fbb45b..7678f2141f6903cdb08c9d3776ac60eb1d0931fb 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/PlatonicTetrahedron.1.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/PlatonicTetrahedron.1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Prism3.0.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Prism3.0.int.gz
index 8bbf5bcfb53877ff5f52ef7afd1a7e4dfe1a74b0..9c0e20558e879f667b4190f1644f06a4463e3d50 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Prism3.0.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Prism3.0.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Prism3.1.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Prism3.1.int.gz
index 77fd589102fb21167fb433b979a7c62963515fae..3dc0ddd8984ebd3e4a852c76d1bd7b458544875f 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Prism3.1.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Prism3.1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Prism3.2.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Prism3.2.int.gz
index aa79dc75ab6bbc3ca141f7249b2b0e31c9f2e147..d3338601c1f941a36b99f90aa70bdfb4d8f2be17 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Prism3.2.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Prism3.2.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Prism6.0.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Prism6.0.int.gz
index 85ae61086e4e1e4c161b9b1883a9c067e24a52eb..0d3eca37e965008292f186c1e89c85eaab37d3f0 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Prism6.0.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Prism6.0.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Prism6.1.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Prism6.1.int.gz
index c7b2a00df93f9967ae3374a338660f3058382bc1..2d69eb2aea2a6a791a03192da7f279ba177ca569 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Prism6.1.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Prism6.1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Prism6.2.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Prism6.2.int.gz
index 7c15b3b22f8178f83918fba3570217495211f9b7..68c680b6ea3ef8ed62b3e36b7d6a2c1ee3cea555 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Prism6.2.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Prism6.2.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Pyramid2.0.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Pyramid2.0.int.gz
index b84d2c6dbdd0d33c09d09cf50816265d26874e37..a9d38970177335d780f331481e134d19155b6d01 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Pyramid2.0.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Pyramid2.0.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Pyramid2.1.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Pyramid2.1.int.gz
index a47077c0a51c7580a859882228aec16e15d6c52c..577fd4e27fe8fee5d8e24ea2aab4572a40667795 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Pyramid2.1.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Pyramid2.1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Pyramid2.2.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Pyramid2.2.int.gz
index ed9f7030dc3d4d6511a090bf62d4eb74db88985f..f77f531ad4400b152acfe3cd200c7c881b8b6a72 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Pyramid2.2.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Pyramid2.2.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Pyramid3.0.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Pyramid3.0.int.gz
index 240025f4fd74d3b7d373c0fec4c6c26cb0c39be1..a51a63759c545f8252062af687fe13b4a4b1a3c7 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Pyramid3.0.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Pyramid3.0.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Pyramid3.1.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Pyramid3.1.int.gz
index 72d28b5e84cdce475bbee3d991d0ce3316ff2754..4fc217dc296b6ae84e50ddf8ef0c8f408a3ba215 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Pyramid3.1.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Pyramid3.1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Pyramid3.2.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Pyramid3.2.int.gz
index 418c9d64edf05e707ed4b1b24dc69f7eba53cf91..9d3865179759c03c33b572ed01bb75d5166275cf 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Pyramid3.2.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Pyramid3.2.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Pyramid4.0.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Pyramid4.0.int.gz
index 470e7527cb8089fcd7072286a93bcd019ff63372..f923212f5332f089aabad1f0673d1f769808ce37 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Pyramid4.0.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Pyramid4.0.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Pyramid4.1.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Pyramid4.1.int.gz
index 5b9e13215e5f3fb9e1604558f263db1882b7b986..18715d14ef0f2be70ce6b5ab745dbf4927911290 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Pyramid4.1.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Pyramid4.1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Pyramid6.0.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Pyramid6.0.int.gz
index f8728a507db3d9b7ed90d13dd462474311c13fef..a955ed214f0a29c504f503e24786eaa933fb7335 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Pyramid6.0.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Pyramid6.0.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Pyramid6.1.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Pyramid6.1.int.gz
index 768f697e09feb28d572600f89fcb2605dafc4f48..66c7846f0696f9c34f68fef117b914f8a411cacf 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Pyramid6.1.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Pyramid6.1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Pyramid6.2.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Pyramid6.2.int.gz
index 5327994241087d2d78773eae687ec42021a2f868..69890272727c81d0c32c7321dde6ba9e90f352b1 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Pyramid6.2.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Pyramid6.2.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/SawtoothRippleBox.0.int.gz b/Tests/ReferenceData/ExamplesMini/ff/SawtoothRippleBox.0.int.gz
index 99d1c36ca2fb7865d58512ac6a5e7d42bf7bd56c..b26757b7d8e4b1611b89e7124d7d5ab4ef611680 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/SawtoothRippleBox.0.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/SawtoothRippleBox.0.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/SawtoothRippleBox.1.int.gz b/Tests/ReferenceData/ExamplesMini/ff/SawtoothRippleBox.1.int.gz
index 9f9e708ce477c062a61fcc1641ddce1ac92e8a82..eaa0fb524f27059cac181b61237dbd7f0cd9043f 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/SawtoothRippleBox.1.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/SawtoothRippleBox.1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/SawtoothRippleBox.2.int.gz b/Tests/ReferenceData/ExamplesMini/ff/SawtoothRippleBox.2.int.gz
index 56589eaadce038b2c9bc259cfa5d6bb9ca5dc333..317f3a36212580b9ad8a78b76b6f05ad49478ea5 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/SawtoothRippleBox.2.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/SawtoothRippleBox.2.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Sphere.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Sphere.int.gz
index 127f86656b160d517adb5456734015c8310e499f..95daed66f83fe3539f47a6f58dac2eb8a0c10865 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Sphere.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Sphere.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Spheroid.0.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Spheroid.0.int.gz
index 28679517802424cf5dbd65d152eaa66fa5ad6327..8a717152671d983fb8151b17c2a40e713785512d 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Spheroid.0.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Spheroid.0.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Spheroid.1.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Spheroid.1.int.gz
index f8bd63e7a6676de1dc8f29ce2cae2e703b29614d..f75f49567fb6d67a37243490f45452bd729c29a6 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Spheroid.1.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Spheroid.1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/Spheroid.2.int.gz b/Tests/ReferenceData/ExamplesMini/ff/Spheroid.2.int.gz
index 2f3567050c964486d300749fd23655c6e93d182b..2642486595108b3dff447a31aa68ff9976adecd3 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/Spheroid.2.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/Spheroid.2.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/TruncatedCube.0.int.gz b/Tests/ReferenceData/ExamplesMini/ff/TruncatedCube.0.int.gz
index 6ca652eab13d2d5ed5623a79685c967050fcd65e..adc1b36797e53d3427608991c0b1a8384be2c846 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/TruncatedCube.0.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/TruncatedCube.0.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/TruncatedCube.1.int.gz b/Tests/ReferenceData/ExamplesMini/ff/TruncatedCube.1.int.gz
index 25196976b4b2a25d25a73a23c85a022d027001e8..245d2e4fc373ca2844367e161ccf4bd3ba3d400b 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/TruncatedCube.1.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/TruncatedCube.1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/TruncatedCube.2.int.gz b/Tests/ReferenceData/ExamplesMini/ff/TruncatedCube.2.int.gz
index aeafda6722a466576ad304d37a60d4ca15289945..f973425fac21551525c3706ab3d8a59b0c5fb098 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/TruncatedCube.2.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/TruncatedCube.2.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/TruncatedSphere.0.int.gz b/Tests/ReferenceData/ExamplesMini/ff/TruncatedSphere.0.int.gz
index 4bf914e82a6a264f4ba9a9c91eb2dfdd47e5cba2..064a9940d07bc7f7278f06a6bc0d88b251a31948 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/TruncatedSphere.0.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/TruncatedSphere.0.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/TruncatedSphere.1.int.gz b/Tests/ReferenceData/ExamplesMini/ff/TruncatedSphere.1.int.gz
index ff3e48fa522426131bd1e458f713c47ec6e0e44a..9ebbbaa13dc9f9f1a99293f292d0ad8be45fc6fa 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/TruncatedSphere.1.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/TruncatedSphere.1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/TruncatedSphere.2.int.gz b/Tests/ReferenceData/ExamplesMini/ff/TruncatedSphere.2.int.gz
index ae9cf53b7c439522541765f1698e85ee75848a04..9e10d5dddc23f02b9219343a02eae7b607b5159e 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/TruncatedSphere.2.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/TruncatedSphere.2.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/TruncatedSpheroid.0.int.gz b/Tests/ReferenceData/ExamplesMini/ff/TruncatedSpheroid.0.int.gz
index 117b69048e6d911d4af44bbf779191cc9941d67a..be9ab25a8685408b26ef8b1e7f2c5a422b02dff9 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/TruncatedSpheroid.0.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/TruncatedSpheroid.0.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/TruncatedSpheroid.1.int.gz b/Tests/ReferenceData/ExamplesMini/ff/TruncatedSpheroid.1.int.gz
index 0187558628c5db5297cf58a9c8362e8ba4bb9785..6ecd7556cdbf03431ddc43b42ea6a624c0c1a914 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/TruncatedSpheroid.1.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/TruncatedSpheroid.1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/ff/TruncatedSpheroid.2.int.gz b/Tests/ReferenceData/ExamplesMini/ff/TruncatedSpheroid.2.int.gz
index 2e33226ba95c1f7c73f05bbad443e7919304858f..090bbfec76d1e873c3a89dc86abe93a1bbf058f6 100644
Binary files a/Tests/ReferenceData/ExamplesMini/ff/TruncatedSpheroid.2.int.gz and b/Tests/ReferenceData/ExamplesMini/ff/TruncatedSpheroid.2.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/ApproximationDA.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/ApproximationDA.int.gz
index 1c75eb7838bf55e2852957671fd67681995f190e..ef3b3a8d2243190118f2bdffa2bebf5ffb09b516 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/ApproximationDA.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/ApproximationDA.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/ApproximationLMA.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/ApproximationLMA.int.gz
index 1e613bdaa2fef6831dc2b21466a37d96ce2ff6ca..6692ccb76304fdcced412e63ddc9eea65ddb81e1 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/ApproximationLMA.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/ApproximationLMA.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/ApproximationSSCA.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/ApproximationSSCA.int.gz
index 429d7478686e28b18b715a0aa71fb754dd2484b0..9fb413ebc17f18eeb7a0a2cd488e54394dcf3937 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/ApproximationSSCA.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/ApproximationSSCA.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/BeamDivergence.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/BeamDivergence.int.gz
index 1ed94fc78d3cb3f8de302dec955fc7283f1ae7c0..792c1ec574bdba8846c2549a2f1d6d5cb7825647 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/BeamDivergence.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/BeamDivergence.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/BiMaterialCylinders.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/BiMaterialCylinders.int.gz
index 8ee22b5d23b210edb55935f67336ad5e025e27cd..6d89f63b4e0650ec3758ad88a2dac7bfbbae6565 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/BiMaterialCylinders.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/BiMaterialCylinders.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/BoxesWithSpecularPeak.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/BoxesWithSpecularPeak.int.gz
index 505823b4c8116de20dcfa488cdf14eec4dcc03c7..5c3028addd6bfe8d6bcceda057bf5e869b925cbb 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/BoxesWithSpecularPeak.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/BoxesWithSpecularPeak.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/ConstantBackground.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/ConstantBackground.int.gz
index bc2f94d35eae055e8191f8e4621e8ee1e3d65799..c65bf2e87f2614e9c6d9da1f9dbf586df005a2b4 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/ConstantBackground.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/ConstantBackground.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/CoreShellNanoparticles.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/CoreShellNanoparticles.int.gz
index 92b3d595b68d6f0a5713f69e8e838b11ae1d5bf1..84417282b42f27c585c35cfdaf9886c28b1128af 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/CoreShellNanoparticles.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/CoreShellNanoparticles.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/CoreShellNanoparticles2.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/CoreShellNanoparticles2.int.gz
index 0175227256f70fd6a3dbe059dfd6c38d0dda7b78..98954b923a394a79e1db8fe6489d20db132635d3 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/CoreShellNanoparticles2.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/CoreShellNanoparticles2.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/CorrelatedRoughness.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/CorrelatedRoughness.int.gz
index 7c008c56f90eab08ed1498f57e0ff8f4f998ba1e..0fb297f33bd8ff2f576a21d4a04aaaf47bdfc982 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/CorrelatedRoughness.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/CorrelatedRoughness.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/CosineRipplesAtRectLattice.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/CosineRipplesAtRectLattice.int.gz
index 9bd77fb6ff14291e92c1259118eece05794abffb..2e74def1bcf34c154fbda95880486855ae7c2971 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/CosineRipplesAtRectLattice.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/CosineRipplesAtRectLattice.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/CustomFormFactor.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/CustomFormFactor.int.gz
index 6cf0301b00d229fa139fcdbf2e6cc4f7e0597622..83c056483088caa3c05e28c37c3eabfc55501305 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/CustomFormFactor.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/CustomFormFactor.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/Cylinders.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/Cylinders.int.gz
index 07e1371a7d562875e66947002203d0a0da5b1fcc..494df90e8041cecf18e7c0532f08f91af5f20ea6 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/Cylinders.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/Cylinders.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/CylindersAndPrisms.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/CylindersAndPrisms.int.gz
index de5aa0f78984f39361d625e8c85f1d2e3f98f6f1..c98692dbb9306d7c0c80c598e026ca3853afd881 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/CylindersAndPrisms.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/CylindersAndPrisms.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/CylindersInAverageLayer.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/CylindersInAverageLayer.int.gz
index cf0c42dccaba9839034340d8ec506479bfc6ce38..782c4e95d14e846d0b2aa2d19c322bed0518e0c8 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/CylindersInAverageLayer.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/CylindersInAverageLayer.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/CylindersInBA.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/CylindersInBA.int.gz
index bd1e2fa43b5e6320291647c934da348cdf3e9991..f74890dd2af27626cd0c84247a0578d0fd22fe98 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/CylindersInBA.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/CylindersInBA.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/DetectorResolutionFunction.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/DetectorResolutionFunction.int.gz
index 912d6edf638676e43d8211f6c294ed16ebaf6a1d..bc4b1cd9ca06f933f48d30023f006e7e4c36e97f 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/DetectorResolutionFunction.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/DetectorResolutionFunction.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/DodecahedraSAS.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/DodecahedraSAS.int.gz
index 9c81facd708e7a8e702e3d1ec6fe59e48cc0a08f..7ce57a81f7641acdb782ef120780fc8efa1865d7 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/DodecahedraSAS.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/DodecahedraSAS.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/GratingMC.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/GratingMC.int.gz
index adf77fe3274fd8a2c8ba97827546e9347d999e73..d3fda7701fde5f272f43103ff53685d27937f986 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/GratingMC.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/GratingMC.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/HalfSpheresInAverageTopLayer.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/HalfSpheresInAverageTopLayer.int.gz
index 1600a5abbb516d225ef1f826394878f79cfb53ff..664a673711ce6fe1bff2953c0289184f64d3b510 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/HalfSpheresInAverageTopLayer.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/HalfSpheresInAverageTopLayer.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/HexagonalLatticesWithBasis.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/HexagonalLatticesWithBasis.int.gz
index 048a47e507dae571033993230db557ff41a2846a..9a9c654403ba26fb35138ddb184bba1fbf981b39 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/HexagonalLatticesWithBasis.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/HexagonalLatticesWithBasis.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/Interference1DLattice.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/Interference1DLattice.int.gz
index 188ed4150ef9b987c049dedd9fe5de97eab87c44..29305d84a9b1f3a24b99d8374837fd0b68a439bf 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/Interference1DLattice.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/Interference1DLattice.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/Interference1DRadialParacrystal.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/Interference1DRadialParacrystal.int.gz
index 7ef21a4c9e0b884e885d00fd8eb68d5816436ab5..b6d7f453e8cc3b192cfdd2965ad0c26f4992bbc5 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/Interference1DRadialParacrystal.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/Interference1DRadialParacrystal.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/Interference2DCenteredSquareLattice.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/Interference2DCenteredSquareLattice.int.gz
index 19fb1c407736ee3637e7519a576438659770bda4..c67eb00d7ca45ceef79db7e10e8c211e6a748acf 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/Interference2DCenteredSquareLattice.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/Interference2DCenteredSquareLattice.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/Interference2DParacrystal.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/Interference2DParacrystal.int.gz
index cb448a380847b667a1290565822b460eee89393b..6a461776f18d8985bafa2dc9cf18f90ed53f89ff 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/Interference2DParacrystal.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/Interference2DParacrystal.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/Interference2DRotatedSquareLattice.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/Interference2DRotatedSquareLattice.int.gz
index c94922460a855396a169501b0871e6f93031412b..c261568cc74ce7558840f2ce2f3fb1aeefba45e1 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/Interference2DRotatedSquareLattice.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/Interference2DRotatedSquareLattice.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/Interference2DSquareFiniteLattice.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/Interference2DSquareFiniteLattice.int.gz
index 98945fc752898fd091c8648943212fb0cd0f9477..dbd62488054ed8a3f332769acd0ec997fd2e6ef9 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/Interference2DSquareFiniteLattice.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/Interference2DSquareFiniteLattice.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/LargeParticlesFormFactor.0.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/LargeParticlesFormFactor.0.int.gz
index e36807eb2e2656bd57c4ee093b06943cc542852e..968707e742e4283196f5788a3236e8f04cb6fbae 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/LargeParticlesFormFactor.0.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/LargeParticlesFormFactor.0.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/LargeParticlesFormFactor.1.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/LargeParticlesFormFactor.1.int.gz
index cf1598efb20f73650ec264272ceddfe7d24fb485..4e9db27f791581961d4972d0d15a3abacb32f0fa 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/LargeParticlesFormFactor.1.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/LargeParticlesFormFactor.1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/LargeParticlesFormFactor.2.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/LargeParticlesFormFactor.2.int.gz
index 1b867789841e0c0103f9c546ca305da468d7cdbc..74f155dbd8ad2b86d7889c46bf4d1a4c10676e34 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/LargeParticlesFormFactor.2.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/LargeParticlesFormFactor.2.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/LargeParticlesFormFactor.3.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/LargeParticlesFormFactor.3.int.gz
index 2e7eae73d94df5b35b473e040b54355815437943..28a7e08107a9e662d4cd52a4bf313973e5378be4 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/LargeParticlesFormFactor.3.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/LargeParticlesFormFactor.3.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/LatticeOrientationDistribution.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/LatticeOrientationDistribution.int.gz
index 8ad9bc9d01b3d102fc3dfbbe654476f037a39e02..22d805b2ea19e7fa2a14797c59ca1ae49a547674 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/LatticeOrientationDistribution.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/LatticeOrientationDistribution.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/MagneticCylinders1.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/MagneticCylinders1.int.gz
index 935d3a38ed73fc4b3a390dd4f04bd195a2f727db..726ec3c13d4bdf95b659e3f155ee2a6cab0f13dc 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/MagneticCylinders1.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/MagneticCylinders1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/MagneticCylinders2.0.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/MagneticCylinders2.0.int.gz
index 7178bb289ddb3aec10726d0f6b91a2a92c48388c..62439a389cb393d6b455e7a48b410687f04ba35a 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/MagneticCylinders2.0.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/MagneticCylinders2.0.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/MagneticCylinders2.1.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/MagneticCylinders2.1.int.gz
index fae1e0a73a55049bdde0d77778cc6a0fcc14789c..4df0c0e811d12de13e1b809afda09cf2e7cd0b82 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/MagneticCylinders2.1.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/MagneticCylinders2.1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/MagneticCylinders2.2.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/MagneticCylinders2.2.int.gz
index c4969d3c0d9e886fdbb143f3181383d0508c463d..62439a389cb393d6b455e7a48b410687f04ba35a 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/MagneticCylinders2.2.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/MagneticCylinders2.2.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/MagneticCylinders2.3.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/MagneticCylinders2.3.int.gz
index 5c696dda86240d02a06989f9338c22a4bdad624d..4df0c0e811d12de13e1b809afda09cf2e7cd0b82 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/MagneticCylinders2.3.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/MagneticCylinders2.3.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/MagneticSpheres.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/MagneticSpheres.int.gz
index 336ea3a160a9a5af62fdd4ee907da2226f1e51d6..8f21edc63d9325be90d55b917e21e031857e8ff9 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/MagneticSpheres.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/MagneticSpheres.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/Mesocrystal.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/Mesocrystal.int.gz
index ad08601e6123b47559d7f3f25a26a9cbeb144367..dac2dcd6115030056aa5ac378bb39ba721a9e262 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/Mesocrystal.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/Mesocrystal.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/Mesocrystal2.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/Mesocrystal2.int.gz
index a68f317a0cefb5b1e9a38793cb29fe109bedc53f..0747960a20564a4437d99edc847333b98fa511b0 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/Mesocrystal2.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/Mesocrystal2.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/Mesocrystal3.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/Mesocrystal3.int.gz
index 870c6faa2de3e4436d11cfcff08456b6484b901b..07fa9e9fa8d15e02d72a2485168dce3511b36795 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/Mesocrystal3.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/Mesocrystal3.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/ParticleAcrossInterface.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/ParticleAcrossInterface.int.gz
index a4ebc4ad270899615b1a8627d7894d53a615a73b..47f5a03eac17504a21a90ed9c387c045e19ee2da 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/ParticleAcrossInterface.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/ParticleAcrossInterface.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/PolarizedSANS.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/PolarizedSANS.int.gz
index 83fc487f97e3cad56f214e461b95895f189c78e0..6bf46d2379d5dfe618e1701ecc74be40e18b989e 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/PolarizedSANS.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/PolarizedSANS.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/PolydisperseCylinders.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/PolydisperseCylinders.int.gz
index 3c7104f1d17cfd60aabe4d0483a51ba0a161465a..3ec2b8b323cd5e91a0d90e7eb28b8825e97834e4 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/PolydisperseCylinders.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/PolydisperseCylinders.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/RectangularGrating.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/RectangularGrating.int.gz
index 9dcc44274b6e5e75d354ebd4d155afb0b48c1055..d5da3d2eee5f6c39efae017be6d765f722aa955b 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/RectangularGrating.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/RectangularGrating.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/RotatedPyramids.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/RotatedPyramids.int.gz
index 5b4e1a3c35ba16e79e4f16117dd13529c4231150..da8d374b531c17a3df77e3ee8766286e5b33dc3f 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/RotatedPyramids.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/RotatedPyramids.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/SlicedLayer.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/SlicedLayer.int.gz
index ebeafb1dbe0c192aa93ad1dfdfeabe684da94100..e05b003ec1a0553841b9858b9e5f6df919e2edec 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/SlicedLayer.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/SlicedLayer.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/SpheresAtHexLattice.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/SpheresAtHexLattice.int.gz
index 346a623f3994f17bd2fb5646e6cb027a50846855..99a0de8a7cc9835fe4a1070e8beb691c176f6702 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/SpheresAtHexLattice.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/SpheresAtHexLattice.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/scatter2d/TriangularRipple.int.gz b/Tests/ReferenceData/ExamplesMini/scatter2d/TriangularRipple.int.gz
index 720aa691bbce4ff5ce202b81691d9b464503ea7b..1cdf5c9166b87aa0f30987a3033b84b097d96246 100644
Binary files a/Tests/ReferenceData/ExamplesMini/scatter2d/TriangularRipple.int.gz and b/Tests/ReferenceData/ExamplesMini/scatter2d/TriangularRipple.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/specular/AlternatingLayers1.int.gz b/Tests/ReferenceData/ExamplesMini/specular/AlternatingLayers1.int.gz
index 40018bb4b70a10b16e800f4a553d444f041f0e9d..b302afd0358255e88f7b22cfea2f8ba95a5ce941 100644
Binary files a/Tests/ReferenceData/ExamplesMini/specular/AlternatingLayers1.int.gz and b/Tests/ReferenceData/ExamplesMini/specular/AlternatingLayers1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/specular/AlternatingLayers2.int.gz b/Tests/ReferenceData/ExamplesMini/specular/AlternatingLayers2.int.gz
index 480b050d9e4f97634694c018f778661aeb9aaad9..b302afd0358255e88f7b22cfea2f8ba95a5ce941 100644
Binary files a/Tests/ReferenceData/ExamplesMini/specular/AlternatingLayers2.int.gz and b/Tests/ReferenceData/ExamplesMini/specular/AlternatingLayers2.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/specular/BasicPolarizedReflectometry.0.int.gz b/Tests/ReferenceData/ExamplesMini/specular/BasicPolarizedReflectometry.0.int.gz
index 599f8e8ef7d1b67f69fe46e8f368b1b30d8a0e81..ace06d5d27981df44b33b0c24138c3e652ffb5d2 100644
Binary files a/Tests/ReferenceData/ExamplesMini/specular/BasicPolarizedReflectometry.0.int.gz and b/Tests/ReferenceData/ExamplesMini/specular/BasicPolarizedReflectometry.0.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/specular/BasicPolarizedReflectometry.1.int.gz b/Tests/ReferenceData/ExamplesMini/specular/BasicPolarizedReflectometry.1.int.gz
index e85bc0213fbffb91de9766f2d9865b121aa1e3e2..2e7df9a13e17a819943a738f2e546fd24be3e709 100644
Binary files a/Tests/ReferenceData/ExamplesMini/specular/BasicPolarizedReflectometry.1.int.gz and b/Tests/ReferenceData/ExamplesMini/specular/BasicPolarizedReflectometry.1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/specular/BeamFullDivergence.int.gz b/Tests/ReferenceData/ExamplesMini/specular/BeamFullDivergence.int.gz
index e5a334a85e4aa9c7eee7d425910f34b614fcdd9e..e0b7513c266d8c8b44d5d7cc24b7550dc93e7f66 100644
Binary files a/Tests/ReferenceData/ExamplesMini/specular/BeamFullDivergence.int.gz and b/Tests/ReferenceData/ExamplesMini/specular/BeamFullDivergence.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/specular/Distributions.0.int.gz b/Tests/ReferenceData/ExamplesMini/specular/Distributions.0.int.gz
index 3e312d97fbc24ca417970e9fa468ecb12bc6c922..18572da3f34c8d566dabe007a70358a88b9db74e 100644
Binary files a/Tests/ReferenceData/ExamplesMini/specular/Distributions.0.int.gz and b/Tests/ReferenceData/ExamplesMini/specular/Distributions.0.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/specular/Distributions.1.int.gz b/Tests/ReferenceData/ExamplesMini/specular/Distributions.1.int.gz
index 8a86027132c1720b898d6b79f3bf491d9f599a46..1257e557c440fe3703e520041be221adbde9451c 100644
Binary files a/Tests/ReferenceData/ExamplesMini/specular/Distributions.1.int.gz and b/Tests/ReferenceData/ExamplesMini/specular/Distributions.1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/specular/Distributions.2.int.gz b/Tests/ReferenceData/ExamplesMini/specular/Distributions.2.int.gz
index 0eb1f7cdec41c5bf69fcaf0fb398a574cdf073e5..f8a9e91b39e109f0b9211e8556234e041c1c1b06 100644
Binary files a/Tests/ReferenceData/ExamplesMini/specular/Distributions.2.int.gz and b/Tests/ReferenceData/ExamplesMini/specular/Distributions.2.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/specular/FootprintCorrection.0.int.gz b/Tests/ReferenceData/ExamplesMini/specular/FootprintCorrection.0.int.gz
index b937733e117e46fcf942d7d2e5626a8f11b8f7f6..f28b200f343036923e092a8ce60275a7842be9b3 100644
Binary files a/Tests/ReferenceData/ExamplesMini/specular/FootprintCorrection.0.int.gz and b/Tests/ReferenceData/ExamplesMini/specular/FootprintCorrection.0.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/specular/FootprintCorrection.1.int.gz b/Tests/ReferenceData/ExamplesMini/specular/FootprintCorrection.1.int.gz
index ad2a64fed5150ddcc62f6e55f1f3e52b09dc3c02..beacf6f93e02a53fe188496d7b6e0a064418e89b 100644
Binary files a/Tests/ReferenceData/ExamplesMini/specular/FootprintCorrection.1.int.gz and b/Tests/ReferenceData/ExamplesMini/specular/FootprintCorrection.1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/specular/GaussianBeams.0.int.gz b/Tests/ReferenceData/ExamplesMini/specular/GaussianBeams.0.int.gz
index 40397c296ccdfa8db7050e5df2be7f6900870c6c..be1e8306bebbba647abdf7e7c85b1c6f97967742 100644
Binary files a/Tests/ReferenceData/ExamplesMini/specular/GaussianBeams.0.int.gz and b/Tests/ReferenceData/ExamplesMini/specular/GaussianBeams.0.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/specular/GaussianBeams.1.int.gz b/Tests/ReferenceData/ExamplesMini/specular/GaussianBeams.1.int.gz
index 040b129cfba363da0e4ef517fcf9ebaa06006c4b..ee1e375e8d107d564b4cf832cfbb97e44f89347a 100644
Binary files a/Tests/ReferenceData/ExamplesMini/specular/GaussianBeams.1.int.gz and b/Tests/ReferenceData/ExamplesMini/specular/GaussianBeams.1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/specular/GaussianBeams.2.int.gz b/Tests/ReferenceData/ExamplesMini/specular/GaussianBeams.2.int.gz
index a13a6545cef9096dcdce78a48fa19f0e170da9f0..51358084ca3bab1312460aceac815bc756aa08f0 100644
Binary files a/Tests/ReferenceData/ExamplesMini/specular/GaussianBeams.2.int.gz and b/Tests/ReferenceData/ExamplesMini/specular/GaussianBeams.2.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/specular/GaussianBeams.3.int.gz b/Tests/ReferenceData/ExamplesMini/specular/GaussianBeams.3.int.gz
index 909fdbc6966489ff52821ba3d5d1eb47abd012e4..22b04ea9a462aaf217eb47f9fd1205d98205f264 100644
Binary files a/Tests/ReferenceData/ExamplesMini/specular/GaussianBeams.3.int.gz and b/Tests/ReferenceData/ExamplesMini/specular/GaussianBeams.3.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/specular/RoughnessModel.0.int.gz b/Tests/ReferenceData/ExamplesMini/specular/RoughnessModel.0.int.gz
index 9dd2c4981c85d5774ac0f845ec7bc98aa508dd62..4b1e179d3016df74a0c502b40c4cc59d136b6990 100644
Binary files a/Tests/ReferenceData/ExamplesMini/specular/RoughnessModel.0.int.gz and b/Tests/ReferenceData/ExamplesMini/specular/RoughnessModel.0.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/specular/RoughnessModel.1.int.gz b/Tests/ReferenceData/ExamplesMini/specular/RoughnessModel.1.int.gz
index 5a89543fdcb61fa1b0ac6e97ad8494def525ab7e..30f42e81d1bbc70671a38f97d2fcf62560e1c309 100644
Binary files a/Tests/ReferenceData/ExamplesMini/specular/RoughnessModel.1.int.gz and b/Tests/ReferenceData/ExamplesMini/specular/RoughnessModel.1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/specular/SpecularSimulationWithRoughness.int.gz b/Tests/ReferenceData/ExamplesMini/specular/SpecularSimulationWithRoughness.int.gz
index 24d296bc2af73a71716ccde4e018d49380144130..30f42e81d1bbc70671a38f97d2fcf62560e1c309 100644
Binary files a/Tests/ReferenceData/ExamplesMini/specular/SpecularSimulationWithRoughness.int.gz and b/Tests/ReferenceData/ExamplesMini/specular/SpecularSimulationWithRoughness.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/specular/TOFRWithResolution.int.gz b/Tests/ReferenceData/ExamplesMini/specular/TOFRWithResolution.int.gz
index e87c0b6451398418bfa36680d8519523d31fb19b..bfe9d1eb56e94d1df85491bdfe408affe106f924 100644
Binary files a/Tests/ReferenceData/ExamplesMini/specular/TOFRWithResolution.int.gz and b/Tests/ReferenceData/ExamplesMini/specular/TOFRWithResolution.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/specular/TimeOfFlightReflectometry.int.gz b/Tests/ReferenceData/ExamplesMini/specular/TimeOfFlightReflectometry.int.gz
index a7055931cc8cfc9ea239039e7f870a62b544dae7..ef91e37a74eac243fd03758f8e6904ad672bf015 100644
Binary files a/Tests/ReferenceData/ExamplesMini/specular/TimeOfFlightReflectometry.int.gz and b/Tests/ReferenceData/ExamplesMini/specular/TimeOfFlightReflectometry.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/specular/VsGenx.int.gz b/Tests/ReferenceData/ExamplesMini/specular/VsGenx.int.gz
index 0fd33ca2677c65b81fed4e65c3537de2eb432e34..8ce2762253e90ec0f20fcbcba62e771f8fb1ad52 100644
Binary files a/Tests/ReferenceData/ExamplesMini/specular/VsGenx.int.gz and b/Tests/ReferenceData/ExamplesMini/specular/VsGenx.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/varia/AccessingSimulationResults.int.gz b/Tests/ReferenceData/ExamplesMini/varia/AccessingSimulationResults.int.gz
index f25f8d1c566394bdf3e120bbf04f8df817bc3263..ba217be64c531b89a12da24334f94add49cbc50f 100644
Binary files a/Tests/ReferenceData/ExamplesMini/varia/AccessingSimulationResults.int.gz and b/Tests/ReferenceData/ExamplesMini/varia/AccessingSimulationResults.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/varia/Depthprobe1.int.gz b/Tests/ReferenceData/ExamplesMini/varia/Depthprobe1.int.gz
index c9471307f1285bd2b34a5837d693bfcc13484395..77f896684f41477f44960cc8fbfabe15f0d2b0f6 100644
Binary files a/Tests/ReferenceData/ExamplesMini/varia/Depthprobe1.int.gz and b/Tests/ReferenceData/ExamplesMini/varia/Depthprobe1.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/varia/OffspecSimulation.int.gz b/Tests/ReferenceData/ExamplesMini/varia/OffspecSimulation.int.gz
index 5320bfaf89e523d1af7d65e6494b35d13373a280..983b910478f75d9ea46d088323d5d9a515e08dcc 100644
Binary files a/Tests/ReferenceData/ExamplesMini/varia/OffspecSimulation.int.gz and b/Tests/ReferenceData/ExamplesMini/varia/OffspecSimulation.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/varia/Resonator.int.gz b/Tests/ReferenceData/ExamplesMini/varia/Resonator.int.gz
index ba82ebd3659d09dcfda0b578c3dd4f7cc51c9bfb..61b20e21cf3f2fb908c19ccf30013bbdfaf00565 100644
Binary files a/Tests/ReferenceData/ExamplesMini/varia/Resonator.int.gz and b/Tests/ReferenceData/ExamplesMini/varia/Resonator.int.gz differ
diff --git a/Tests/ReferenceData/ExamplesMini/varia/TransmittedModulus.int.gz b/Tests/ReferenceData/ExamplesMini/varia/TransmittedModulus.int.gz
index 150b78c7f92d41b4ff830dc47aab3c2a5636826f..97fc66b6f1ee4b4202c017e7a1bb880104da00b5 100644
Binary files a/Tests/ReferenceData/ExamplesMini/varia/TransmittedModulus.int.gz and b/Tests/ReferenceData/ExamplesMini/varia/TransmittedModulus.int.gz differ
diff --git a/Tests/ReferenceData/Suite/ApproximationDA.int.gz b/Tests/ReferenceData/Suite/ApproximationDA.int.gz
index 8b0e7b9565d829d8548c93acdc1f9afb408e2ae4..32db1fbb21c422438f09524b602c9d07500fbf0b 100644
Binary files a/Tests/ReferenceData/Suite/ApproximationDA.int.gz and b/Tests/ReferenceData/Suite/ApproximationDA.int.gz differ
diff --git a/Tests/ReferenceData/Suite/ApproximationLMA.int.gz b/Tests/ReferenceData/Suite/ApproximationLMA.int.gz
index ed84118898ca6947523d177a2b402eb00e57ba80..9c34ef5d35b13bac63eaf0e6f3a059a196735919 100644
Binary files a/Tests/ReferenceData/Suite/ApproximationLMA.int.gz and b/Tests/ReferenceData/Suite/ApproximationLMA.int.gz differ
diff --git a/Tests/ReferenceData/Suite/ApproximationSSCA.int.gz b/Tests/ReferenceData/Suite/ApproximationSSCA.int.gz
index 824c9a0fdfe7a674343359aad15019b64a8596ee..b3ec261be8c16fa7cb4dbbc90d678a16b03bb111 100644
Binary files a/Tests/ReferenceData/Suite/ApproximationSSCA.int.gz and b/Tests/ReferenceData/Suite/ApproximationSSCA.int.gz differ
diff --git a/Tests/ReferenceData/Suite/AsymRipple.int.gz b/Tests/ReferenceData/Suite/AsymRipple.int.gz
index 1a301117fb5f468721779a4431165182b05cb0ba..d1b0b695458e9f53e7ab791f4d644fa3d14f15b7 100644
Binary files a/Tests/ReferenceData/Suite/AsymRipple.int.gz and b/Tests/ReferenceData/Suite/AsymRipple.int.gz differ
diff --git a/Tests/ReferenceData/Suite/Basic2DParacrystal_Profile2DCauchy.int.gz b/Tests/ReferenceData/Suite/Basic2DParacrystal_Profile2DCauchy.int.gz
index 2c0595420dfeac8a84e4490956245c130e74ffe4..995415e35ab9fc2e7f9c07f63ee21de040fd5761 100644
Binary files a/Tests/ReferenceData/Suite/Basic2DParacrystal_Profile2DCauchy.int.gz and b/Tests/ReferenceData/Suite/Basic2DParacrystal_Profile2DCauchy.int.gz differ
diff --git a/Tests/ReferenceData/Suite/Basic2DParacrystal_Profile2DCone.int.gz b/Tests/ReferenceData/Suite/Basic2DParacrystal_Profile2DCone.int.gz
index 60c65e5d0c7e70ad8d2c9734d49c1091d6d9e39f..b60b1dd66b75740b18f5efdcab4c4c747d2f2635 100644
Binary files a/Tests/ReferenceData/Suite/Basic2DParacrystal_Profile2DCone.int.gz and b/Tests/ReferenceData/Suite/Basic2DParacrystal_Profile2DCone.int.gz differ
diff --git a/Tests/ReferenceData/Suite/Basic2DParacrystal_Profile2DGate.int.gz b/Tests/ReferenceData/Suite/Basic2DParacrystal_Profile2DGate.int.gz
index d860184703447d953e61da37714805d0f6fad0cb..dc4a0e0b4eb7c1734083eb924d0dd1e6743df787 100644
Binary files a/Tests/ReferenceData/Suite/Basic2DParacrystal_Profile2DGate.int.gz and b/Tests/ReferenceData/Suite/Basic2DParacrystal_Profile2DGate.int.gz differ
diff --git a/Tests/ReferenceData/Suite/Basic2DParacrystal_Profile2DGauss.int.gz b/Tests/ReferenceData/Suite/Basic2DParacrystal_Profile2DGauss.int.gz
index 8a4dbc7d90d2ca8e84a87fa279f8896e3a59aef4..78e927907406b7230d9769496135803e982dd617 100644
Binary files a/Tests/ReferenceData/Suite/Basic2DParacrystal_Profile2DGauss.int.gz and b/Tests/ReferenceData/Suite/Basic2DParacrystal_Profile2DGauss.int.gz differ
diff --git a/Tests/ReferenceData/Suite/Basic2DParacrystal_Profile2DVoigt.int.gz b/Tests/ReferenceData/Suite/Basic2DParacrystal_Profile2DVoigt.int.gz
index 051c60db4936ac9ab5032b3d18a317d2640afea8..f41a29d517b229153075137919c3489db80e7c66 100644
Binary files a/Tests/ReferenceData/Suite/Basic2DParacrystal_Profile2DVoigt.int.gz and b/Tests/ReferenceData/Suite/Basic2DParacrystal_Profile2DVoigt.int.gz differ
diff --git a/Tests/ReferenceData/Suite/BasicSpecularMM.int.gz b/Tests/ReferenceData/Suite/BasicSpecularMM.int.gz
index 8776c380b9e4e7ebd43f119c012364ad62eb036c..d79b01a5b3ee9f49834f7a8d134049c4cd12b970 100644
Binary files a/Tests/ReferenceData/Suite/BasicSpecularMM.int.gz and b/Tests/ReferenceData/Suite/BasicSpecularMM.int.gz differ
diff --git a/Tests/ReferenceData/Suite/BasicSpecularPP.int.gz b/Tests/ReferenceData/Suite/BasicSpecularPP.int.gz
index d2d390d005266c1eb07736d3e8ca0427e46a4f88..0b68b78c90a8c582588f47861fbff69898fc2d9b 100644
Binary files a/Tests/ReferenceData/Suite/BasicSpecularPP.int.gz and b/Tests/ReferenceData/Suite/BasicSpecularPP.int.gz differ
diff --git a/Tests/ReferenceData/Suite/BeamDivergence.int.gz b/Tests/ReferenceData/Suite/BeamDivergence.int.gz
index 50746880ac38cb70d4c6251136b87d165cb57cc7..3dfee38b8e71fb2388b8918919945fdd733225ff 100644
Binary files a/Tests/ReferenceData/Suite/BeamDivergence.int.gz and b/Tests/ReferenceData/Suite/BeamDivergence.int.gz differ
diff --git a/Tests/ReferenceData/Suite/BoxCompositionRotateX.int.gz b/Tests/ReferenceData/Suite/BoxCompositionRotateX.int.gz
index 9c2243d9757943e06f6883ad44586ba4302128dd..5ad1ac575b50f960a25d4223ae32a1dcd4f1cc0c 100644
Binary files a/Tests/ReferenceData/Suite/BoxCompositionRotateX.int.gz and b/Tests/ReferenceData/Suite/BoxCompositionRotateX.int.gz differ
diff --git a/Tests/ReferenceData/Suite/BoxCompositionRotateY.int.gz b/Tests/ReferenceData/Suite/BoxCompositionRotateY.int.gz
index ac5815899c133a643e46303b7336a409f04b5a83..2ab86bbdc9f50450c140211ba23b72b8369c91ca 100644
Binary files a/Tests/ReferenceData/Suite/BoxCompositionRotateY.int.gz and b/Tests/ReferenceData/Suite/BoxCompositionRotateY.int.gz differ
diff --git a/Tests/ReferenceData/Suite/BoxCompositionRotateZ.int.gz b/Tests/ReferenceData/Suite/BoxCompositionRotateZ.int.gz
index 4bc45c073e7261bb3d2a9747790332c3283e68a5..5eeef3804ee9a127f575655e2264836c171ac004 100644
Binary files a/Tests/ReferenceData/Suite/BoxCompositionRotateZ.int.gz and b/Tests/ReferenceData/Suite/BoxCompositionRotateZ.int.gz differ
diff --git a/Tests/ReferenceData/Suite/BoxCompositionRotateZandY.int.gz b/Tests/ReferenceData/Suite/BoxCompositionRotateZandY.int.gz
index 08f5588704fffc6afa8bbba6c7fbd4a355d12a33..0d049f87702c6c6466c13515cea949de0d70c32e 100644
Binary files a/Tests/ReferenceData/Suite/BoxCompositionRotateZandY.int.gz and b/Tests/ReferenceData/Suite/BoxCompositionRotateZandY.int.gz differ
diff --git a/Tests/ReferenceData/Suite/BoxStackComposition.int.gz b/Tests/ReferenceData/Suite/BoxStackComposition.int.gz
index 3ab1d27475660e7cc2fcc6be64ddaf532abe9b93..1dd0b3fc43c9d76f3969e9c82f2cf24c71504967 100644
Binary files a/Tests/ReferenceData/Suite/BoxStackComposition.int.gz and b/Tests/ReferenceData/Suite/BoxStackComposition.int.gz differ
diff --git a/Tests/ReferenceData/Suite/BoxesWithSpecular.int.gz b/Tests/ReferenceData/Suite/BoxesWithSpecular.int.gz
index fc3b6b037336bfba08e38ed422e10965470e70fd..80657170e73b0136795931bd4f684117f51ad114 100644
Binary files a/Tests/ReferenceData/Suite/BoxesWithSpecular.int.gz and b/Tests/ReferenceData/Suite/BoxesWithSpecular.int.gz differ
diff --git a/Tests/ReferenceData/Suite/CenteredSquareLattice2D.int.gz b/Tests/ReferenceData/Suite/CenteredSquareLattice2D.int.gz
index 7af1a674b6cc52bb0d4095ea5a27aa9f9c1c9c96..35241f902b1403bdfa0cec47d3930c67ef051bb5 100644
Binary files a/Tests/ReferenceData/Suite/CenteredSquareLattice2D.int.gz and b/Tests/ReferenceData/Suite/CenteredSquareLattice2D.int.gz differ
diff --git a/Tests/ReferenceData/Suite/Compound.int.gz b/Tests/ReferenceData/Suite/Compound.int.gz
index 010014ddf7e9c4a539e53cc2379bb547b05b7be1..7cecb5180846475092dced04749ead825090fff9 100644
Binary files a/Tests/ReferenceData/Suite/Compound.int.gz and b/Tests/ReferenceData/Suite/Compound.int.gz differ
diff --git a/Tests/ReferenceData/Suite/ConstantBackground.int.gz b/Tests/ReferenceData/Suite/ConstantBackground.int.gz
index 2ecb163f3f99495e32dd7868c989df5c3ef0f39b..5faf85e04d21bae940ec45fb89bd0e3538c4f9e1 100644
Binary files a/Tests/ReferenceData/Suite/ConstantBackground.int.gz and b/Tests/ReferenceData/Suite/ConstantBackground.int.gz differ
diff --git a/Tests/ReferenceData/Suite/CoreShellBoxRotateZandY.int.gz b/Tests/ReferenceData/Suite/CoreShellBoxRotateZandY.int.gz
index 99bbb3b48d57b825d41c75c10b4185c9a5558984..9ef0130cc00a7637d47efe749d3795dcf7f93575 100644
Binary files a/Tests/ReferenceData/Suite/CoreShellBoxRotateZandY.int.gz and b/Tests/ReferenceData/Suite/CoreShellBoxRotateZandY.int.gz differ
diff --git a/Tests/ReferenceData/Suite/CoreShellParticle.int.gz b/Tests/ReferenceData/Suite/CoreShellParticle.int.gz
index 1fcd15f0335787d3913e2eef6a96ab2afda7738c..02f84f7f49fbbbee8fb2d9e6e3fc60b162478ce5 100644
Binary files a/Tests/ReferenceData/Suite/CoreShellParticle.int.gz and b/Tests/ReferenceData/Suite/CoreShellParticle.int.gz differ
diff --git a/Tests/ReferenceData/Suite/CosineRipple.int.gz b/Tests/ReferenceData/Suite/CosineRipple.int.gz
index 9cafb030e4762c79d847d072223d6689b857291c..341fba7d6b9a6d3f11ca1dbd1838452791682be0 100644
Binary files a/Tests/ReferenceData/Suite/CosineRipple.int.gz and b/Tests/ReferenceData/Suite/CosineRipple.int.gz differ
diff --git a/Tests/ReferenceData/Suite/CustomMorphology.int.gz b/Tests/ReferenceData/Suite/CustomMorphology.int.gz
index b788fdd506eb3990fe81c06ee63926f5a61dd6ec..7420307e8e1c1e35121eb74b595347b2388d8fdb 100644
Binary files a/Tests/ReferenceData/Suite/CustomMorphology.int.gz and b/Tests/ReferenceData/Suite/CustomMorphology.int.gz differ
diff --git a/Tests/ReferenceData/Suite/CylindersAndPrisms.int.gz b/Tests/ReferenceData/Suite/CylindersAndPrisms.int.gz
index 416c1b6de06e0675b71d24c3339b4d35fdc8653f..e01f9e4920e619d0d8beb54cab00aa718e1a573c 100644
Binary files a/Tests/ReferenceData/Suite/CylindersAndPrisms.int.gz and b/Tests/ReferenceData/Suite/CylindersAndPrisms.int.gz differ
diff --git a/Tests/ReferenceData/Suite/DepthprobeTest.int.gz b/Tests/ReferenceData/Suite/DepthprobeTest.int.gz
index 2de5efa9d37c98f755863cb83c3b79ea12b577b4..f17c191d6777f3edb14709796ebf169b91d6e98b 100644
Binary files a/Tests/ReferenceData/Suite/DepthprobeTest.int.gz and b/Tests/ReferenceData/Suite/DepthprobeTest.int.gz differ
diff --git a/Tests/ReferenceData/Suite/DetectorResolution.int.gz b/Tests/ReferenceData/Suite/DetectorResolution.int.gz
index b864d3ab4d7a8653bd0a5036a987d48499ab09d7..08f04f5ae4bce6cdd7b1c33a0872652827c8900b 100644
Binary files a/Tests/ReferenceData/Suite/DetectorResolution.int.gz and b/Tests/ReferenceData/Suite/DetectorResolution.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FiniteSquareLattice2D.int.gz b/Tests/ReferenceData/Suite/FiniteSquareLattice2D.int.gz
index 7ae3b595432c12741df78624840ce17a8c5b6c54..5c68a487f75472cf81ba4f3c499c72fc0ad58eb1 100644
Binary files a/Tests/ReferenceData/Suite/FiniteSquareLattice2D.int.gz and b/Tests/ReferenceData/Suite/FiniteSquareLattice2D.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Bipyramid4.int.gz b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Bipyramid4.int.gz
index 6387fb081c842f5b8ef2689a60164c10a4dc220b..59d667ce0fc5896648e8421ae4f62024c15c9972 100644
Binary files a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Bipyramid4.int.gz and b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Bipyramid4.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Box.int.gz b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Box.int.gz
index ad808a5e8718f9f8150b69a1e1fccbc5947ee9fe..9d715a91ab049b6fc395d0b47eec2092b2f1dcac 100644
Binary files a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Box.int.gz and b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Box.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_CantellatedCube.int.gz b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_CantellatedCube.int.gz
index 6da6f3d174796bf1808d9b389a4de0df3f4e7144..9a78b7ad0055d34137b22de5cf3d27686c1e7f99 100644
Binary files a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_CantellatedCube.int.gz and b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_CantellatedCube.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Cone.int.gz b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Cone.int.gz
index f1b304b6325510c2c6afeb4b7be9e9e89b36ab21..4de90c7c64f667813d579063f7a2be9db6be579a 100644
Binary files a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Cone.int.gz and b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Cone.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_CosineRippleBox.int.gz b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_CosineRippleBox.int.gz
index c1dc151930d0196bb5ba6fe614b862a8637a7a5b..f51a755c171d97f45a181d96a968879f4517e942 100644
Binary files a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_CosineRippleBox.int.gz and b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_CosineRippleBox.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Cylinder.int.gz b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Cylinder.int.gz
index f3a84f06cd1aa8be4ffe4ffadd4b97da8e107f3f..ff5044297266f2358f7f3ea720a24d07687ba3dc 100644
Binary files a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Cylinder.int.gz and b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Cylinder.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Dodecahedron.int.gz b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Dodecahedron.int.gz
index 4d520e5501010a63b5e5b3cb1de81c4083ac02f5..e2a6cf1bd17c444e8da8e56473ad10968ee31d55 100644
Binary files a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Dodecahedron.int.gz and b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Dodecahedron.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_EllipsoidalCylinder.int.gz b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_EllipsoidalCylinder.int.gz
index e5fa0b4379bb8599d474e6ffa82ec3fe423a678a..93d5cd62c2055c48e75ffa92bb521b0a7f8ead24 100644
Binary files a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_EllipsoidalCylinder.int.gz and b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_EllipsoidalCylinder.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_HemiEllipsoid.int.gz b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_HemiEllipsoid.int.gz
index 89bcb00e341ee44352e27a14edc4d94254ed102d..f1a0f607434ece765f851df223355a69dcea3c1c 100644
Binary files a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_HemiEllipsoid.int.gz and b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_HemiEllipsoid.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_HorizontalCylinder.int.gz b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_HorizontalCylinder.int.gz
index 8b3bdb8b3c4461e5e735513793581a04203c660a..e42cb6e3f8fa13ec78d3ab1bbd5cc06a2d7e1d69 100644
Binary files a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_HorizontalCylinder.int.gz and b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_HorizontalCylinder.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Icosahedron.int.gz b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Icosahedron.int.gz
index a9705e546d19ba88a134296144397469cf402613..0cdd54e07e15b3f0cee340915d50437e9581909c 100644
Binary files a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Icosahedron.int.gz and b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Icosahedron.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_PlatonicOctahedron.int.gz b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_PlatonicOctahedron.int.gz
index 814d6ac0e1b117db67197191b64a54f31d688375..dbc06026d6ead0cade90fdcf6961e67748080eec 100644
Binary files a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_PlatonicOctahedron.int.gz and b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_PlatonicOctahedron.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_PlatonicTetrahedron.int.gz b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_PlatonicTetrahedron.int.gz
index 1f03ab2b65821efe4d08217bfaa8cb9047eaa5f4..f80f4efb84217794c95dd70cbeaceef0dd33cdd6 100644
Binary files a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_PlatonicTetrahedron.int.gz and b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_PlatonicTetrahedron.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Prism3.int.gz b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Prism3.int.gz
index 9254d0b9bc51a8f14239619fb5ddfb4f15c0f56d..d06ead9e937a6789c8ac495f83fe191cfe3bd96c 100644
Binary files a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Prism3.int.gz and b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Prism3.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Prism6.int.gz b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Prism6.int.gz
index 93ce69d94f207d3e5cd4e333834f3c8d3a6e132a..8aeba802833d1c27d250d90ed32368acc1349a9c 100644
Binary files a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Prism6.int.gz and b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Prism6.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Pyramid2.int.gz b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Pyramid2.int.gz
index b310c783f38400926d08dcb8f97de27791289373..e4798e61affa70fc684d6dfefb44f79fd78a7309 100644
Binary files a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Pyramid2.int.gz and b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Pyramid2.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Pyramid3.int.gz b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Pyramid3.int.gz
index 43f3b5913179afa27c35fbdbfa44d2b189c51cfa..98e905b0b2dd27c2f6f3f50d57204f40d7c11e78 100644
Binary files a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Pyramid3.int.gz and b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Pyramid3.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Pyramid4.int.gz b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Pyramid4.int.gz
index 8836ba2cb106123749b5894774f126324c5873ba..85001a51bc8a8c1cc04f8e8b447f39c24bed7a27 100644
Binary files a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Pyramid4.int.gz and b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Pyramid4.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Pyramid6.int.gz b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Pyramid6.int.gz
index b7874931b32e7e7936bbaf23976f5d61a6085ec9..78d12279b3bb67fe779e9fc46ce992ceba6eab97 100644
Binary files a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Pyramid6.int.gz and b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Pyramid6.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_SawtoothRippleBox.int.gz b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_SawtoothRippleBox.int.gz
index 4ab73ea5f79c6de458067e10d39d55cea690abe7..e027baa833f9254ee9e0b39795543266ee111376 100644
Binary files a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_SawtoothRippleBox.int.gz and b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_SawtoothRippleBox.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Sphere.int.gz b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Sphere.int.gz
index c5715edb308c077cb0c0ea9da90b12493d34e374..9b9fd9f8f604b89e6b44d8bd26a7abd6cfc61919 100644
Binary files a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Sphere.int.gz and b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Sphere.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Spheroid.int.gz b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Spheroid.int.gz
index 8bf3b0e7b552fa20aef90776e1c905de18cfaef2..816496def5f94f7b8ca6c7a0871838ef088c9c1e 100644
Binary files a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Spheroid.int.gz and b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_Spheroid.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_TruncatedCube.int.gz b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_TruncatedCube.int.gz
index 6991ef311b4ea24d73edfa47a0342366f6ff2520..e27d50a5c47a2e5f3433968819c377474f558660 100644
Binary files a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_TruncatedCube.int.gz and b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_TruncatedCube.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_TruncatedSphere.int.gz b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_TruncatedSphere.int.gz
index edddc4d0fc95ee901a519f9f8313c50ddde9b608..232170f3b0eb6da0ec746cbd2d5a1a5e67eb9575 100644
Binary files a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_TruncatedSphere.int.gz and b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_TruncatedSphere.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_TruncatedSpheroid.int.gz b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_TruncatedSpheroid.int.gz
index 51277f6390eacf7c0b02560d1e8c5601105be5b4..232170f3b0eb6da0ec746cbd2d5a1a5e67eb9575 100644
Binary files a/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_TruncatedSpheroid.int.gz and b/Tests/ReferenceData/Suite/FormFactorsWithAbsorption_TruncatedSpheroid.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactors_Bipyramid4.int.gz b/Tests/ReferenceData/Suite/FormFactors_Bipyramid4.int.gz
index b1c0b83a943fe2c40141f4c8d93094404622d528..5707ddf5a5c9e8854f40b4c4d44f48333948147c 100644
Binary files a/Tests/ReferenceData/Suite/FormFactors_Bipyramid4.int.gz and b/Tests/ReferenceData/Suite/FormFactors_Bipyramid4.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactors_Box.int.gz b/Tests/ReferenceData/Suite/FormFactors_Box.int.gz
index 9dd83aae5ba44b93eafaa676060eab009e19c98e..57f08f7de3f1b02d7b06ba748694296642b93526 100644
Binary files a/Tests/ReferenceData/Suite/FormFactors_Box.int.gz and b/Tests/ReferenceData/Suite/FormFactors_Box.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactors_CantellatedCube.int.gz b/Tests/ReferenceData/Suite/FormFactors_CantellatedCube.int.gz
index f04041c7d3926e0a2d352b0b8b3a7802e534e9c0..3c9b76e0042b672dcd0724603b7e34ca06c7b07e 100644
Binary files a/Tests/ReferenceData/Suite/FormFactors_CantellatedCube.int.gz and b/Tests/ReferenceData/Suite/FormFactors_CantellatedCube.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactors_Cone.int.gz b/Tests/ReferenceData/Suite/FormFactors_Cone.int.gz
index e91204e8b031d098e7a067114e2042201674f954..dc22bc10b968dfcbf2b62336e77fa130d6eaa886 100644
Binary files a/Tests/ReferenceData/Suite/FormFactors_Cone.int.gz and b/Tests/ReferenceData/Suite/FormFactors_Cone.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactors_CosineRippleBox.int.gz b/Tests/ReferenceData/Suite/FormFactors_CosineRippleBox.int.gz
index ba36ea00b24fe5f2461e68590e9d89b542ee8081..a457d385395287d4441609840b4dc8488d273881 100644
Binary files a/Tests/ReferenceData/Suite/FormFactors_CosineRippleBox.int.gz and b/Tests/ReferenceData/Suite/FormFactors_CosineRippleBox.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactors_Cylinder.int.gz b/Tests/ReferenceData/Suite/FormFactors_Cylinder.int.gz
index b0a1ef0dbb1acf25c6be61376f14c84323cea4aa..2f50488a3838fa48b27974111125ebcb0fefa79c 100644
Binary files a/Tests/ReferenceData/Suite/FormFactors_Cylinder.int.gz and b/Tests/ReferenceData/Suite/FormFactors_Cylinder.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactors_Dodecahedron.int.gz b/Tests/ReferenceData/Suite/FormFactors_Dodecahedron.int.gz
index 4c0ba6e4d7590425a66ba63c618f8d00155db25f..6e76104d2d2ad6ecce50eb7c6e91721ec2f9aae6 100644
Binary files a/Tests/ReferenceData/Suite/FormFactors_Dodecahedron.int.gz and b/Tests/ReferenceData/Suite/FormFactors_Dodecahedron.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactors_EllipsoidalCylinder.int.gz b/Tests/ReferenceData/Suite/FormFactors_EllipsoidalCylinder.int.gz
index 4e6a83cb30fb4065495df80969d05fb0c51cbdc2..d24d05afa1f5c5cd7a79bac8c899b049125c0169 100644
Binary files a/Tests/ReferenceData/Suite/FormFactors_EllipsoidalCylinder.int.gz and b/Tests/ReferenceData/Suite/FormFactors_EllipsoidalCylinder.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactors_HemiEllipsoid.int.gz b/Tests/ReferenceData/Suite/FormFactors_HemiEllipsoid.int.gz
index 9ed73f6ba0f8b582851833bf589a5d9006c80b6a..f149601d45cf7a36fb01a4625a4c7ebbef3ce3d4 100644
Binary files a/Tests/ReferenceData/Suite/FormFactors_HemiEllipsoid.int.gz and b/Tests/ReferenceData/Suite/FormFactors_HemiEllipsoid.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactors_HorizontalCylinder.int.gz b/Tests/ReferenceData/Suite/FormFactors_HorizontalCylinder.int.gz
index 4a32181f4378fcb04ed3374ef294f1588359aedb..02ff7288e2028d3cf5ee0bd631eeb773c98718dd 100644
Binary files a/Tests/ReferenceData/Suite/FormFactors_HorizontalCylinder.int.gz and b/Tests/ReferenceData/Suite/FormFactors_HorizontalCylinder.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactors_Icosahedron.int.gz b/Tests/ReferenceData/Suite/FormFactors_Icosahedron.int.gz
index e8df8dfcb0e3ec610ec27049fd75c7023744f018..ca0628d5ccef9593608df2763dda490dd191933a 100644
Binary files a/Tests/ReferenceData/Suite/FormFactors_Icosahedron.int.gz and b/Tests/ReferenceData/Suite/FormFactors_Icosahedron.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactors_PlatonicOctahedron.int.gz b/Tests/ReferenceData/Suite/FormFactors_PlatonicOctahedron.int.gz
index 2e6e52ca0920eb9f852cbca7c3027ec8c92f4437..4eb7833b8b69ea4c6b30dff7f6d852dcabb9c8e9 100644
Binary files a/Tests/ReferenceData/Suite/FormFactors_PlatonicOctahedron.int.gz and b/Tests/ReferenceData/Suite/FormFactors_PlatonicOctahedron.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactors_PlatonicTetrahedron.int.gz b/Tests/ReferenceData/Suite/FormFactors_PlatonicTetrahedron.int.gz
index e0ec0ee654277733e847ad830af5d7bb74702455..866fe449c8c08277ae6e7540b09ea1ce44376ee6 100644
Binary files a/Tests/ReferenceData/Suite/FormFactors_PlatonicTetrahedron.int.gz and b/Tests/ReferenceData/Suite/FormFactors_PlatonicTetrahedron.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactors_Prism3.int.gz b/Tests/ReferenceData/Suite/FormFactors_Prism3.int.gz
index 602bb14c780f062b19081e6f6249e55582421c19..2effee1696c73af8a179a22047960d8ef02d9974 100644
Binary files a/Tests/ReferenceData/Suite/FormFactors_Prism3.int.gz and b/Tests/ReferenceData/Suite/FormFactors_Prism3.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactors_Prism6.int.gz b/Tests/ReferenceData/Suite/FormFactors_Prism6.int.gz
index 63f0ee0592e1407e17779cf80a9bf91838abaf02..0a838c2c11445e5a17b36ba73b1d797305f0e978 100644
Binary files a/Tests/ReferenceData/Suite/FormFactors_Prism6.int.gz and b/Tests/ReferenceData/Suite/FormFactors_Prism6.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactors_Pyramid2.int.gz b/Tests/ReferenceData/Suite/FormFactors_Pyramid2.int.gz
index b15b465b76ecd29718019547d1cf2556fb030634..b2c0af9eb93e48708f34c8931b6638925fdd56ea 100644
Binary files a/Tests/ReferenceData/Suite/FormFactors_Pyramid2.int.gz and b/Tests/ReferenceData/Suite/FormFactors_Pyramid2.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactors_Pyramid3.int.gz b/Tests/ReferenceData/Suite/FormFactors_Pyramid3.int.gz
index ff8afa4bf6146b41caaef9b213d786ed091164c7..33479ec0156a1880caa5e13003248f53c9e11d48 100644
Binary files a/Tests/ReferenceData/Suite/FormFactors_Pyramid3.int.gz and b/Tests/ReferenceData/Suite/FormFactors_Pyramid3.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactors_Pyramid4.int.gz b/Tests/ReferenceData/Suite/FormFactors_Pyramid4.int.gz
index 0c247f1b7d7c9ce39c65ff39642d5cd58c22e7e4..707d3983cf1b75d7e2bfca9343bda7bccb32823a 100644
Binary files a/Tests/ReferenceData/Suite/FormFactors_Pyramid4.int.gz and b/Tests/ReferenceData/Suite/FormFactors_Pyramid4.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactors_Pyramid6.int.gz b/Tests/ReferenceData/Suite/FormFactors_Pyramid6.int.gz
index eb161f4e740afbd4175196c88f313f737c5326f2..f7310e87026e1184dafabcd19908191ad62fdd74 100644
Binary files a/Tests/ReferenceData/Suite/FormFactors_Pyramid6.int.gz and b/Tests/ReferenceData/Suite/FormFactors_Pyramid6.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactors_SawtoothRippleBox.int.gz b/Tests/ReferenceData/Suite/FormFactors_SawtoothRippleBox.int.gz
index 2b6aae14b26c15d211211dfaf32901bc9de3f24b..bd60c9b0e5bfc4fad45f8960563a9cbe8a77a457 100644
Binary files a/Tests/ReferenceData/Suite/FormFactors_SawtoothRippleBox.int.gz and b/Tests/ReferenceData/Suite/FormFactors_SawtoothRippleBox.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactors_Sphere.int.gz b/Tests/ReferenceData/Suite/FormFactors_Sphere.int.gz
index a124dcf6deca2dda368caf4b8dc1a096be6d37a3..483ce6b8387fa2d09f9c05672185729e9b11bcaf 100644
Binary files a/Tests/ReferenceData/Suite/FormFactors_Sphere.int.gz and b/Tests/ReferenceData/Suite/FormFactors_Sphere.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactors_Spheroid.int.gz b/Tests/ReferenceData/Suite/FormFactors_Spheroid.int.gz
index 5027847a2522b2d27e04d3658e99e44aa39c7b0d..73cc4a582906f77d4c7f588cf26e42ce90c83ac6 100644
Binary files a/Tests/ReferenceData/Suite/FormFactors_Spheroid.int.gz and b/Tests/ReferenceData/Suite/FormFactors_Spheroid.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactors_TruncatedCube.int.gz b/Tests/ReferenceData/Suite/FormFactors_TruncatedCube.int.gz
index 367c07e1e2cafaa25dc3ee9629b3321de64057b8..8a48b740ceee246e3a073fb0011c8d9172434171 100644
Binary files a/Tests/ReferenceData/Suite/FormFactors_TruncatedCube.int.gz and b/Tests/ReferenceData/Suite/FormFactors_TruncatedCube.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactors_TruncatedSphere.int.gz b/Tests/ReferenceData/Suite/FormFactors_TruncatedSphere.int.gz
index 5a239ce3fa39e438fcc0f53eb6c42694aa18d4c3..81c4e76060a30026b6b3404f958a4965cb58b6c5 100644
Binary files a/Tests/ReferenceData/Suite/FormFactors_TruncatedSphere.int.gz and b/Tests/ReferenceData/Suite/FormFactors_TruncatedSphere.int.gz differ
diff --git a/Tests/ReferenceData/Suite/FormFactors_TruncatedSpheroid.int.gz b/Tests/ReferenceData/Suite/FormFactors_TruncatedSpheroid.int.gz
index 05be578a6c5466d52ba1ed46ab69860491162b08..81c4e76060a30026b6b3404f958a4965cb58b6c5 100644
Binary files a/Tests/ReferenceData/Suite/FormFactors_TruncatedSpheroid.int.gz and b/Tests/ReferenceData/Suite/FormFactors_TruncatedSpheroid.int.gz differ
diff --git a/Tests/ReferenceData/Suite/GISASAbsorptiveSLDLayers.int.gz b/Tests/ReferenceData/Suite/GISASAbsorptiveSLDLayers.int.gz
index 79df9847082bde6822d13c9df4bcedf69aab4dc6..2c3ddf01484992026458b5ca11932b005024ad0d 100644
Binary files a/Tests/ReferenceData/Suite/GISASAbsorptiveSLDLayers.int.gz and b/Tests/ReferenceData/Suite/GISASAbsorptiveSLDLayers.int.gz differ
diff --git a/Tests/ReferenceData/Suite/GaussianBeamFootprint.int.gz b/Tests/ReferenceData/Suite/GaussianBeamFootprint.int.gz
index b0f60a182137e9a5faf7cccf9f25d629588afe55..8c25ec8335db3a27c737caa12a8332e6b02ab10f 100644
Binary files a/Tests/ReferenceData/Suite/GaussianBeamFootprint.int.gz and b/Tests/ReferenceData/Suite/GaussianBeamFootprint.int.gz differ
diff --git a/Tests/ReferenceData/Suite/HardDisk.int.gz b/Tests/ReferenceData/Suite/HardDisk.int.gz
index 6b6efd2f6f305ea7fee849c8f5f308f499ef178f..5ceffa35b6e7021d8e7145254d0f887899623897 100644
Binary files a/Tests/ReferenceData/Suite/HardDisk.int.gz and b/Tests/ReferenceData/Suite/HardDisk.int.gz differ
diff --git a/Tests/ReferenceData/Suite/HexParacrystal.int.gz b/Tests/ReferenceData/Suite/HexParacrystal.int.gz
index ac9ddf8dc38ff83b91af1c5ce2ca022b21c42a14..0bd7570e16ea7bca36d28fd0e51a14c854424d69 100644
Binary files a/Tests/ReferenceData/Suite/HexParacrystal.int.gz and b/Tests/ReferenceData/Suite/HexParacrystal.int.gz differ
diff --git a/Tests/ReferenceData/Suite/HomogeneousTiNiSample.int.gz b/Tests/ReferenceData/Suite/HomogeneousTiNiSample.int.gz
index 76ab9f4e622fe46c87497d6343c189d117f48878..b5712132705b502960130e7e4396c1086892d0cf 100644
Binary files a/Tests/ReferenceData/Suite/HomogeneousTiNiSample.int.gz and b/Tests/ReferenceData/Suite/HomogeneousTiNiSample.int.gz differ
diff --git a/Tests/ReferenceData/Suite/HomogeneousTiNiSampleWithAbsorption.int.gz b/Tests/ReferenceData/Suite/HomogeneousTiNiSampleWithAbsorption.int.gz
index bac5ee49ec7fe4d4c89d50c115ba34931e3745c8..ab85f5f1ad240b7454e1017e0121445d486e7136 100644
Binary files a/Tests/ReferenceData/Suite/HomogeneousTiNiSampleWithAbsorption.int.gz and b/Tests/ReferenceData/Suite/HomogeneousTiNiSampleWithAbsorption.int.gz differ
diff --git a/Tests/ReferenceData/Suite/InstrumentDefinitionComparison_0.int.gz b/Tests/ReferenceData/Suite/InstrumentDefinitionComparison_0.int.gz
index 84087aacd2ea70c7b8d7f2d181639a6abc84ebd5..65fc8a503d0ef56ea46842cbe59d2a0c8f9a10a9 100644
Binary files a/Tests/ReferenceData/Suite/InstrumentDefinitionComparison_0.int.gz and b/Tests/ReferenceData/Suite/InstrumentDefinitionComparison_0.int.gz differ
diff --git a/Tests/ReferenceData/Suite/InstrumentDefinitionComparison_Q.int.gz b/Tests/ReferenceData/Suite/InstrumentDefinitionComparison_Q.int.gz
index d2852c4c892a04d9fa535c51592ba2cced2e47fb..451bc3832789bdb016495e8bacdee30397e77ae3 100644
Binary files a/Tests/ReferenceData/Suite/InstrumentDefinitionComparison_Q.int.gz and b/Tests/ReferenceData/Suite/InstrumentDefinitionComparison_Q.int.gz differ
diff --git a/Tests/ReferenceData/Suite/LargeCylindersMonteCarlo.int.gz b/Tests/ReferenceData/Suite/LargeCylindersMonteCarlo.int.gz
index 5961a201073eccf50a8ec29057dd3f3dab140444..fbbd93c7a3ec37f7cde9bcf2fad5b6aef91f9abc 100644
Binary files a/Tests/ReferenceData/Suite/LargeCylindersMonteCarlo.int.gz and b/Tests/ReferenceData/Suite/LargeCylindersMonteCarlo.int.gz differ
diff --git a/Tests/ReferenceData/Suite/Lattice1D.int.gz b/Tests/ReferenceData/Suite/Lattice1D.int.gz
index 9f5920b5230cb8ed4798426666043a02481b797e..ff4cf4712042dbbf3f00e5d4e7eb386db74a0666 100644
Binary files a/Tests/ReferenceData/Suite/Lattice1D.int.gz and b/Tests/ReferenceData/Suite/Lattice1D.int.gz differ
diff --git a/Tests/ReferenceData/Suite/MagneticCylindersMM.int.gz b/Tests/ReferenceData/Suite/MagneticCylindersMM.int.gz
index 69dad4e5186b08dc94b2b1acfb108a8f59ee9e6b..c1566337c5af2844639a013d34691f0c510e613c 100644
Binary files a/Tests/ReferenceData/Suite/MagneticCylindersMM.int.gz and b/Tests/ReferenceData/Suite/MagneticCylindersMM.int.gz differ
diff --git a/Tests/ReferenceData/Suite/MagneticCylindersMP.int.gz b/Tests/ReferenceData/Suite/MagneticCylindersMP.int.gz
index 24449b68a0dab87e7061ae7bce76d56a97208be3..ed0ab3fe28d1fc9d41eec0c33c12625d215c322a 100644
Binary files a/Tests/ReferenceData/Suite/MagneticCylindersMP.int.gz and b/Tests/ReferenceData/Suite/MagneticCylindersMP.int.gz differ
diff --git a/Tests/ReferenceData/Suite/MagneticCylindersPM.int.gz b/Tests/ReferenceData/Suite/MagneticCylindersPM.int.gz
index 6d29b90fab7bab48abfd8d8ec35d1df8000a1b07..69f4b54d9430275c199a535611c355ce0ff694e0 100644
Binary files a/Tests/ReferenceData/Suite/MagneticCylindersPM.int.gz and b/Tests/ReferenceData/Suite/MagneticCylindersPM.int.gz differ
diff --git a/Tests/ReferenceData/Suite/MagneticCylindersPP.int.gz b/Tests/ReferenceData/Suite/MagneticCylindersPP.int.gz
index ef326534ed42a88b016350c8d2d87d8bea0f564d..53f55b2317b5c0fc78737aba67c66b8b00819ed9 100644
Binary files a/Tests/ReferenceData/Suite/MagneticCylindersPP.int.gz and b/Tests/ReferenceData/Suite/MagneticCylindersPP.int.gz differ
diff --git a/Tests/ReferenceData/Suite/MagneticParticleZeroField.int.gz b/Tests/ReferenceData/Suite/MagneticParticleZeroField.int.gz
index 01f4f28af820790b226fd0c43724e74136ca203b..4dc0de0c31960189047e8eaf43dadb87192ebcf9 100644
Binary files a/Tests/ReferenceData/Suite/MagneticParticleZeroField.int.gz and b/Tests/ReferenceData/Suite/MagneticParticleZeroField.int.gz differ
diff --git a/Tests/ReferenceData/Suite/MagneticRotationReflectivityMM_Flat.int.gz b/Tests/ReferenceData/Suite/MagneticRotationReflectivityMM_Flat.int.gz
index f7ce5169d4ce913eb8e667edadbd0b9d0c4fd9c7..b0462c036178f18a977a989da6349b79569352a0 100644
Binary files a/Tests/ReferenceData/Suite/MagneticRotationReflectivityMM_Flat.int.gz and b/Tests/ReferenceData/Suite/MagneticRotationReflectivityMM_Flat.int.gz differ
diff --git a/Tests/ReferenceData/Suite/MagneticRotationReflectivityMM_NevotCroce.int.gz b/Tests/ReferenceData/Suite/MagneticRotationReflectivityMM_NevotCroce.int.gz
index dad18998da57eea6aab7870646e002b174773d39..4d3236e9370b7936f65e1b77fe7cc90d6224009e 100644
Binary files a/Tests/ReferenceData/Suite/MagneticRotationReflectivityMM_NevotCroce.int.gz and b/Tests/ReferenceData/Suite/MagneticRotationReflectivityMM_NevotCroce.int.gz differ
diff --git a/Tests/ReferenceData/Suite/MagneticRotationReflectivityMM_Tanh.int.gz b/Tests/ReferenceData/Suite/MagneticRotationReflectivityMM_Tanh.int.gz
index d435965e6f064b616477e93c146131a1a5c9fc31..d8b5602d4d827dd92eb91aebfb774023b8955b75 100644
Binary files a/Tests/ReferenceData/Suite/MagneticRotationReflectivityMM_Tanh.int.gz and b/Tests/ReferenceData/Suite/MagneticRotationReflectivityMM_Tanh.int.gz differ
diff --git a/Tests/ReferenceData/Suite/MagneticRotationReflectivityMP_Flat.int.gz b/Tests/ReferenceData/Suite/MagneticRotationReflectivityMP_Flat.int.gz
index 8605f60d924c0bd4347810ad62504efca6521727..ca10a58430a13bbef8c4f9c9c0459c8cae72350e 100644
Binary files a/Tests/ReferenceData/Suite/MagneticRotationReflectivityMP_Flat.int.gz and b/Tests/ReferenceData/Suite/MagneticRotationReflectivityMP_Flat.int.gz differ
diff --git a/Tests/ReferenceData/Suite/MagneticRotationReflectivityMP_NevotCroce.int.gz b/Tests/ReferenceData/Suite/MagneticRotationReflectivityMP_NevotCroce.int.gz
index f007aa72fe5afbc444fde84134e286e4b486626f..eee57da80d11bb0981ba878efa2f2fec4b8b1468 100644
Binary files a/Tests/ReferenceData/Suite/MagneticRotationReflectivityMP_NevotCroce.int.gz and b/Tests/ReferenceData/Suite/MagneticRotationReflectivityMP_NevotCroce.int.gz differ
diff --git a/Tests/ReferenceData/Suite/MagneticRotationReflectivityMP_Tanh.int.gz b/Tests/ReferenceData/Suite/MagneticRotationReflectivityMP_Tanh.int.gz
index e287f1b1cfb842382cfec48393147aa259a129de..db977036c3e71459178df85e0e0f1ff15b6694eb 100644
Binary files a/Tests/ReferenceData/Suite/MagneticRotationReflectivityMP_Tanh.int.gz and b/Tests/ReferenceData/Suite/MagneticRotationReflectivityMP_Tanh.int.gz differ
diff --git a/Tests/ReferenceData/Suite/MagneticRotationReflectivityPM_Flat.int.gz b/Tests/ReferenceData/Suite/MagneticRotationReflectivityPM_Flat.int.gz
index cab0cf4c93cc6ed35af888f18afa481e8f7ea057..1b24592343eadd9e4f0145a9cd5a2db1b6447837 100644
Binary files a/Tests/ReferenceData/Suite/MagneticRotationReflectivityPM_Flat.int.gz and b/Tests/ReferenceData/Suite/MagneticRotationReflectivityPM_Flat.int.gz differ
diff --git a/Tests/ReferenceData/Suite/MagneticRotationReflectivityPM_NevotCroce.int.gz b/Tests/ReferenceData/Suite/MagneticRotationReflectivityPM_NevotCroce.int.gz
index 15e0f7463bae34f9f870aed363a6352bb266dfcf..37b3e16e07fbeba77d49ac5f419ba658814048e9 100644
Binary files a/Tests/ReferenceData/Suite/MagneticRotationReflectivityPM_NevotCroce.int.gz and b/Tests/ReferenceData/Suite/MagneticRotationReflectivityPM_NevotCroce.int.gz differ
diff --git a/Tests/ReferenceData/Suite/MagneticRotationReflectivityPM_Tanh.int.gz b/Tests/ReferenceData/Suite/MagneticRotationReflectivityPM_Tanh.int.gz
index 718ed89bb501608d76d0f285e14c51f4b72d2c22..8cf4944ee9d5d1a9ecb88fe793b4eba4a455d99c 100644
Binary files a/Tests/ReferenceData/Suite/MagneticRotationReflectivityPM_Tanh.int.gz and b/Tests/ReferenceData/Suite/MagneticRotationReflectivityPM_Tanh.int.gz differ
diff --git a/Tests/ReferenceData/Suite/MagneticRotationReflectivityPP_Flat.int.gz b/Tests/ReferenceData/Suite/MagneticRotationReflectivityPP_Flat.int.gz
index 317516d157691de5765671e6f0568beaa57cfb08..219397f37cb4b270fd339ae231ebd8195fa1db94 100644
Binary files a/Tests/ReferenceData/Suite/MagneticRotationReflectivityPP_Flat.int.gz and b/Tests/ReferenceData/Suite/MagneticRotationReflectivityPP_Flat.int.gz differ
diff --git a/Tests/ReferenceData/Suite/MagneticRotationReflectivityPP_NevotCroce.int.gz b/Tests/ReferenceData/Suite/MagneticRotationReflectivityPP_NevotCroce.int.gz
index 45c26eceefb8696aa5df58e486c44af783ccabf6..cc1ef6e76bb3b39161872469ae103ff6190ffd76 100644
Binary files a/Tests/ReferenceData/Suite/MagneticRotationReflectivityPP_NevotCroce.int.gz and b/Tests/ReferenceData/Suite/MagneticRotationReflectivityPP_NevotCroce.int.gz differ
diff --git a/Tests/ReferenceData/Suite/MagneticRotationReflectivityPP_Tanh.int.gz b/Tests/ReferenceData/Suite/MagneticRotationReflectivityPP_Tanh.int.gz
index bca2c0b2e529c07d01af255ab6d6ad22b5dd332b..eabb6d6d2e74267760a3b3b379c981c2ba4d19ad 100644
Binary files a/Tests/ReferenceData/Suite/MagneticRotationReflectivityPP_Tanh.int.gz and b/Tests/ReferenceData/Suite/MagneticRotationReflectivityPP_Tanh.int.gz differ
diff --git a/Tests/ReferenceData/Suite/MagneticRotationZPM.int.gz b/Tests/ReferenceData/Suite/MagneticRotationZPM.int.gz
index 7a2eb8a933dacb5f561579c7f7f3ca0704e04916..5562056353cad87ed602f9ea539892a9bbb3e0f2 100644
Binary files a/Tests/ReferenceData/Suite/MagneticRotationZPM.int.gz and b/Tests/ReferenceData/Suite/MagneticRotationZPM.int.gz differ
diff --git a/Tests/ReferenceData/Suite/MagneticSpheres.int.gz b/Tests/ReferenceData/Suite/MagneticSpheres.int.gz
index 8d3fbef4edb6bbf42b05330102432a765653d40d..408245a0d90fcfb16425cff07cd73baea3612426 100644
Binary files a/Tests/ReferenceData/Suite/MagneticSpheres.int.gz and b/Tests/ReferenceData/Suite/MagneticSpheres.int.gz differ
diff --git a/Tests/ReferenceData/Suite/MagneticSpheresInMagLayerMP.int.gz b/Tests/ReferenceData/Suite/MagneticSpheresInMagLayerMP.int.gz
index 7227485ae6b24a473100f05e3d26db30977f8144..5511c52fc9cc5e37bf0933698c6601e8f7eaa567 100644
Binary files a/Tests/ReferenceData/Suite/MagneticSpheresInMagLayerMP.int.gz and b/Tests/ReferenceData/Suite/MagneticSpheresInMagLayerMP.int.gz differ
diff --git a/Tests/ReferenceData/Suite/MagneticSpheresInMagLayerPP.int.gz b/Tests/ReferenceData/Suite/MagneticSpheresInMagLayerPP.int.gz
index 9dac27612d489753830339f5c7fc4f80772a14dd..017b3dcdb1327f484e877e83101043dada2aa0ce 100644
Binary files a/Tests/ReferenceData/Suite/MagneticSpheresInMagLayerPP.int.gz and b/Tests/ReferenceData/Suite/MagneticSpheresInMagLayerPP.int.gz differ
diff --git a/Tests/ReferenceData/Suite/MagneticSubstrateZeroField.int.gz b/Tests/ReferenceData/Suite/MagneticSubstrateZeroField.int.gz
index d5179970346899b2b15b1a5217eaa72d9e180708..c3991618298b364ff5b6091ef33cbcf9bc305d73 100644
Binary files a/Tests/ReferenceData/Suite/MagneticSubstrateZeroField.int.gz and b/Tests/ReferenceData/Suite/MagneticSubstrateZeroField.int.gz differ
diff --git a/Tests/ReferenceData/Suite/Mesocrystal.int.gz b/Tests/ReferenceData/Suite/Mesocrystal.int.gz
index c6e7b3e274c7999f7bbd84108ea81f989a6e2e09..3ba08f222c31b9176369f2fd85f8934e981b26ff 100644
Binary files a/Tests/ReferenceData/Suite/Mesocrystal.int.gz and b/Tests/ReferenceData/Suite/Mesocrystal.int.gz differ
diff --git a/Tests/ReferenceData/Suite/MultiLayerWithRoughness.int.gz b/Tests/ReferenceData/Suite/MultiLayerWithRoughness.int.gz
index ff2af945bc2278a8f9234a1c2815a8612688e23a..ff74d82374afc55c2e1010f1d9d5e083101df3b0 100644
Binary files a/Tests/ReferenceData/Suite/MultiLayerWithRoughness.int.gz and b/Tests/ReferenceData/Suite/MultiLayerWithRoughness.int.gz differ
diff --git a/Tests/ReferenceData/Suite/MultipleLayout.int.gz b/Tests/ReferenceData/Suite/MultipleLayout.int.gz
index 0a920aa06061374f507b2d9810da4c75369c3ec7..e6cfd8f1a668e4fd9046ee4da4b03750bf399ab9 100644
Binary files a/Tests/ReferenceData/Suite/MultipleLayout.int.gz and b/Tests/ReferenceData/Suite/MultipleLayout.int.gz differ
diff --git a/Tests/ReferenceData/Suite/NCRoughnessInSpecular.int.gz b/Tests/ReferenceData/Suite/NCRoughnessInSpecular.int.gz
index 886335afa3a29678e278c4027ba8a25efe3cf29c..9555c48ca125f38c1d319f78b70bd690ecacb708 100644
Binary files a/Tests/ReferenceData/Suite/NCRoughnessInSpecular.int.gz and b/Tests/ReferenceData/Suite/NCRoughnessInSpecular.int.gz differ
diff --git a/Tests/ReferenceData/Suite/OffspecResonator.int.gz b/Tests/ReferenceData/Suite/OffspecResonator.int.gz
index 6572a6108ec34e295203eb6372d7c7a4b62fd856..c8d4c31ca7e29869cceae003bb0c7a06d9c58ba7 100644
Binary files a/Tests/ReferenceData/Suite/OffspecResonator.int.gz and b/Tests/ReferenceData/Suite/OffspecResonator.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerMM.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerMM.int.gz
index 91517ef8003d14e41122b5c3418afbda82c5f797..d655054989f681eb3ceaee7c318ec4862d235862 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerMM.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerMM.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerMM_Q.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerMM_Q.int.gz
index 3c3b4b882d79971b9d76262a20562c480f62a4a1..5c2ea7c30237f9084cb9cdf06704bfe41e571585 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerMM_Q.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerMM_Q.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerNCMM.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerNCMM.int.gz
index d539fc79a7924d62fe10a23ab241f52f9371c4a6..0d34c21525bd440f572981ac822c0924bd1dca51 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerNCMM.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerNCMM.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerNCMM_Q.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerNCMM_Q.int.gz
index 0d15b704b66e2c933d819af1a2308845caafeb01..45533f3a69efd2f383a956877335a3fad258115e 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerNCMM_Q.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerNCMM_Q.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerNCPP.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerNCPP.int.gz
index cd413b4d9e0d8da251226a65fdb7bf98e9dedb16..124a715a395e47b3d2d383731762f2471e420686 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerNCPP.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerNCPP.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerNCPP_Q.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerNCPP_Q.int.gz
index 0bb3a2c5e836a83566d9765db53b17d09d4505cb..eb1947e5efdb973a8756f117a10ec6f9562ffc77 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerNCPP_Q.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerNCPP_Q.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerPP.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerPP.int.gz
index 4e2227a4b45aa3c5fe2aff1ae77e425139ee421d..fe9ff9c7803ebbd176f4f759fa018188aefb32d5 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerPP.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerPP.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerPP_Q.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerPP_Q.int.gz
index 481103a5c43ebe82a5558a9f083ce904e309f41b..2acd5bbb455bbaefad8b7692030b1504a516142c 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerPP_Q.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerPP_Q.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipMM.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipMM.int.gz
index 909c80999003a2aeb9609319b27e7972d4b2dc29..d1c79681bdcaeddb72904ca074893fc0600c2818 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipMM.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipMM.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipMM_Q.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipMM_Q.int.gz
index ea4e3442cb36e89e3ca5284a9c1d0a129de87e5a..5f6f45936cd4c5e2191bf36205c3a0383765404b 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipMM_Q.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipMM_Q.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipMP.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipMP.int.gz
index 56bf11aed594483a1275f0a96e1e68b4afb988e7..311e6de620fadf03b1d5f666d2c20eb50217e02c 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipMP.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipMP.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipMP_Q.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipMP_Q.int.gz
index cdf90b8f71dc007c2a0241847e22ffc641b3b3f7..41daab9d80a445ed69cdeef5f4c8bb307d766bce 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipMP_Q.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipMP_Q.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCMM.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCMM.int.gz
index 1996f31a5c58bbe1374cf665df11148b48afd487..1d09b80b0dae9df9a160dd8dd61482b0d7eef854 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCMM.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCMM.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCMM_Q.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCMM_Q.int.gz
index 3b4a5aeb65a58176dbd86067c864fb00c7052cb2..493743e8e4fe517baf1b0d4618bb1207ada0105d 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCMM_Q.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCMM_Q.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCMP.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCMP.int.gz
index 990d952cd00178cd7af5f06249351928fea91adf..eba1f4b57a703943bb4e0c012ad3d0730f0491b6 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCMP.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCMP.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCMP_Q.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCMP_Q.int.gz
index 6e6ee832f39f270d7809953e8ac1f8c45f92b1ff..52eebb08c5f30916ce3df8a64fa0544e87668e25 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCMP_Q.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCMP_Q.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCPM.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCPM.int.gz
index e2ce905e6910596473513c1617e80ab1c8c70c88..d3e5b5d64b54d2762f4bd6847be4949c2d64a25c 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCPM.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCPM.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCPM_Q.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCPM_Q.int.gz
index 43c355d15a8db8a1db39acb55784544f951197b1..3d736de4abb5aa6eab04c751c070c5285e29dfc1 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCPM_Q.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCPM_Q.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCPP.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCPP.int.gz
index 844079752423a01df04030f59f11d639b6bc95dc..52faacc70ce69cf77d5959999ef8527b6dd3f9e9 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCPP.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCPP.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCPP_Q.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCPP_Q.int.gz
index 6d0917ae07dc80bc4d0d53e45d5d309b9e5b2ef9..d187c4ef8fc9a247d3b3be9696e1fe4b83cf87b9 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCPP_Q.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipNCPP_Q.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipPM.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipPM.int.gz
index 7d406e9f643ea79f03ba556a7dd37dde9911e15b..838239f4e8361313f75245cb11af58cddec246c8 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipPM.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipPM.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipPM_Q.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipPM_Q.int.gz
index 15ce2c3c92a95d9b8a367c8ee3eb9845f0a2d911..320acd6b4f18f249ea654c4c96687b581e34ad04 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipPM_Q.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipPM_Q.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipPP.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipPP.int.gz
index 515b3fe5fe8872b2cae840ca0ce98569ffbb0a08..f5e6bcba1e0d168e19fb18e557e60650a22e8ac6 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipPP.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipPP.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipPP_Q.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipPP_Q.int.gz
index f9832c6fcf2a7ef3118600e34a41d5c9e3da756c..03a39638820bbbdcea441b214ee356fbbcbcd531 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipPP_Q.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipPP_Q.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhMM.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhMM.int.gz
index 17331a8a047f10ee75fdec8747049fe92b4e8eb4..78bf19cd02f45e71003785864cd3bf984750b844 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhMM.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhMM.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhMM_Q.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhMM_Q.int.gz
index af47c733ba939c7003641db71a23ba0db15ad6fb..6a023c0f0b567da1c3d9a9abee805a3f6a4223d8 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhMM_Q.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhMM_Q.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhMP.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhMP.int.gz
index eacd75bb7ecea6e5ba4f0be732bd3ed0da7f7d7d..db62e270a26e8e13c5f4e05854a8f007aee06217 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhMP.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhMP.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhMP_Q.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhMP_Q.int.gz
index aa22563385b8369afbf7828aeafc868f5b8a0c2c..1b0611c8e477cde62ebda4e00f844b45b1fd9672 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhMP_Q.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhMP_Q.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhPM.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhPM.int.gz
index f23557755bba6eb2efbecd59d3ff0b4de9c44220..4331463b30d34120b9320c4fc106c83fc23b9394 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhPM.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhPM.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhPM_Q.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhPM_Q.int.gz
index 23ff9e3334d2d8376d2a404d99183f67a9158bcf..0d8168825f57ee4af13a09708e22fbb9500c1c43 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhPM_Q.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhPM_Q.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhPP.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhPP.int.gz
index 08888ea7e6e28f80f1171f678024a6d2f426b84d..b6f81856cbf7ade00c982cbfe98ef039ab4b4ec8 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhPP.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhPP.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhPP_Q.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhPP_Q.int.gz
index 2678a9c556dc5bf123aba1f288f0720dee49f5fa..58845aa1862d1a2932f3ea5b8fd0aba60fcb97fc 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhPP_Q.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerSpinFlipTanhPP_Q.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerTanhMM.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerTanhMM.int.gz
index c6560c9bc8154993236f7eefeea6552cfd07d3dd..5c6c1e8cca47720dcf31056588ccf39c51f1b8d5 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerTanhMM.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerTanhMM.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerTanhMM_Q.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerTanhMM_Q.int.gz
index 3148e2fefe151436a7e3e095e09ea656b28303be..e215f33ab30c53ebffe54753df63ac5f4f10d6cd 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerTanhMM_Q.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerTanhMM_Q.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerTanhPP.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerTanhPP.int.gz
index 18c703b13009a06217395e0997dafc46a45b0daa..baff0c472397b9c5371032c6fcde4cfdc9a24d45 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerTanhPP.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerTanhPP.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerTanhPP_Q.int.gz b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerTanhPP_Q.int.gz
index dfa5d3a7dcc14d4f6c496f7186b5b20bb4cf0144..1902f8abd37dea21791141abafbf45f6dc7b50af 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedFeNiBilayerTanhPP_Q.int.gz and b/Tests/ReferenceData/Suite/PolarizedFeNiBilayerTanhPP_Q.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedQAngleReflectivityMM_Q.int.gz b/Tests/ReferenceData/Suite/PolarizedQAngleReflectivityMM_Q.int.gz
index 0cf9c6ae0efc3781604de28d5b14a3f15749598d..ea5609343ab9beaa0614d3cc60aa660577842480 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedQAngleReflectivityMM_Q.int.gz and b/Tests/ReferenceData/Suite/PolarizedQAngleReflectivityMM_Q.int.gz differ
diff --git a/Tests/ReferenceData/Suite/PolarizedQAngleReflectivityPP_Q.int.gz b/Tests/ReferenceData/Suite/PolarizedQAngleReflectivityPP_Q.int.gz
index 188705c687a5a9178dceb84cf6e13d3d7b2677ff..e679603fb75b2ecaa0954801ce4a0fe1baa84f94 100644
Binary files a/Tests/ReferenceData/Suite/PolarizedQAngleReflectivityPP_Q.int.gz and b/Tests/ReferenceData/Suite/PolarizedQAngleReflectivityPP_Q.int.gz differ
diff --git a/Tests/ReferenceData/Suite/RadialParacrystal.int.gz b/Tests/ReferenceData/Suite/RadialParacrystal.int.gz
index 3b7952e28b60021c54b934ae768bc751cf9a8c5e..7b1350a3b6ca451a463f712ee3efb172ef12b4f6 100644
Binary files a/Tests/ReferenceData/Suite/RadialParacrystal.int.gz and b/Tests/ReferenceData/Suite/RadialParacrystal.int.gz differ
diff --git a/Tests/ReferenceData/Suite/RectDetWithRoi.int.gz b/Tests/ReferenceData/Suite/RectDetWithRoi.int.gz
index 8b2672980ca96037a99aa41f5e5f12d6eb308e6f..390a6f47224a27af9d13d907a211d0b00e5af058 100644
Binary files a/Tests/ReferenceData/Suite/RectDetWithRoi.int.gz and b/Tests/ReferenceData/Suite/RectDetWithRoi.int.gz differ
diff --git a/Tests/ReferenceData/Suite/RectDetectorGeneric.int.gz b/Tests/ReferenceData/Suite/RectDetectorGeneric.int.gz
index 1d838f5f04722c96e479c7cdf48b5f3f6cd36c12..b8bc1c5fbf3f9d2d000b70ae6a17dec29845f8e5 100644
Binary files a/Tests/ReferenceData/Suite/RectDetectorGeneric.int.gz and b/Tests/ReferenceData/Suite/RectDetectorGeneric.int.gz differ
diff --git a/Tests/ReferenceData/Suite/RectDetectorPerpToDirectBeam.int.gz b/Tests/ReferenceData/Suite/RectDetectorPerpToDirectBeam.int.gz
index 9f3a4b75aa04fb617bc7b4b91e64effc9b815734..3a5abe2ef9ad4008d41d72c392ce92c170daf3c3 100644
Binary files a/Tests/ReferenceData/Suite/RectDetectorPerpToDirectBeam.int.gz and b/Tests/ReferenceData/Suite/RectDetectorPerpToDirectBeam.int.gz differ
diff --git a/Tests/ReferenceData/Suite/RectDetectorPerpToReflectedBeam.int.gz b/Tests/ReferenceData/Suite/RectDetectorPerpToReflectedBeam.int.gz
index 61d6cd1da802654331df4ca50a367426b781922b..9f14051dfaacdcda80fa91221824479c36998e2e 100644
Binary files a/Tests/ReferenceData/Suite/RectDetectorPerpToReflectedBeam.int.gz and b/Tests/ReferenceData/Suite/RectDetectorPerpToReflectedBeam.int.gz differ
diff --git a/Tests/ReferenceData/Suite/RectDetectorPerpToSample.int.gz b/Tests/ReferenceData/Suite/RectDetectorPerpToSample.int.gz
index d2b333fd19fa2c028f5e7fb59e52452cf64d9493..a59fa9f16858321b43318543b7380bb07d756abe 100644
Binary files a/Tests/ReferenceData/Suite/RectDetectorPerpToSample.int.gz and b/Tests/ReferenceData/Suite/RectDetectorPerpToSample.int.gz differ
diff --git a/Tests/ReferenceData/Suite/RectParacrystal.int.gz b/Tests/ReferenceData/Suite/RectParacrystal.int.gz
index 1c0304c862310c398c9c60b19d448d148b31bbc0..75373b3380a21fbc9035b7f4e314a43df98d0865 100644
Binary files a/Tests/ReferenceData/Suite/RectParacrystal.int.gz and b/Tests/ReferenceData/Suite/RectParacrystal.int.gz differ
diff --git a/Tests/ReferenceData/Suite/RelativeResolutionTOF.int.gz b/Tests/ReferenceData/Suite/RelativeResolutionTOF.int.gz
index d3c7ae48873884a904c9ed89734e6b5f10561cba..d3ddc75e4e0b4e86966e752691d69ddd6287b4d5 100644
Binary files a/Tests/ReferenceData/Suite/RelativeResolutionTOF.int.gz and b/Tests/ReferenceData/Suite/RelativeResolutionTOF.int.gz differ
diff --git a/Tests/ReferenceData/Suite/RotatedPyramids.int.gz b/Tests/ReferenceData/Suite/RotatedPyramids.int.gz
index 8cbe015d4d40b8a60dc47c6cb949b02abeede0b1..13ca08e829070f873e53d101ab29d4e958823fe0 100644
Binary files a/Tests/ReferenceData/Suite/RotatedPyramids.int.gz and b/Tests/ReferenceData/Suite/RotatedPyramids.int.gz differ
diff --git a/Tests/ReferenceData/Suite/RotatedSquareLattice2D.int.gz b/Tests/ReferenceData/Suite/RotatedSquareLattice2D.int.gz
index 2f392867537ecefaf4027d1d9b0eb8c0d6512fd2..a6ebe1d7123df722e6b561d17838cd88b5db82f9 100644
Binary files a/Tests/ReferenceData/Suite/RotatedSquareLattice2D.int.gz and b/Tests/ReferenceData/Suite/RotatedSquareLattice2D.int.gz differ
diff --git a/Tests/ReferenceData/Suite/RoughnessInSpecular.int.gz b/Tests/ReferenceData/Suite/RoughnessInSpecular.int.gz
index fafb7b007aa22ce908d7de132316dda5ff7cac26..848c0a04627534959247719d2ef481745be26dbf 100644
Binary files a/Tests/ReferenceData/Suite/RoughnessInSpecular.int.gz and b/Tests/ReferenceData/Suite/RoughnessInSpecular.int.gz differ
diff --git a/Tests/ReferenceData/Suite/SimulationWithMasks.int.gz b/Tests/ReferenceData/Suite/SimulationWithMasks.int.gz
index c4cbfffbca07378ee65b2b62d50fe225e7f62381..48f6e748788fb9bccc34f60316d1bcabec83571a 100644
Binary files a/Tests/ReferenceData/Suite/SimulationWithMasks.int.gz and b/Tests/ReferenceData/Suite/SimulationWithMasks.int.gz differ
diff --git a/Tests/ReferenceData/Suite/SlicedComposition.int.gz b/Tests/ReferenceData/Suite/SlicedComposition.int.gz
index 06187ae430426308fa0f7e9d1986daeed9f852fc..de1f1f93552c62c7b9f73ae9a0067102fce20e61 100644
Binary files a/Tests/ReferenceData/Suite/SlicedComposition.int.gz and b/Tests/ReferenceData/Suite/SlicedComposition.int.gz differ
diff --git a/Tests/ReferenceData/Suite/SpecularDivergentBeam.int.gz b/Tests/ReferenceData/Suite/SpecularDivergentBeam.int.gz
index 2975d23ce84bf6855be4539e7a7a46e256e0efec..4cdfe8264b32323a04294a4e1387892c8976b8bf 100644
Binary files a/Tests/ReferenceData/Suite/SpecularDivergentBeam.int.gz and b/Tests/ReferenceData/Suite/SpecularDivergentBeam.int.gz differ
diff --git a/Tests/ReferenceData/Suite/SpecularWithSlicing1.int.gz b/Tests/ReferenceData/Suite/SpecularWithSlicing1.int.gz
index 5bb43bfb6d64cbed6df02db936be6735fad2f3ba..aaa5674c4b2eb4f248a3b7505e955d0788f0e878 100644
Binary files a/Tests/ReferenceData/Suite/SpecularWithSlicing1.int.gz and b/Tests/ReferenceData/Suite/SpecularWithSlicing1.int.gz differ
diff --git a/Tests/ReferenceData/Suite/SpecularWithSlicing2.int.gz b/Tests/ReferenceData/Suite/SpecularWithSlicing2.int.gz
index aaeb8a4ab920f40b334e3aff1fecf01b8225321b..a95e6beaaabcfb3745e658db82415c1be65852ed 100644
Binary files a/Tests/ReferenceData/Suite/SpecularWithSlicing2.int.gz and b/Tests/ReferenceData/Suite/SpecularWithSlicing2.int.gz differ
diff --git a/Tests/ReferenceData/Suite/SpecularWithSlicing2Q.int.gz b/Tests/ReferenceData/Suite/SpecularWithSlicing2Q.int.gz
index 06f5573085beb5d764460afcb51d9d698cd7e66f..d3e41730eeaa6a37b5ff5e65a2f79814c2e19ae7 100644
Binary files a/Tests/ReferenceData/Suite/SpecularWithSlicing2Q.int.gz and b/Tests/ReferenceData/Suite/SpecularWithSlicing2Q.int.gz differ
diff --git a/Tests/ReferenceData/Suite/SpecularWithSlicing3.int.gz b/Tests/ReferenceData/Suite/SpecularWithSlicing3.int.gz
index 88954dd2426549f9ab760f8296d6f66500541c61..db829e54a4cfd1ce7979261ecedc59be8f66b8f5 100644
Binary files a/Tests/ReferenceData/Suite/SpecularWithSlicing3.int.gz and b/Tests/ReferenceData/Suite/SpecularWithSlicing3.int.gz differ
diff --git a/Tests/ReferenceData/Suite/SphericalDetWithRoi.int.gz b/Tests/ReferenceData/Suite/SphericalDetWithRoi.int.gz
index dfd39eea9e37584caa6b04fb71acbcb2ccc6facd..367d256e8f0ee4884f04a458781b1694b86557f4 100644
Binary files a/Tests/ReferenceData/Suite/SphericalDetWithRoi.int.gz and b/Tests/ReferenceData/Suite/SphericalDetWithRoi.int.gz differ
diff --git a/Tests/ReferenceData/Suite/SquareBeamFootprint.int.gz b/Tests/ReferenceData/Suite/SquareBeamFootprint.int.gz
index 5b042951a06e89db755176e98beddcc10e3f6e24..f6981db3ff601b0a9cb3b3b1917e516c45c55ed1 100644
Binary files a/Tests/ReferenceData/Suite/SquareBeamFootprint.int.gz and b/Tests/ReferenceData/Suite/SquareBeamFootprint.int.gz differ
diff --git a/Tests/ReferenceData/Suite/SquareLattice2D.int.gz b/Tests/ReferenceData/Suite/SquareLattice2D.int.gz
index 21c50f75a3a47a3d19051963c5d20b8f6e663a0a..b2ffd2975c2dd407485e42476e7a52662c0a3761 100644
Binary files a/Tests/ReferenceData/Suite/SquareLattice2D.int.gz and b/Tests/ReferenceData/Suite/SquareLattice2D.int.gz differ
diff --git a/Tests/ReferenceData/Suite/SuperLattice.int.gz b/Tests/ReferenceData/Suite/SuperLattice.int.gz
index 18de0c8194f70fced84b9dd09ed4603061e53822..1ba51ed83cd6ef9fdc748003e3e8e3346a448498 100644
Binary files a/Tests/ReferenceData/Suite/SuperLattice.int.gz and b/Tests/ReferenceData/Suite/SuperLattice.int.gz differ
diff --git a/Tests/ReferenceData/Suite/TOFResolutionComparison_TP.int.gz b/Tests/ReferenceData/Suite/TOFResolutionComparison_TP.int.gz
index 16ab1947c42c00ac703dcff1d79bc83bca2788c1..d3ddc75e4e0b4e86966e752691d69ddd6287b4d5 100644
Binary files a/Tests/ReferenceData/Suite/TOFResolutionComparison_TP.int.gz and b/Tests/ReferenceData/Suite/TOFResolutionComparison_TP.int.gz differ
diff --git a/Tests/ReferenceData/Suite/TOFResolutionComparison_TR.int.gz b/Tests/ReferenceData/Suite/TOFResolutionComparison_TR.int.gz
index 297da022049576238ac00333b1d628ef478a92bd..d3ddc75e4e0b4e86966e752691d69ddd6287b4d5 100644
Binary files a/Tests/ReferenceData/Suite/TOFResolutionComparison_TR.int.gz and b/Tests/ReferenceData/Suite/TOFResolutionComparison_TR.int.gz differ
diff --git a/Tests/ReferenceData/Suite/ThickAbsorptiveSampleWithRoughness.int.gz b/Tests/ReferenceData/Suite/ThickAbsorptiveSampleWithRoughness.int.gz
index 9236793e7a050b8afc61c52fd6be45094064f956..df05ae71508df024e743d2655941d7ad48df6554 100644
Binary files a/Tests/ReferenceData/Suite/ThickAbsorptiveSampleWithRoughness.int.gz and b/Tests/ReferenceData/Suite/ThickAbsorptiveSampleWithRoughness.int.gz differ
diff --git a/Tests/ReferenceData/Suite/TransformBox.int.gz b/Tests/ReferenceData/Suite/TransformBox.int.gz
index b8bf6b845ea465892ce42e7829cdc1d8722dd666..4ecd3396ce7ed9d34625cd225421e81f76725f6b 100644
Binary files a/Tests/ReferenceData/Suite/TransformBox.int.gz and b/Tests/ReferenceData/Suite/TransformBox.int.gz differ
diff --git a/Tests/ReferenceData/Suite/TriangularRipple.int.gz b/Tests/ReferenceData/Suite/TriangularRipple.int.gz
index 7374ead5d3d9557e4227b8c0d8738c74c7b6af6f..0faf26b9a73f6b3d89ffc01f4afb9ccf3d5d65dc 100644
Binary files a/Tests/ReferenceData/Suite/TriangularRipple.int.gz and b/Tests/ReferenceData/Suite/TriangularRipple.int.gz differ
diff --git a/Tests/Suite/Common/TestSuite.h b/Tests/Suite/Common/TestSuite.h
index 9acb9f273e72c0ab91aa1a917ccfa290ffae09d5..7e5ca7e9f6a915ac92fd28dc075188dce433e319 100644
--- a/Tests/Suite/Common/TestSuite.h
+++ b/Tests/Suite/Common/TestSuite.h
@@ -56,7 +56,7 @@ TEST(TESTNAME, FormFactors)
 
 TEST(TESTNAME, FormFactorsWithAbsorption)
 {
-    const double eps = eps_direct_vs_python(5e-13, 3e-10);
+    const double eps = eps_direct_vs_python(8e-13, 3e-10);
     for (const std::string& ffname : FormFactorComponents().keys()) {
         const IFormFactor* ff = FormFactorComponents().getItem(ffname)->clone();
         ASSERT(ff);
diff --git a/Tests/Suite/GUI/Check.cpp b/Tests/Suite/GUI/Check.cpp
index e7e00eb48d2858eab71a0dcca0586d94d4fa076c..5076ea80accbdc9a5e15d89888c9bd725425ebf6 100644
--- a/Tests/Suite/GUI/Check.cpp
+++ b/Tests/Suite/GUI/Check.cpp
@@ -56,11 +56,10 @@ bool checkSimulation(const std::string& name, ISimulation& sim, const double lim
 
     std::unique_ptr<ISimulation> sim2(indirectSimulation(sim));
 
-    const std::unique_ptr<Datafield> data2(sim2->simulate().converted_field());
+    const SimulationResult data2 = sim2->simulate();
+    const SimulationResult ref_data = sim.simulate();
 
-    const std::unique_ptr<Datafield> ref_data(sim.simulate().converted_field());
-
-    bool ok = DiffUtil::checkRelativeDifference(data2->flatVector(), ref_data->flatVector(), limit);
+    bool ok = DiffUtil::checkRelativeDifference(data2.flatVector(), ref_data.flatVector(), limit);
 
     if (ok)
         return true;
@@ -69,11 +68,11 @@ bool checkSimulation(const std::string& name, ISimulation& sim, const double lim
     const auto dir = fs::path(BATesting::TestOutDir()) / fs::path("Suite") / fs::path("GUI");
     BaseUtils::Filesystem::createDirectories(dir.string());
 
-    const std::map<const std::string, const Datafield*> tosave{{"gui", data2.get()},
-                                                               {"std", ref_data.get()}};
+    const std::map<const std::string, const SimulationResult&> tosave{{"gui", data2},
+                                                                      {"std", ref_data}};
     for (const auto& [kind, data] : tosave) {
         const std::string out_fname = (dir / fs::path(name + "." + kind + ".int.gz")).string();
-        IOFactory::writeDatafield(*data, out_fname);
+        IOFactory::writeSimulationResult(data, out_fname);
         std::cout << "Saved " << out_fname << "\n";
     }
     std::cout << "Notes:\n"
diff --git a/Tests/Suite/Persist/Check.cpp b/Tests/Suite/Persist/Check.cpp
index 4c09ffd4b9f3b2f8df3dfbcf0cad7b834f97bcd8..44627c308db5ccff4ef051f20a80a2b871b230f4 100644
--- a/Tests/Suite/Persist/Check.cpp
+++ b/Tests/Suite/Persist/Check.cpp
@@ -23,12 +23,12 @@
 #include "Sim/Simulation/ISimulation.h"
 #include <iostream>
 
-//! Run simulation directly (in C+ core), and compare result with reference data.
+//! Run simulation directly (in C++ core), and compare result with reference data.
 
 bool checkSimulation(const std::string& name, ISimulation& direct_simulation, const double limit)
 {
     // Run simulation directly.
-    std::unique_ptr<Datafield> result_data(direct_simulation.simulate().converted_field());
+    const SimulationResult result_data = direct_simulation.simulate();
 
     std::unique_ptr<Datafield> reference;
 
@@ -46,7 +46,7 @@ bool checkSimulation(const std::string& name, ISimulation& direct_simulation, co
     // Compare with reference if available.
     if (reference) {
         std::cout << "- check diff" << std::endl;
-        if (DiffUtil::checkRelativeDifference(result_data->flatVector(), reference->flatVector(),
+        if (DiffUtil::checkRelativeDifference(result_data.flatVector(), reference->flatVector(),
                                               limit)) {
             std::cout << "- success" << std::endl;
             return true; // regular exit
@@ -59,7 +59,7 @@ bool checkSimulation(const std::string& name, ISimulation& direct_simulation, co
     BaseUtils::Filesystem::createDirectories(BATesting::TestOutDir_Suite());
     std::string out_fname =
         BaseUtils::Filesystem::jointPath(BATesting::TestOutDir_Suite(), name + ".int.gz");
-    IOFactory::writeDatafield(*result_data, out_fname);
+    IOFactory::writeSimulationResult(result_data, out_fname);
     std::cout << "Notes:\n- to visualize an intensity map, use " << BABuild::srcDir()
               << "/devtools/view/plot-int.py\n"
               << "- to plot a difference image, use " << BABuild::srcDir()