Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/Piping/Probabilistic/ProbabilisticPipingCalculationEntityReadExtensions.cs
===================================================================
diff -u -r831f96156f56b45536e01a02be3b3d9135c853af -r9c7e9ba18f32eeb6eeffbc6c355099b417e3092f
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/Piping/Probabilistic/ProbabilisticPipingCalculationEntityReadExtensions.cs	(.../ProbabilisticPipingCalculationEntityReadExtensions.cs)	(revision 831f96156f56b45536e01a02be3b3d9135c853af)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/Piping/Probabilistic/ProbabilisticPipingCalculationEntityReadExtensions.cs	(.../ProbabilisticPipingCalculationEntityReadExtensions.cs)	(revision 9c7e9ba18f32eeb6eeffbc6c355099b417e3092f)
@@ -95,7 +95,7 @@
             inputParameters.ShouldProfileSpecificIllustrationPointsBeCalculated = Convert.ToBoolean(entity.ShouldProfileSpecificIllustrationPointsBeCalculated);
             inputParameters.ShouldSectionSpecificIllustrationPointsBeCalculated = Convert.ToBoolean(entity.ShouldSectionSpecificIllustrationPointsBeCalculated);
         }
-        
+
         private static void ReadCalculationOutputs(ProbabilisticPipingCalculationScenario calculation,
                                                    ProbabilisticPipingCalculationEntity entity)
         {
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/PersistenceRegistryTest.cs
===================================================================
diff -u -rc360f49cedb42a350189ba43209c70dfac395c9c -r9c7e9ba18f32eeb6eeffbc6c355099b417e3092f
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/PersistenceRegistryTest.cs	(.../PersistenceRegistryTest.cs)	(revision c360f49cedb42a350189ba43209c70dfac395c9c)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/PersistenceRegistryTest.cs	(.../PersistenceRegistryTest.cs)	(revision 9c7e9ba18f32eeb6eeffbc6c355099b417e3092f)
@@ -335,7 +335,64 @@
         }
 
         #endregion
-        
+
+        #region HeightStructures
+
+        [TestFixture]
+        private class HeightStructureRegistryTest : RegistryTest<
+            HeightStructure, HeightStructureEntity>
+        {
+            public HeightStructureRegistryTest() : base(
+                (r, e, m) => r.Register(e, m),
+                (r, m) => r.Contains(m),
+                (r, m) => r.Get(m)) {}
+
+            protected override HeightStructure CreateDataModel()
+            {
+                return new TestHeightStructure();
+            }
+        }
+
+        #endregion
+
+        #region ClosingStructures
+
+        [TestFixture]
+        private class ClosingStructureRegistryTest : RegistryTest<
+            ClosingStructure, ClosingStructureEntity>
+        {
+            public ClosingStructureRegistryTest() : base(
+                (r, e, m) => r.Register(e, m),
+                (r, m) => r.Contains(m),
+                (r, m) => r.Get(m)) {}
+
+            protected override ClosingStructure CreateDataModel()
+            {
+                return new TestClosingStructure();
+            }
+        }
+
+        #endregion
+
+        #region StabilityPointStructures
+
+        [TestFixture]
+        private class StabilityPointStructureStructureRegistryTest : RegistryTest<
+            StabilityPointStructure, StabilityPointStructureEntity>
+        {
+            public StabilityPointStructureStructureRegistryTest() : base(
+                (r, e, m) => r.Register(e, m),
+                (r, m) => r.Contains(m),
+                (r, m) => r.Get(m)) {}
+
+            protected override StabilityPointStructure CreateDataModel()
+            {
+                return new TestStabilityPointStructure();
+            }
+        }
+
+        #endregion
+
         #region Piping
 
         [TestFixture]
@@ -502,63 +559,5 @@
         }
 
         #endregion
-
-        #region HeightStructures
-
-        [TestFixture]
-        private class HeightStructureRegistryTest : RegistryTest<
-            HeightStructure, HeightStructureEntity>
-        {
-            public HeightStructureRegistryTest() : base(
-                (r, e, m) => r.Register(e, m),
-                (r, m) => r.Contains(m),
-                (r, m) => r.Get(m)) {}
-
-            protected override HeightStructure CreateDataModel()
-            {
-                return new TestHeightStructure();
-            }
-        }
-
-        #endregion
-
-        #region ClosingStructures
-
-        [TestFixture]
-        private class ClosingStructureRegistryTest : RegistryTest<
-            ClosingStructure, ClosingStructureEntity>
-        {
-            public ClosingStructureRegistryTest() : base(
-                (r, e, m) => r.Register(e, m),
-                (r, m) => r.Contains(m),
-                (r, m) => r.Get(m)) {}
-
-            protected override ClosingStructure CreateDataModel()
-            {
-                return new TestClosingStructure();
-            }
-        }
-
-        #endregion
-
-        #region StabilityPointStructures
-
-        [TestFixture]
-        private class StabilityPointStructureStructureRegistryTest : RegistryTest<
-            StabilityPointStructure, StabilityPointStructureEntity>
-        {
-            public StabilityPointStructureStructureRegistryTest() : base(
-                (r, e, m) => r.Register(e, m),
-                (r, m) => r.Contains(m),
-                (r, m) => r.Get(m))
-            { }
-
-            protected override StabilityPointStructure CreateDataModel()
-            {
-                return new TestStabilityPointStructure();
-            }
-        }
-
-        #endregion
     }
 }
