Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -r8db09060312994f18ffa801aba9b033312dbf5f5 -rf46727b0981b6e3cd1f8b6809f03f2943286f11e
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision 8db09060312994f18ffa801aba9b033312dbf5f5)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision f46727b0981b6e3cd1f8b6809f03f2943286f11e)
@@ -302,8 +302,8 @@
                 expectedAssessmentSection.Microstability.SectionResultsOld,
                 actualAssessmentSection.Microstability.SectionResultsOld);
             AssertFailureMechanismSectionResults(
-                expectedAssessmentSection.PipingStructure.SectionResultsOld,
-                actualAssessmentSection.PipingStructure.SectionResultsOld);
+                expectedAssessmentSection.PipingStructure.SectionResults,
+                actualAssessmentSection.PipingStructure.SectionResults);
             AssertFailureMechanismSectionResults(
                 expectedAssessmentSection.DuneErosion.SectionResultsOld,
                 actualAssessmentSection.DuneErosion.SectionResultsOld);
@@ -446,6 +446,21 @@
                                      });
         }
 
+        private static void AssertFailureMechanismSectionResults(IEnumerable<NonAdoptableFailureMechanismSectionResult> expectedSectionResults,
+                                                                 IEnumerable<NonAdoptableFailureMechanismSectionResult> actualSectionResults)
+        {
+            AssertCollectionAndItems(expectedSectionResults,
+                                     actualSectionResults,
+                                     (expectedItem, actualItem) =>
+                                     {
+                                         Assert.AreEqual(expectedItem.IsRelevant, actualItem.IsRelevant);
+                                         Assert.AreEqual(expectedItem.InitialFailureMechanismResult, actualItem.InitialFailureMechanismResult);
+                                         Assert.AreEqual(expectedItem.ManualInitialFailureMechanismResultSectionProbability, actualItem.ManualInitialFailureMechanismResultSectionProbability);
+                                         Assert.AreEqual(expectedItem.FurtherAnalysisNeeded, actualItem.FurtherAnalysisNeeded);
+                                         Assert.AreEqual(expectedItem.RefinedSectionProbability, actualItem.RefinedSectionProbability);
+                                     });
+        }
+
         private static void AssertFailureMechanism(IFailureMechanism expectedFailureMechanism,
                                                    IFailureMechanism actualFailureMechanism)
         {
@@ -2034,23 +2049,7 @@
         {
             Assert.AreEqual(expectedFailureMechanism.GeneralInput.N, actualFailureMechanism.GeneralInput.N);
         }
-
-        private static void AssertFailureMechanismSectionResults(
-            IEnumerable<PipingStructureFailureMechanismSectionResultOld> expectedSectionResults,
-            IEnumerable<PipingStructureFailureMechanismSectionResultOld> actualSectionResults)
-        {
-            AssertCollectionAndItems(expectedSectionResults,
-                                     actualSectionResults,
-                                     (expectedItem, actualItem) =>
-                                     {
-                                         Assert.AreEqual(expectedItem.SimpleAssessmentResult, actualItem.SimpleAssessmentResult);
-                                         Assert.AreEqual(expectedItem.DetailedAssessmentResult, actualItem.DetailedAssessmentResult);
-                                         Assert.AreEqual(expectedItem.TailorMadeAssessmentResult, actualItem.TailorMadeAssessmentResult);
-                                         Assert.AreEqual(expectedItem.UseManualAssembly, actualItem.UseManualAssembly);
-                                         Assert.AreEqual(expectedItem.ManualAssemblyCategoryGroup, actualItem.ManualAssemblyCategoryGroup);
-                                     });
-        }
-
+        
         #endregion
 
         #region MacroStabilityOutwards FailureMechanism
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs
===================================================================
diff -u -r8db09060312994f18ffa801aba9b033312dbf5f5 -rf46727b0981b6e3cd1f8b6809f03f2943286f11e
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision 8db09060312994f18ffa801aba9b033312dbf5f5)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision f46727b0981b6e3cd1f8b6809f03f2943286f11e)
@@ -196,7 +196,7 @@
             PipingStructureFailureMechanism pipingStructureFailureMechanism = assessmentSection.PipingStructure;
             ConfigurePipingStructureFailureMechanism(pipingStructureFailureMechanism);
             SetSections(pipingStructureFailureMechanism);
-            SetSectionResults(pipingStructureFailureMechanism.SectionResultsOld);
+            SetSectionResults(pipingStructureFailureMechanism.SectionResults);
 
             MicrostabilityFailureMechanism microstabilityFailureMechanism = assessmentSection.Microstability;
             SetGeneralInput(microstabilityFailureMechanism, random.Next());
@@ -589,6 +589,19 @@
             assemblyResult.ManualFailurePathAssemblyProbability = random.NextDouble();
         }
 
+        private static void SetSectionResults(IEnumerable<AdoptableFailureMechanismSectionResult> sectionResults)
+        {
+            var random = new Random(21);
+            foreach (AdoptableFailureMechanismSectionResult sectionResult in sectionResults)
+            {
+                sectionResult.IsRelevant = random.NextBoolean();
+                sectionResult.InitialFailureMechanismResult = random.NextEnumValue<AdoptableInitialFailureMechanismResultType>();
+                sectionResult.ManualInitialFailureMechanismResultSectionProbability = random.NextDouble();
+                sectionResult.FurtherAnalysisNeeded = random.NextBoolean();
+                sectionResult.RefinedSectionProbability = random.NextDouble();
+            }
+        }
+        
         private static void SetSectionResults(IEnumerable<AdoptableWithProfileProbabilityFailureMechanismSectionResult> sectionResults)
         {
             var random = new Random(21);
@@ -606,6 +619,19 @@
             }
         }
 
+        private static void SetSectionResults(IEnumerable<NonAdoptableFailureMechanismSectionResult> sectionResults)
+        {
+            var random = new Random(21);
+            foreach (NonAdoptableFailureMechanismSectionResult sectionResult in sectionResults)
+            {
+                sectionResult.IsRelevant = random.NextBoolean();
+                sectionResult.InitialFailureMechanismResult = random.NextEnumValue<NonAdoptableInitialFailureMechanismResultType>();
+                sectionResult.ManualInitialFailureMechanismResultSectionProbability = random.NextDouble();
+                sectionResult.FurtherAnalysisNeeded = random.NextBoolean();
+                sectionResult.RefinedSectionProbability = random.NextDouble();
+            }
+        }
+
         #region MacroStabilityOutwards FailureMechanism
 
         private static void ConfigureMacroStabilityOutwardsFailureMechanism(MacroStabilityOutwardsFailureMechanism macroStabilityOutwardsFailureMechanism)
@@ -1026,20 +1052,7 @@
             });
             failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculationScenario<HeightStructuresInput>());
         }
-
-        private static void SetSectionResults(IEnumerable<AdoptableFailureMechanismSectionResult> sectionResults)
-        {
-            var random = new Random(21);
-            foreach (AdoptableFailureMechanismSectionResult sectionResult in sectionResults)
-            {
-                sectionResult.IsRelevant = random.NextBoolean();
-                sectionResult.InitialFailureMechanismResult = random.NextEnumValue<AdoptableInitialFailureMechanismResultType>();
-                sectionResult.ManualInitialFailureMechanismResultSectionProbability = random.NextDouble();
-                sectionResult.FurtherAnalysisNeeded = random.NextBoolean();
-                sectionResult.RefinedSectionProbability = random.NextDouble();
-            }
-        }
-
+        
         #endregion
 
         #region Piping FailureMechanism