diff --git a/Tests/FunctionalTests/TestPyCore/layerwithroughness.py b/Tests/FunctionalTests/TestPyCore/layerwithroughness.py
index 8a1f6936543dffb142b8eee69013b9c3dc725081..d64aca65e35fcb10db72271f74f42f1fcc1d47c8 100644
--- a/Tests/FunctionalTests/TestPyCore/layerwithroughness.py
+++ b/Tests/FunctionalTests/TestPyCore/layerwithroughness.py
@@ -47,14 +47,14 @@ def RunSimulation():
     my_sample.addLayerWithTopRoughness(l_substrate, roughness)
     my_sample.setCrossCorrLength(1e-4)
 
-
     # build and run experiment
     simulation = GISASSimulation()
     simulation.setDetectorParameters(100, -0.5*degree, 0.5*degree, 100, 0.0*degree, 1.0*degree)
     simulation.setBeamParameters(1.0*angstrom, 0.2*degree, 0.0*degree)
     simulation.setSample(my_sample)
     simulation.runSimulation()
-    ## intensity data
+    
+    # intensity data
     return simulation.getIntensityData()
 
 
@@ -65,18 +65,20 @@ def runTest():
     result = RunSimulation()
     reference = get_reference_data("roughness01_reference.int.gz")
 
+    # IntensityDataIOFactory.writeIntensityData(result, "roughness01_reference.int.gz")
+
     diff = IntensityDataFunctions.getRelativeDifference(result, reference)
 
     status = "OK"
-    if(diff > 2e-10 or numpy.isnan(diff)): status = "FAILED"
+    if diff > 2e-10 or numpy.isnan(diff): status = "FAILED"
     return "LayerWithRoughness", "Layers with correlated roughness", diff, status
 
 
-#-------------------------------------------------------------
+# -------------------------------------------------------------
 # main()
-#-------------------------------------------------------------
+# -------------------------------------------------------------
 if __name__ == '__main__':
     name, description, diff, status = runTest()
     print(name, description, diff, status)
-    if("FAILED" in status):
+    if "FAILED" in status:
         exit(1)
diff --git a/Tests/FunctionalTests/TestPyCore/mesocrystal1.py b/Tests/FunctionalTests/TestPyCore/mesocrystal1.py
index 855275cc20ed828da5479bf61c7fc2db214ca588..c3c5cf80f6e8c790c4b04548235b6170173a3fbc 100644
--- a/Tests/FunctionalTests/TestPyCore/mesocrystal1.py
+++ b/Tests/FunctionalTests/TestPyCore/mesocrystal1.py
@@ -157,14 +157,16 @@ def runTest():
     # setting detector axis as in reference data
     simulation.setDetectorParameters(reference)
 
-    #running simulation
+    # running simulation
     simulation.runSimulation()
     result = simulation.getIntensityData()
 
+    # IntensityDataIOFactory.writeIntensityData(result, "mesocrystal01_reference.int.gz")
+
     diff = IntensityDataFunctions.getRelativeDifference(result, reference)
 
     status = "OK"
-    if(diff > 1e-10 or numpy.isnan(diff)):
+    if diff > 1e-10 or numpy.isnan(diff):
         status = "FAILED"
     return "MesoCrystal1", "Mesocrystal simulation", diff, status
 
@@ -174,12 +176,12 @@ def createSimulation():
     simulation = GISASSimulation()
     simulation.setBeamParameters(1.77*angstrom, 0.4*degree, 0.0*degree)
     simulation.setBeamIntensity(5.0090e+12)
-    #simulation.setDetectorResolutionFunction(ResolutionFunction2DGaussian(0.0002, 0.0002))
+    # simulation.setDetectorResolutionFunction(ResolutionFunction2DGaussian(0.0002, 0.0002))
     return simulation
 
 
 if __name__ == '__main__':
     name, description, diff, status = runTest()
     print(name, description, diff, status)
-    if("FAILED" in status):
+    if "FAILED" in status:
         exit(1)
diff --git a/Tests/ReferenceData/BornAgain/mesocrystal01_reference.int.gz b/Tests/ReferenceData/BornAgain/mesocrystal01_reference.int.gz
index 9153e0643aa9200cabc0d3e501fae6bdd670fbb3..256f8fe5c566305738e852a630a29d16da23c1b3 100644
Binary files a/Tests/ReferenceData/BornAgain/mesocrystal01_reference.int.gz and b/Tests/ReferenceData/BornAgain/mesocrystal01_reference.int.gz differ
diff --git a/Tests/ReferenceData/BornAgain/ref_MesoCrystal.int.gz b/Tests/ReferenceData/BornAgain/ref_MesoCrystal.int.gz
index f0faf5a0ed2879d3eeb855440474ac5d9c882b33..31bc8c12698a8a6289e45e8f475b1420dfe57e30 100644
Binary files a/Tests/ReferenceData/BornAgain/ref_MesoCrystal.int.gz and b/Tests/ReferenceData/BornAgain/ref_MesoCrystal.int.gz differ
diff --git a/Tests/ReferenceData/BornAgain/ref_MultiLayerWithRoughness.int.gz b/Tests/ReferenceData/BornAgain/ref_MultiLayerWithRoughness.int.gz
index 33389c83c7cdb1edad8a1a06e02f3caee1aab219..7a4163660a47596f1fb57aede9612aa364360add 100644
Binary files a/Tests/ReferenceData/BornAgain/ref_MultiLayerWithRoughness.int.gz and b/Tests/ReferenceData/BornAgain/ref_MultiLayerWithRoughness.int.gz differ
diff --git a/Tests/ReferenceData/BornAgain/roughness01_reference.int.gz b/Tests/ReferenceData/BornAgain/roughness01_reference.int.gz
index 331d4ac926d59da6339a371593f293fe9527878f..07add92f881abc6feb8232379290fbc7c409c38c 100644
Binary files a/Tests/ReferenceData/BornAgain/roughness01_reference.int.gz and b/Tests/ReferenceData/BornAgain/roughness01_reference.int.gz differ