\ No newline at end of file
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/CalculationGroupEntityReadExtensionsTest.cs
===================================================================
diff -u -r890f35a9fe298486f47fe9cf0d3af116c9e878c1 -r9c7e9ba18f32eeb6eeffbc6c355099b417e3092f
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/CalculationGroupEntityReadExtensionsTest.cs	(.../CalculationGroupEntityReadExtensionsTest.cs)	(revision 890f35a9fe298486f47fe9cf0d3af116c9e878c1)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/CalculationGroupEntityReadExtensionsTest.cs	(.../CalculationGroupEntityReadExtensionsTest.cs)	(revision 9c7e9ba18f32eeb6eeffbc6c355099b417e3092f)
@@ -291,13 +291,13 @@
 
             var rootChildProbabilisticCalculation1 = (ProbabilisticPipingCalculationScenario) rootChildren[2];
             Assert.AreEqual("calculation2", rootChildProbabilisticCalculation1.Name);
-            
+
             var rootChildSemiProbabilisticCalculation2 = (SemiProbabilisticPipingCalculationScenario) rootChildren[3];
             Assert.AreEqual("calculation3", rootChildSemiProbabilisticCalculation2.Name);
 
             var rootChildGroup2 = (CalculationGroup) rootChildren[4];
             Assert.AreEqual("group2", rootChildGroup2.Name);
-            
+
             var rootChildProbabilisticCalculation2 = (ProbabilisticPipingCalculationScenario) rootChildren[5];
             Assert.AreEqual("calculation4", rootChildProbabilisticCalculation2.Name);
         }
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/Probabilistic/ProbabilisticPipingCalculationOutputEntityReadExtensionsTest.cs
===================================================================
diff -u -r6681ea65852ad8e76f0e11b7491ab266405d65fb -r9c7e9ba18f32eeb6eeffbc6c355099b417e3092f
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/Probabilistic/ProbabilisticPipingCalculationOutputEntityReadExtensionsTest.cs	(.../ProbabilisticPipingCalculationOutputEntityReadExtensionsTest.cs)	(revision 6681ea65852ad8e76f0e11b7491ab266405d65fb)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/Probabilistic/ProbabilisticPipingCalculationOutputEntityReadExtensionsTest.cs	(.../ProbabilisticPipingCalculationOutputEntityReadExtensionsTest.cs)	(revision 9c7e9ba18f32eeb6eeffbc6c355099b417e3092f)
@@ -74,7 +74,7 @@
             // Assert
             var profileSpecificOutput = (PartialProbabilisticFaultTreePipingOutput) output.ProfileSpecificOutput;
             var sectionSpecificOutput = (PartialProbabilisticFaultTreePipingOutput) output.SectionSpecificOutput;
-            
+
             Assert.AreEqual(entity.ProfileSpecificReliability, output.ProfileSpecificOutput.Reliability);
             Assert.AreEqual(entity.SectionSpecificReliability, output.SectionSpecificOutput.Reliability);
 
@@ -83,6 +83,7 @@
             GeneralResultEntityTestHelper.AssertGeneralResultPropertyValues(
                 sectionSpecificOutput.GeneralResult, sectionSpecificGeneralResultEntity);
         }
+
         [Test]
         public void Read_EntityWithSubMechanismIllustrationPoints_ReturnProbabilisticPipingOutput()
         {
@@ -115,7 +116,7 @@
             // Assert
             var profileSpecificOutput = (PartialProbabilisticSubMechanismPipingOutput) output.ProfileSpecificOutput;
             var sectionSpecificOutput = (PartialProbabilisticSubMechanismPipingOutput) output.SectionSpecificOutput;
-            
+
             Assert.AreEqual(entity.ProfileSpecificReliability, output.ProfileSpecificOutput.Reliability);
             Assert.AreEqual(entity.SectionSpecificReliability, output.SectionSpecificOutput.Reliability);