Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -r1a65cb67261da126d57a2c890acfb78b4347eb3d -r0cf83792df9c29b3bfcfb43426d721295fb4d87e
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs	(.../ClosingStructuresFailureMechanismResultViewTest.cs)	(revision 1a65cb67261da126d57a2c890acfb78b4347eb3d)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs	(.../ClosingStructuresFailureMechanismResultViewTest.cs)	(revision 0cf83792df9c29b3bfcfb43426d721295fb4d87e)
@@ -21,12 +21,9 @@
 
 using System;
 using System.Collections;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base;
-using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
@@ -621,17 +618,21 @@
         public void FailureMechanismResultView_EditValueAssessmentLayerThreeValid_DoNotShowErrorToolTipAndEditValue(double newValue)
         {
             // Setup
-            var failureMechanism = new ClosingStructuresFailureMechanism();
-            using (CreateConfiguredFailureMechanismResultsView(failureMechanism))
+            var result = new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
+
+            using (ShowFailureMechanismResultsView(new ObservableList<ClosingStructuresFailureMechanismSectionResult>
             {
+                result
+            }))
+            {
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
                 // Call
                 dataGridView.Rows[0].Cells[assessmentLayerThreeIndex].Value = newValue.ToString(CultureInfo.CurrentCulture);
 
                 // Assert
                 Assert.IsEmpty(dataGridView.Rows[0].ErrorText);
-                Assert.AreEqual(newValue, failureMechanism.SectionResults.First().AssessmentLayerThree);
+                Assert.AreEqual(newValue, result.AssessmentLayerThree);
             }
         }
 
@@ -694,26 +695,14 @@
 
         private ClosingStructuresFailureMechanismResultView CreateConfiguredFailureMechanismResultsView()
         {
-            return CreateConfiguredFailureMechanismResultsView(new ClosingStructuresFailureMechanism());
-        }
-
-        private ClosingStructuresFailureMechanismResultView CreateConfiguredFailureMechanismResultsView(
-            ClosingStructuresFailureMechanism failureMechanism)
-        {
-            failureMechanism.AddSection(new FailureMechanismSection("Section 1", new List<Point2D>
+            var results = new ObservableList<ClosingStructuresFailureMechanismSectionResult>
             {
-                new Point2D(0.0, 0.0),
-                new Point2D(5.0, 0.0)
-            }));
+                new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection("Section 1")),
+                new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection("Section 2"))
+            };
 
-            failureMechanism.AddSection(new FailureMechanismSection("Section 2", new List<Point2D>
-            {
-                new Point2D(5.0, 0.0),
-                new Point2D(10.0, 0.0)
-            }));
+            ClosingStructuresFailureMechanismResultView failureMechanismResultView = ShowFailureMechanismResultsView(results);
 
-            ClosingStructuresFailureMechanismResultView failureMechanismResultView = ShowFailureMechanismResultsView(failureMechanism.SectionResults);
-
             return failureMechanismResultView;
         }
 
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs
===================================================================
diff -u -r1a65cb67261da126d57a2c890acfb78b4347eb3d -r0cf83792df9c29b3bfcfb43426d721295fb4d87e
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs	(.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs)	(revision 1a65cb67261da126d57a2c890acfb78b4347eb3d)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs	(.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs)	(revision 0cf83792df9c29b3bfcfb43426d721295fb4d87e)
@@ -21,12 +21,9 @@
 
 using System;
 using System.Collections;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base;
