diff --git a/Examples/Python/README.md b/Examples/Python/README.md
index 41d0180675f399e793f2793687a7a9495b2a85dd..abf851a41e5fd8ee61b71c62df319a407245452e 100644
--- a/Examples/Python/README.md
+++ b/Examples/Python/README.md
@@ -7,3 +7,6 @@ Content:
 
 All simulation examples are under continuous test coverage
 through Tests/Functional/Python/PyExamples/CMakeLists.txt.
+
+Additionally, many simulation examples are also tested
+through Tests/Functional/Python/PyPersistence/CMakeLists.txt.
diff --git a/Tests/Functional/Python/PyPersistence/CMakeLists.txt b/Tests/Functional/Python/PyPersistence/CMakeLists.txt
index 8df16851f003b0e28973daf05583eef955ed9d12..a6ffbc812395d330c5123f8b097d2a5d525124a5 100644
--- a/Tests/Functional/Python/PyPersistence/CMakeLists.txt
+++ b/Tests/Functional/Python/PyPersistence/CMakeLists.txt
@@ -24,47 +24,50 @@ function(test_example example tolerance)
     add_test(${test_name} ${Python3_EXECUTABLE} "-B" "${example_mod}")
 endfunction()
 
-test_example("simulation/ex01_BasicParticles/CylindersAndPrisms" 2e-10)
-test_example("simulation/ex01_BasicParticles/CylindersInBA" 2e-10)
-test_example("simulation/ex01_BasicParticles/CylindersInDWBA" 2e-10)
-test_example("simulation/ex01_BasicParticles/CylindersWithSizeDistribution" 2e-10)
-test_example("simulation/ex01_BasicParticles/RotatedPyramids" 2e-10)
-test_example("simulation/ex01_BasicParticles/TwoTypesOfCylindersWithSizeDistribution" 2e-10)
-test_example("simulation/ex02_LayeredStructures/BuriedParticles" 2e-10)
-test_example("simulation/ex02_LayeredStructures/CorrelatedRoughness" 2e-10)
-test_example("simulation/ex03_InterferenceFunctions/ApproximationDA" 2e-10)
-test_example("simulation/ex03_InterferenceFunctions/ApproximationLMA" 2e-10)
-test_example("simulation/ex03_InterferenceFunctions/ApproximationSSCA" 2e-10)
-test_example("simulation/ex03_InterferenceFunctions/CosineRipplesAtRectLattice" 2e-10)
-test_example("simulation/ex03_InterferenceFunctions/Interference1DLattice" 1.5)
-test_example("simulation/ex03_InterferenceFunctions/Interference1DRadialParaCrystal" 2e-10)
-test_example("simulation/ex03_InterferenceFunctions/Interference2DCenteredSquareLattice" 2e-10)
-test_example("simulation/ex03_InterferenceFunctions/Interference2DParaCrystal" 2e-10)
-test_example("simulation/ex03_InterferenceFunctions/Interference2DRotatedSquareLattice" 2e-10)
-test_example("simulation/ex03_InterferenceFunctions/Interference2DSquareLattice" 2e-10)
-test_example("simulation/ex03_InterferenceFunctions/Interference2DLatticeSumOfRotated" 2e-10)
-test_example("simulation/ex03_InterferenceFunctions/RectangularGrating" 0.5)
-test_example("simulation/ex03_InterferenceFunctions/SpheresAtHexLattice" 2e-10)
-test_example("simulation/ex03_InterferenceFunctions/TriangularRipple" 2e-10)
-
-test_example("simulation/ex04_ComplexShapes/CoreShellNanoparticles" 2e-10)
-test_example("simulation/ex04_ComplexShapes/CustomFormFactor" 2e-10)
-test_example("simulation/ex04_ComplexShapes/HexagonalLatticesWithBasis" 2e-10)
-
-test_example("simulation/ex05_BeamAndDetector/BeamDivergence" 2e-10)
-test_example("simulation/ex05_BeamAndDetector/DetectorResolutionFunction" 2e-10)
-test_example("simulation/ex05_BeamAndDetector/OffSpecularSimulation" 2e-10)
-test_example("simulation/ex05_BeamAndDetector/ConstantBackground" 2e-10)
-
-test_example("simulation/ex06_Reflectometry/BasicSpecularSimulation" 2e-10)
-test_example("simulation/ex06_Reflectometry/BeamAngularDivergence" 2e-10)
-test_example("simulation/ex06_Reflectometry/BeamFullDivergence" 2e-10)
-test_example("simulation/ex06_Reflectometry/TimeOfFlightReflectometry" 2e-10)
-test_example("simulation/ex06_Reflectometry/TOFRWithResolution" 2e-10)
-
-test_example("simulation/ex07_Miscellaneous/CylindersInAverageLayer" 2e-10)
-test_example("simulation/ex07_Miscellaneous/DepthProbe" 2e-10)
-test_example("simulation/ex07_Miscellaneous/HalfSpheresInAverageTopLayer" 2e-10)
-test_example("simulation/ex07_Miscellaneous/MagneticSpheres" 2e-10)
-
-test_example("simulation/ex07_Miscellaneous/SimulationParameters" 2e-10)
+test_example("sim01_Particles/CylindersAndPrisms" 2e-10)
+test_example("sim01_Particles/CylindersInBA" 2e-10)
+test_example("sim01_Particles/CylindersInDWBA" 2e-10)
+test_example("sim01_Particles/CylindersWithSizeDistribution" 2e-10)
+test_example("sim01_Particles/RotatedPyramids" 2e-10)
+test_example("sim01_Particles/TwoTypesOfCylindersWithSizeDistribution" 2e-10)
+
+test_example("sim02_Complexes/CoreShellNanoparticles" 2e-10)
+test_example("sim02_Complexes/CustomFormFactor" 2e-10)
+test_example("sim02_Complexes/HexagonalLatticesWithBasis" 2e-10)
+
+test_example("sim03_Structures/ApproximationDA" 2e-10)
+test_example("sim03_Structures/ApproximationLMA" 2e-10)
+test_example("sim03_Structures/ApproximationSSCA" 2e-10)
+test_example("sim03_Structures/CosineRipplesAtRectLattice" 2e-10)
+test_example("sim03_Structures/Interference1DLattice" 1.5)
+test_example("sim03_Structures/Interference1DRadialParaCrystal" 2e-10)
+test_example("sim03_Structures/Interference2DCenteredSquareLattice" 2e-10)
+test_example("sim03_Structures/Interference2DParaCrystal" 2e-10)
+test_example("sim03_Structures/Interference2DRotatedSquareLattice" 2e-10)
+test_example("sim03_Structures/Interference2DSquareLattice" 2e-10)
+test_example("sim03_Structures/Interference2DLatticeSumOfRotated" 2e-10)
+test_example("sim03_Structures/RectangularGrating" 0.5)
+test_example("sim03_Structures/SpheresAtHexLattice" 2e-10)
+test_example("sim03_Structures/TriangularRipple" 2e-10)
+
+test_example("sim04_Multilayers/BuriedParticles" 2e-10)
+test_example("sim04_Multilayers/CorrelatedRoughness" 2e-10)
+test_example("sim04_Multilayers/CylindersInAverageLayer" 2e-10)
+test_example("sim04_Multilayers/HalfSpheresInAverageTopLayer" 2e-10)
+
+test_example("sim05_Magnetism/MagneticSpheres" 2e-10)
+
+test_example("sim11_Device/BeamDivergence" 2e-10)
+test_example("sim11_Device/DetectorResolutionFunction" 2e-10)
+test_example("sim11_Device/OffSpecularSimulation" 2e-10)
+test_example("sim11_Device/ConstantBackground" 2e-10)
+
+test_example("sim21_Reflectometry/BasicSpecularSimulation" 2e-10)
+test_example("sim21_Reflectometry/BeamAngularDivergence" 2e-10)
+test_example("sim21_Reflectometry/BeamFullDivergence" 2e-10)
+test_example("sim21_Reflectometry/TimeOfFlightReflectometry" 2e-10)
+test_example("sim21_Reflectometry/TOFRWithResolution" 2e-10)
+
+test_example("sim29_DepthProbe/DepthProbe" 2e-10)
+
+test_example("sim31_Parameterization/SimulationParameters" 2e-10)
diff --git a/Tests/Functional/Python/PyPersistence/example_template.py b/Tests/Functional/Python/PyPersistence/example_template.py
index 3fdec222883892e7b961b3f289ae531c5bb40095..0da1bca51786ebe61eea34a0b530d12281cb7450 100644
--- a/Tests/Functional/Python/PyPersistence/example_template.py
+++ b/Tests/Functional/Python/PyPersistence/example_template.py
@@ -78,7 +78,7 @@ def get_minified_simulation():
     """
     Returns a simulation constructed from example simulation with smaller detector.
     """
-    if "ex06_Reflectometry" in EXAMPLE_DIR:
+    if "sim21_Reflectometry" in EXAMPLE_DIR:
         return get_simulation_SpecularSimulation()
 
     elif EXAMPLE_NAME == "RectangularGrating":
@@ -138,7 +138,6 @@ def save_result(result, filename):
         print("Exception caught, failed to write file", err)
 
 
-
 def check_result(result, example_name):
     print("Checking results for '{}'".format(example_name))
     reffile = get_reffile_name(example_name)
@@ -184,4 +183,3 @@ def process_example():
 
 if __name__ == '__main__':
     sys.exit(process_example())
-