-using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
@@ -129,7 +126,7 @@
         public void FailureMechanismResultsView_AllDataSet_DataGridViewCorrectlyInitialized()
         {
             // Setup & Call
-            using (ShowFullyConfiguredFailureMechanismResultsView())
+            using (CreateConfiguredFailureMechanismResultsView())
             {
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
@@ -162,7 +159,7 @@
             SimpleAssessmentResultValidityOnlyType simpleAssessmentResult)
         {
             // Setup
-            using (ShowFullyConfiguredFailureMechanismResultsView())
+            using (CreateConfiguredFailureMechanismResultsView())
             {
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
@@ -207,7 +204,7 @@
         public void FailureMechanismResultView_EditValueInvalid_ShowsErrorTooltip(string newValue, int cellIndex)
         {
             // Setup
-            using (ShowFullyConfiguredFailureMechanismResultsView())
+            using (CreateConfiguredFailureMechanismResultsView())
             {
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
@@ -228,7 +225,7 @@
         public void FailureMechanismResultView_EditValueAssessmentLayerThreeInvalid_ShowErrorToolTip(double newValue)
         {
             // Setup
-            using (ShowFullyConfiguredFailureMechanismResultsView())
+            using (CreateConfiguredFailureMechanismResultsView())
             {
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
@@ -250,17 +247,21 @@
         public void FailureMechanismResultView_EditValueAssessmentLayerThreeValid_DoNotShowErrorToolTipAndEditValue(double newValue)
         {
             // Setup
-            var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
-            using (ShowFullyConfiguredFailureMechanismResultsView(failureMechanism))
+            var result = new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
+
+            using (ShowFailureMechanismResultsView(new ObservableList<GrassCoverErosionInwardsFailureMechanismSectionResult>
             {
+                result
+            }))
+            {
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
                 // Call
                 dataGridView.Rows[0].Cells[assessmentLayerThreeIndex].Value = newValue.ToString(CultureInfo.CurrentCulture);
 
                 // Assert
                 Assert.IsEmpty(dataGridView.Rows[0].ErrorText);
-                Assert.AreEqual(newValue, failureMechanism.SectionResults.First().AssessmentLayerThree);
+                Assert.AreEqual(newValue, result.AssessmentLayerThree);
             }
         }
 
@@ -514,28 +515,16 @@
             }, ProbabilityFormattingHelper.Format(0.25)).SetName("SectionWithValidCalculationOutput");
         }
 
-        private GrassCoverErosionInwardsFailureMechanismResultView ShowFullyConfiguredFailureMechanismResultsView()
+        private GrassCoverErosionInwardsFailureMechanismResultView CreateConfiguredFailureMechanismResultsView()
         {
-            return ShowFullyConfiguredFailureMechanismResultsView(new GrassCoverErosionInwardsFailureMechanism());
-        }
-
-        private GrassCoverErosionInwardsFailureMechanismResultView ShowFullyConfiguredFailureMechanismResultsView(
-            GrassCoverErosionInwardsFailureMechanism failureMechanism)
-        {
-            failureMechanism.AddSection(new FailureMechanismSection("Section 1", new List<Point2D>
+            var results = new ObservableList<GrassCoverErosionInwardsFailureMechanismSectionResult>
             {
-                new Point2D(0.0, 0.0),
-                new Point2D(5.0, 0.0)
-            }));
+                new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection("Section 1")),
+                new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection("Section 2"))
+            };
 
-            failureMechanism.AddSection(new FailureMechanismSection("Section 2", new List<Point2D>
-            {
-                new Point2D(5.0, 0.0),
-                new Point2D(10.0, 0.0)
-            }));
+            GrassCoverErosionInwardsFailureMechanismResultView failureMechanismResultView = ShowFailureMechanismResultsView(results);
 
-            GrassCoverErosionInwardsFailureMechanismResultView failureMechanismResultView = ShowFailureMechanismResultsView(failureMechanism.SectionResults);
-
             return failureMechanismResultView;
         }
 
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -r1a65cb67261da126d57a2c890acfb78b4347eb3d -r0cf83792df9c29b3bfcfb43426d721295fb4d87e
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs	(.../HeightStructuresFailureMechanismResultViewTest.cs)	(revision 1a65cb67261da126d57a2c890acfb78b4347eb3d)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs	(.../HeightStructuresFailureMechanismResultViewTest.cs)	(revision 0cf83792df9c29b3bfcfb43426d721295fb4d87e)
@@ -21,12 +21,9 @@
 
 using System;
 using System.Collections;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base;
-using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
@@ -130,7 +127,7 @@
         public void FailureMechanismResultsView_AllDataSet_DataGridViewCorrectlyInitialized()
         {
             // Setup & Call
-            using (CreateConfiguredFailureMechanismResultsView(new HeightStructuresFailureMechanism()))
+            using (CreateConfiguredFailureMechanismResultsView())
             {
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
@@ -163,7 +160,7 @@
             SimpleAssessmentResultType simpleAssessmentResult)
         {
             // Setup
-            using (CreateConfiguredFailureMechanismResultsView(new HeightStructuresFailureMechanism()))
+            using (CreateConfiguredFailureMechanismResultsView())
             {
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
@@ -394,7 +391,7 @@
         public void FailureMechanismResultView_EditValueInvalid_ShowsErrorTooltip(string newValue, int cellIndex)
         {
             // Setup
-            using (CreateConfiguredFailureMechanismResultsView(new HeightStructuresFailureMechanism()))
+            using (CreateConfiguredFailureMechanismResultsView())
             {
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
@@ -415,7 +412,7 @@
         public void FailureMechanismResultView_EditValueAssessmentLayerThreeInvalid_ShowErrorToolTip(double newValue)
         {
             // Setup
-            using (CreateConfiguredFailureMechanismResultsView(new HeightStructuresFailureMechanism()))
+            using (CreateConfiguredFailureMechanismResultsView())
             {
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
@@ -437,17 +434,21 @@
         public void FailureMechanismResultView_EditValueAssessmentLayerThreeValid_DoNotShowErrorToolTipAndEditValue(double newValue)
         {
             // Setup
-            var failureMechanism = new HeightStructuresFailureMechanism();
-            using (CreateConfiguredFailureMechanismResultsView(failureMechanism))
+            var result = new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
+
+            using (ShowFailureMechanismResultsView(new ObservableList<HeightStructuresFailureMechanismSectionResult>
             {
+                result
+            }))
+            {
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
                 // Call
                 dataGridView.Rows[0].Cells[assessmentLayerThreeIndex].Value = newValue.ToString(CultureInfo.CurrentCulture);
 
                 // Assert
                 Assert.IsEmpty(dataGridView.Rows[0].ErrorText);
-                Assert.AreEqual(newValue, failureMechanism.SectionResults.First().AssessmentLayerThree);
+                Assert.AreEqual(newValue, result.AssessmentLayerThree);
             }
         }
 
@@ -712,22 +713,16 @@
             }, ProbabilityFormattingHelper.Format(0.25)).SetName("SectionWithValidCalculationOutputAndSimpleAssessmentResultNotApplicable");
         }
 
-        private HeightStructuresFailureMechanismResultView CreateConfiguredFailureMechanismResultsView(HeightStructuresFailureMechanism failureMechanism)
+        private HeightStructuresFailureMechanismResultView CreateConfiguredFailureMechanismResultsView()
         {
-            failureMechanism.AddSection(new FailureMechanismSection("Section 1", new List<Point2D>
+            var results = new ObservableList<HeightStructuresFailureMechanismSectionResult>
             {
-                new Point2D(0.0, 0.0),
-                new Point2D(5.0, 0.0)
-            }));
+                new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection("Section 1")),
+                new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection("Section 2"))
+            };
 
-            failureMechanism.AddSection(new FailureMechanismSection("Section 2", new List<Point2D>
-            {
-                new Point2D(5.0, 0.0),
-                new Point2D(10.0, 0.0)
-            }));
+            HeightStructuresFailureMechanismResultView failureMechanismResultView = ShowFailureMechanismResultsView(results);
 
-            HeightStructuresFailureMechanismResultView failureMechanismResultView = ShowFailureMechanismResultsView(failureMechanism.SectionResults);
-
             return failureMechanismResultView;
         }
 
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs
===================================================================
diff -u -r1a65cb67261da126d57a2c890acfb78b4347eb3d -r0cf83792df9c29b3bfcfb43426d721295fb4d87e
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs	(.../StabilityPointStructuresFailureMechanismResultViewTest.cs)	(revision 1a65cb67261da126d57a2c890acfb78b4347eb3d)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs	(.../StabilityPointStructuresFailureMechanismResultViewTest.cs)	(revision 0cf83792df9c29b3bfcfb43426d721295fb4d87e)
@@ -22,10 +22,8 @@
 using System;
 using System.Collections;
 using System.Globalization;
-using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base;
-using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
@@ -107,7 +105,7 @@
         public void GivenFailureMechanismResultsView_WhenAllDataSet_ThenDataGridViewCorrectlyInitialized()
         {
             // Given
-            using (CreateConfiguredFailureMechanismResultsView(new StabilityPointStructuresFailureMechanism()))
+            using (CreateConfiguredFailureMechanismResultsView())
             {
                 // Then
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
@@ -140,7 +138,7 @@
             SimpleAssessmentResultValidityOnlyType simpleAssessmentResult)
         {
             // Setup
-            using (CreateConfiguredFailureMechanismResultsView(new StabilityPointStructuresFailureMechanism()))
+            using (CreateConfiguredFailureMechanismResultsView())
             {
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
@@ -522,7 +520,7 @@
         public void FailureMechanismResultView_EditValueInvalid_ShowsErrorTooltip(string newValue, int cellIndex)
         {
             // Setup
-            using (CreateConfiguredFailureMechanismResultsView(new StabilityPointStructuresFailureMechanism()))
+            using (CreateConfiguredFailureMechanismResultsView())
             {
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
@@ -543,7 +541,7 @@
         public void FailureMechanismResultView_EditValueAssessmentLayerThreeInvalid_ShowErrorToolTip(double newValue)
         {
             // Setup
-            using (CreateConfiguredFailureMechanismResultsView(new StabilityPointStructuresFailureMechanism()))
+            using (CreateConfiguredFailureMechanismResultsView())
             {
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
@@ -565,18 +563,21 @@
         public void FailureMechanismResultView_EditValueAssessmentLayerThreeValid_DoNotShowErrorToolTipAndEditValue(double newValue)
         {
             // Setup
-            var failureMechanism = new StabilityPointStructuresFailureMechanism();
+            var result = new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
 
-            using (CreateConfiguredFailureMechanismResultsView(failureMechanism))
+            using (ShowFailureMechanismResultsView(new ObservableList<StabilityPointStructuresFailureMechanismSectionResult>
             {
+                result
+            }))
+            {
                 var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
                 // Call
                 dataGridView.Rows[0].Cells[assessmentLayerThreeIndex].Value = newValue.ToString(CultureInfo.CurrentCulture);
 
                 // Assert
                 Assert.IsEmpty(dataGridView.Rows[0].ErrorText);
-                Assert.AreEqual(newValue, failureMechanism.SectionResults.First().AssessmentLayerThree);
+                Assert.AreEqual(newValue, result.AssessmentLayerThree);
             }
         }
 
@@ -611,23 +612,16 @@
             }, ProbabilityFormattingHelper.Format(0.25)).SetName("SectionWithValidCalculationOutput");
         }
 
-        private StabilityPointStructuresFailureMechanismResultView CreateConfiguredFailureMechanismResultsView(
-            StabilityPointStructuresFailureMechanism failureMechanism)
+        private StabilityPointStructuresFailureMechanismResultView CreateConfiguredFailureMechanismResultsView()
         {
-            failureMechanism.AddSection(new FailureMechanismSection("Section 1", new[]
+            var results = new ObservableList<StabilityPointStructuresFailureMechanismSectionResult>
             {
-                new Point2D(0.0, 0.0),
-                new Point2D(5.0, 0.0)
-            }));
+                new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection("Section 1")),
+                new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection("Section 2"))
+            };
 
-            failureMechanism.AddSection(new FailureMechanismSection("Section 2", new[]
-            {
-                new Point2D(5.0, 0.0),
-                new Point2D(10.0, 0.0)
-            }));
+            StabilityPointStructuresFailureMechanismResultView failureMechanismResultView = ShowFailureMechanismResultsView(results);
 
-            StabilityPointStructuresFailureMechanismResultView failureMechanismResultView = ShowFailureMechanismResultsView(failureMechanism.SectionResults);
-
             return failureMechanismResultView;
         }