Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs
===================================================================
diff -u -r55b1b7fea666c0334d127b0057581a78aa64019c -rcbe303fbc7bcf3a77b34d511eb2b41f49b48e67c
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs	(.../PipingFailureMechanism.cs)	(revision 55b1b7fea666c0334d127b0057581a78aa64019c)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs	(.../PipingFailureMechanism.cs)	(revision cbe303fbc7bcf3a77b34d511eb2b41f49b48e67c)
@@ -33,7 +33,7 @@
     /// </summary>
     public class PipingFailureMechanism : BaseFailureMechanism
     {
-        private List<PipingFailureMechanismSectionResult> pipingFailureMechanismSectionResults;
+        private readonly List<PipingFailureMechanismSectionResult> pipingFailureMechanismSectionResults;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PipingFailureMechanism"/> class.
@@ -48,7 +48,6 @@
             var pipingCalculationGroup = new PipingCalculationGroup(PipingDataResources.PipingFailureMechanism_Calculations_DisplayName, false);
             pipingCalculationGroup.Children.Add(new PipingCalculation(GeneralInput, SemiProbabilisticInput));
             CalculationsGroup = pipingCalculationGroup;
-            AssessmentResult = new PipingFailureMechanismResult();
             pipingFailureMechanismSectionResults = new List<PipingFailureMechanismSectionResult>();
         }
 
@@ -72,13 +71,6 @@
             }
         }
 
-        public override void AddSection(FailureMechanismSection section)
-        {
-            base.AddSection(section);
-
-            pipingFailureMechanismSectionResults.Add(new PipingFailureMechanismSectionResult(section));
-        }
-
         /// <summary>
         /// Gets the available <see cref="RingtoetsPipingSurfaceLine"/> within the scope of the piping failure mechanism.
         /// </summary>
@@ -95,11 +87,6 @@
         public PipingCalculationGroup CalculationsGroup { get; private set; }
 
         /// <summary>
-        /// Gets the calculation results for this failure mechanism.
-        /// </summary>
-        public PipingFailureMechanismResult AssessmentResult { get; private set; }
-
-        /// <summary>
         /// Gets the general piping calculation input parameters that apply to each piping calculation.
         /// </summary>
         public GeneralPipingInput GeneralInput { get; private set; }
@@ -109,5 +96,23 @@
         /// in a semi-probabilistic assessment.
         /// </summary>
         public SemiProbabilisticPipingInput SemiProbabilisticInput { get; set; }
+
+        /// <summary>
+        /// Gets the piping failure mechanism section results.        
+        /// </summary>
+        public List<PipingFailureMechanismSectionResult> PipingFailureMechanismSectionResults
+        {
+            get
+            {
+                return pipingFailureMechanismSectionResults;
+            }
+        }
+
+        public override void AddSection(FailureMechanismSection section)
+        {
+            base.AddSection(section);
+
+            pipingFailureMechanismSectionResults.Add(new PipingFailureMechanismSectionResult(section));
+        }
     }
 }
\ No newline at end of file
Fisheye: Tag cbe303fbc7bcf3a77b34d511eb2b41f49b48e67c refers to a dead (removed) revision in file `Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismResult.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResult.cs
===================================================================
diff -u -r55b1b7fea666c0334d127b0057581a78aa64019c -rcbe303fbc7bcf3a77b34d511eb2b41f49b48e67c
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResult.cs	(.../PipingFailureMechanismSectionResult.cs)	(revision 55b1b7fea666c0334d127b0057581a78aa64019c)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResult.cs	(.../PipingFailureMechanismSectionResult.cs)	(revision cbe303fbc7bcf3a77b34d511eb2b41f49b48e67c)
@@ -27,7 +27,7 @@
     /// <summary>
     /// This class holds the information of the result of the <see cref="FailureMechanismSection"/>.
     /// </summary>
-    public  class PipingFailureMechanismSectionResult 
+    public class PipingFailureMechanismSectionResult 
     {
         private readonly FailureMechanismSection section;
 
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Ringtoets.Piping.Data.csproj
===================================================================
diff -u -r55b1b7fea666c0334d127b0057581a78aa64019c -rcbe303fbc7bcf3a77b34d511eb2b41f49b48e67c
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/Ringtoets.Piping.Data.csproj	(.../Ringtoets.Piping.Data.csproj)	(revision 55b1b7fea666c0334d127b0057581a78aa64019c)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Ringtoets.Piping.Data.csproj	(.../Ringtoets.Piping.Data.csproj)	(revision cbe303fbc7bcf3a77b34d511eb2b41f49b48e67c)
@@ -60,7 +60,6 @@
     <Compile Include="PipingCalculation.cs" />
     <Compile Include="PipingCalculationGroup.cs" />
     <Compile Include="PipingFailureMechanism.cs" />
-    <Compile Include="PipingFailureMechanismResult.cs" />
     <Compile Include="PipingFailureMechanismSectionResult.cs" />
     <Compile Include="PipingInput.cs" />
     <Compile Include="PipingOutput.cs" />
Fisheye: Tag cbe303fbc7bcf3a77b34d511eb2b41f49b48e67c refers to a dead (removed) revision in file `Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingFailureMechanismResultContext.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj
===================================================================
diff -u -rbff183a6d323111affe69f3afa19b9ada02c9375 -rcbe303fbc7bcf3a77b34d511eb2b41f49b48e67c
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj	(.../Ringtoets.Piping.Forms.csproj)	(revision bff183a6d323111affe69f3afa19b9ada02c9375)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj	(.../Ringtoets.Piping.Forms.csproj)	(revision cbe303fbc7bcf3a77b34d511eb2b41f49b48e67c)
@@ -67,7 +67,6 @@
     <Compile Include="PresentationObjects\PipingContext.cs" />
     <Compile Include="PresentationObjects\PipingFailureMechanismContext.cs" />
     <Compile Include="PresentationObjects\PipingInputContext.cs" />
-    <Compile Include="PresentationObjects\PipingFailureMechanismResultContext.cs" />
     <Compile Include="PresentationObjects\RingtoetsPipingSurfaceLinesContext.cs" />
     <Compile Include="PresentationObjects\StochasticSoilModelContext.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs
===================================================================
diff -u -r55b1b7fea666c0334d127b0057581a78aa64019c -rcbe303fbc7bcf3a77b34d511eb2b41f49b48e67c
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs	(.../PipingFailureMechanismResultView.cs)	(revision 55b1b7fea666c0334d127b0057581a78aa64019c)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismResultView.cs	(.../PipingFailureMechanismResultView.cs)	(revision cbe303fbc7bcf3a77b34d511eb2b41f49b48e67c)
@@ -32,7 +32,7 @@
     /// </summary>
     public partial class PipingFailureMechanismResultView : UserControl, IView
     {
-        private PipingFailureMechanismResult pipingFailureMechanismResult;
+        private PipingFailureMechanismSectionResult pipingFailureMechanismSectionResult;
 
         /// <summary>
         /// Creates a new instance of <see cref="PipingFailureMechanismResultView"/>.
@@ -94,11 +94,11 @@
         {
             get
             {
-                return pipingFailureMechanismResult;
+                return pipingFailureMechanismSectionResult;
             }
             set
             {
-                pipingFailureMechanismResult = value as PipingFailureMechanismResult;
+                pipingFailureMechanismSectionResult = value as PipingFailureMechanismSectionResult;
             }
         }
     }
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs
===================================================================
diff -u -re7923e041dfeb751cc6fe3b795f914f13734b19d -rcbe303fbc7bcf3a77b34d511eb2b41f49b48e67c
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision e7923e041dfeb751cc6fe3b795f914f13734b19d)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision cbe303fbc7bcf3a77b34d511eb2b41f49b48e67c)
@@ -94,10 +94,9 @@
                 }
             };
 
-            yield return new ViewInfo<PipingFailureMechanismResultContext, PipingFailureMechanismResult, PipingFailureMechanismResultView>
+            yield return new ViewInfo<List<PipingFailureMechanismSectionResult>, PipingFailureMechanismResultView>
             {
                 GetViewName = (v, o) => RingtoetsCommonDataResources.FailureMechanism_AssessmentResult_DisplayName,
-                GetViewData = context => context.FailureMechanismResult,
                 Image = RingtoetsCommonFormsResources.GenericInputOutputIcon,
                 CloseForData = ClosePipingFailureMechanismResultViewForData
             };
@@ -252,7 +251,7 @@
                                                                                  .Build()
             };
 
-            yield return new TreeNodeInfo<PipingFailureMechanismResultContext>
+            yield return new TreeNodeInfo<List<PipingFailureMechanismSectionResult>>
             {
                 Text = context => RingtoetsCommonDataResources.FailureMechanism_AssessmentResult_DisplayName,
                 Image = context => RingtoetsCommonFormsResources.GenericInputOutputIcon
@@ -305,7 +304,7 @@
 
                 if (pipingFailureMechanism != null)
                 {
-                    return view.Data == pipingFailureMechanism.AssessmentResult;
+                    return view.Data == pipingFailureMechanism.PipingFailureMechanismSectionResults;
                 }
             }
 
@@ -480,7 +479,7 @@
         {
             return new ArrayList
             {
-                new PipingFailureMechanismResultContext(failureMechanism.AssessmentResult, failureMechanism)
+                failureMechanism.PipingFailureMechanismSectionResults
             };
         }
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismTest.cs
===================================================================
diff -u -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb -rcbe303fbc7bcf3a77b34d511eb2b41f49b48e67c
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismTest.cs	(.../PipingFailureMechanismTest.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismTest.cs	(.../PipingFailureMechanismTest.cs)	(revision cbe303fbc7bcf3a77b34d511eb2b41f49b48e67c)
@@ -1,5 +1,8 @@
-using System.Linq;
+using System;
+using System.Linq;
 using Core.Common.Base;
+using Core.Common.Base.Geometry;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data;
@@ -36,7 +39,6 @@
             Assert.AreEqual("Berekeningen", piping.CalculationsGroup.Name);
             Assert.AreEqual(1, piping.CalculationsGroup.Children.Count);
             Assert.IsInstanceOf<PipingCalculation>(piping.CalculationsGroup.Children.First());
-            Assert.IsInstanceOf<PipingFailureMechanismResult>(piping.AssessmentResult);
         }
 
         [Test]
@@ -193,5 +195,68 @@
             // Assert
             CollectionAssert.DoesNotContain(failureMechanism.CalculationsGroup.Children, folder);
         }
+
+        [Test]
+        public void AddSection_SectionIsNull_ThrowArgumentNullException()
+        {
+            // Setup
+            var failureMechanism = new PipingFailureMechanism();
+
+            // Call
+            TestDelegate call = () => failureMechanism.AddSection(null);
+
+            // Assert
+            Assert.Throws<ArgumentNullException>(call);
+        }
+
+        [Test]
+        public void AddSection_SectionValid_SectionAddedSectionResults()
+        {
+            // Setup
+            var failureMechanism = new PipingFailureMechanism();
+
+            var section = new FailureMechanismSection("A", new[]
+            {
+                new Point2D(1, 2),
+                new Point2D(3, 4)
+            });
+
+            // Precondition
+            Assert.AreEqual(0, failureMechanism.PipingFailureMechanismSectionResults.Count);
+
+            // Call
+            failureMechanism.AddSection(section);
+
+            // Assert
+            Assert.AreEqual(1, failureMechanism.PipingFailureMechanismSectionResults.Count);
+        }
+
+        [Test]
+        public void AddSection_SecondSectionDoesNotConnectToFirst_ThrowArgumentException()
+        {
+            // Setup
+            var failureMechanism = new PipingFailureMechanism();
+
+            var section1 = new FailureMechanismSection("A", new[]
+            {
+                new Point2D(1, 2),
+                new Point2D(3, 4)
+                
+            });
+            var section2 = new FailureMechanismSection("B", new[]
+            {
+                new Point2D(5, 6),
+                new Point2D(7, 8)
+            });
+
+            failureMechanism.AddSection(section1);
+
+            // Call
+            TestDelegate call = () => failureMechanism.AddSection(section2);
+
+            // Assert
+            string expectedMessage = "Vak 'B' sluit niet aan op de al gedefinieerde vakken van het faalmechanisme.";
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, expectedMessage);
+        }
     }
 }
\ No newline at end of file
Fisheye: Tag cbe303fbc7bcf3a77b34d511eb2b41f49b48e67c refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingFailureMechanismResultContextTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj
===================================================================
diff -u -rbff183a6d323111affe69f3afa19b9ada02c9375 -rcbe303fbc7bcf3a77b34d511eb2b41f49b48e67c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj	(.../Ringtoets.Piping.Forms.Test.csproj)	(revision bff183a6d323111affe69f3afa19b9ada02c9375)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj	(.../Ringtoets.Piping.Forms.Test.csproj)	(revision cbe303fbc7bcf3a77b34d511eb2b41f49b48e67c)
@@ -61,7 +61,6 @@
   <ItemGroup>
     <Compile Include="PipingCalculationConfigurationHelperTest.cs" />
     <Compile Include="PresentationObjects\PipingFailureMechanismContextTest.cs" />
-    <Compile Include="PresentationObjects\PipingFailureMechanismResultContextTest.cs" />
     <Compile Include="PresentationObjects\RingtoetsPipingSurfaceLinesContextTest.cs" />
     <Compile Include="PresentationObjects\StochasticSoilModelContextTest.cs" />
     <Compile Include="PropertyClasses\PipingFailureMechanismContextPropertiesTest.cs" />
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -r08ab7af115b5bbad87eaffb9bc1b1c4379ec8738 -rcbe303fbc7bcf3a77b34d511eb2b41f49b48e67c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismResultContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismResultContextTreeNodeInfoTest.cs)	(revision 08ab7af115b5bbad87eaffb9bc1b1c4379ec8738)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismResultContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismResultContextTreeNodeInfoTest.cs)	(revision cbe303fbc7bcf3a77b34d511eb2b41f49b48e67c)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Controls.TreeView;
 using Core.Common.TestUtil;
@@ -43,14 +44,14 @@
         {
             mocks = new MockRepository();
             plugin = new PipingGuiPlugin();
-            info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(PipingFailureMechanismResultContext));
+            info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(List<PipingFailureMechanismSectionResult>));
         }
 
         [Test]
         public void Initialized_Always_ExpectedPropertiesSet()
         {
             // Assert
-            Assert.AreEqual(typeof(PipingFailureMechanismResultContext), info.TagType);
+            Assert.AreEqual(typeof(List<PipingFailureMechanismSectionResult>), info.TagType);
             Assert.IsNull(info.ForeColor);
             Assert.IsNull(info.EnsureVisibleOnCreate);
             Assert.IsNull(info.CanRename);
@@ -73,10 +74,9 @@
             mocks.ReplayAll();
 
             var mechanism = new PipingFailureMechanism();
-            var mechanismContext = new PipingFailureMechanismResultContext(mechanism.AssessmentResult, mechanism);
 
             // Call
-            var text = info.Text(mechanismContext);
+            var text = info.Text(mechanism.PipingFailureMechanismSectionResults);
 
             // Assert
             Assert.AreEqual("Oordeel", text);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs
===================================================================
diff -u -r43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb -rcbe303fbc7bcf3a77b34d511eb2b41f49b48e67c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs	(.../PipingFailureMechanismTreeNodeInfoTest.cs)	(revision 43fb77c51a8d1c0af128a2da0c3d51bbea6e25bb)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs	(.../PipingFailureMechanismTreeNodeInfoTest.cs)	(revision cbe303fbc7bcf3a77b34d511eb2b41f49b48e67c)
@@ -162,10 +162,10 @@
             var outputsFolder = (CategoryTreeFolder) children[2];
             Assert.AreEqual("Uitvoer", outputsFolder.Name);
             Assert.AreEqual(TreeFolderCategory.Output, outputsFolder.Category);
-
-            var failureMechanismResultContext = (PipingFailureMechanismResultContext) outputsFolder.Contents[0];
-            Assert.AreSame(pipingFailureMechanism.AssessmentResult, failureMechanismResultContext.FailureMechanismResult);
-            Assert.AreSame(pipingFailureMechanism, failureMechanismResultContext.FailureMechanism);
+            CollectionAssert.AreEqual(new object[]
+            {
+                pipingFailureMechanism.PipingFailureMechanismSectionResults
+            }, outputsFolder.Contents);
             mocks.VerifyAll();
         }
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs
===================================================================
diff -u -rd25b4929e44f498c0f0be55bc39eb28ee2991293 -rcbe303fbc7bcf3a77b34d511eb2b41f49b48e67c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs	(.../PipingFailureMechanismResultViewTest.cs)	(revision d25b4929e44f498c0f0be55bc39eb28ee2991293)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs	(.../PipingFailureMechanismResultViewTest.cs)	(revision cbe303fbc7bcf3a77b34d511eb2b41f49b48e67c)
@@ -21,9 +21,11 @@
 
 using System.Linq;
 using System.Windows.Forms;
+using Core.Common.Base.Geometry;
 using Core.Common.Controls.Views;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
+using Ringtoets.Common.Data;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.Views;
 
@@ -89,7 +91,15 @@
         public void Data_SetPipingFailureMechanismResultData_DataSet()
         {
             // Setup
-            var testData = new PipingFailureMechanismResult();
+            var points = new[]
+            {
+                new Point2D(1, 2),
+                new Point2D(3, 4)
+            };
+
+            var section = new FailureMechanismSection("test", points);
+            var testData = new PipingFailureMechanismSectionResult(section);
+
             var view = new PipingFailureMechanismResultView();
 
             // Call
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingGuiPluginTest.cs
===================================================================
diff -u -re4c9a9021d87a6abe4ccb94e5580aaaa8f0169bb -rcbe303fbc7bcf3a77b34d511eb2b41f49b48e67c
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingGuiPluginTest.cs	(.../PipingGuiPluginTest.cs)	(revision e4c9a9021d87a6abe4ccb94e5580aaaa8f0169bb)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingGuiPluginTest.cs	(.../PipingGuiPluginTest.cs)	(revision cbe303fbc7bcf3a77b34d511eb2b41f49b48e67c)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Base.Plugin;
 using Core.Common.Controls.TreeView;
@@ -157,7 +158,7 @@
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(PipingSemiProbabilisticOutput)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(EmptyPipingOutput)));
                 Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(EmptyPipingCalculationReport)));
-                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(PipingFailureMechanismResultContext)));
+                Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(List<PipingFailureMechanismSectionResult>)));
             }
             mocks.VerifyAll();
         }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs
===================================================================
diff -u -r034b8b3af2065f21c18e7e08cba0e69055cfe6bf -rcbe303fbc7bcf3a77b34d511eb2b41f49b48e67c
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs	(.../PipingFailureMechanismResultViewInfoTest.cs)	(revision 034b8b3af2065f21c18e7e08cba0e69055cfe6bf)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs	(.../PipingFailureMechanismResultViewInfoTest.cs)	(revision cbe303fbc7bcf3a77b34d511eb2b41f49b48e67c)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Gui.Plugin;
 using Core.Common.TestUtil;
@@ -57,36 +58,33 @@
         public void Initialized_Always_ExpectedPropertiesSet()
         {
             // Assert
-            Assert.AreEqual(typeof(PipingFailureMechanismResultContext), info.DataType);
-            Assert.AreEqual(typeof(PipingFailureMechanismResult), info.ViewDataType);
+            Assert.AreEqual(typeof(List<PipingFailureMechanismSectionResult>), info.DataType);
         }
 
         [Test]
         public void GetViewData_Always_ReturnsWrappedPipingFailureMechanismResult()
         {
             // Setup
             var pipingFailureMechanism = new PipingFailureMechanism();
-            var pipingFailureMechanismResultContext = new PipingFailureMechanismResultContext(pipingFailureMechanism.AssessmentResult, pipingFailureMechanism);
 
             // Call
-            var viewData = info.GetViewData(pipingFailureMechanismResultContext);
+            var viewData = info.GetViewData(pipingFailureMechanism.PipingFailureMechanismSectionResults);
 
             // Assert
-            Assert.AreEqual(pipingFailureMechanism.AssessmentResult, viewData);
+            Assert.AreSame(pipingFailureMechanism.PipingFailureMechanismSectionResults, viewData);
         }
 
         [Test]
         public void GetViewName_Always_ReturnsViewName()
         {
             // Setup
             var pipingFailureMechanism = new PipingFailureMechanism();
-            var pipingFailureMechanismResultContext = new PipingFailureMechanismResultContext(pipingFailureMechanism.AssessmentResult, pipingFailureMechanism);
             var viewMock = mocks.StrictMock<PipingFailureMechanismResultView>();
 
             mocks.ReplayAll();
 
             // Call
-            var viewName = info.GetViewName(viewMock, pipingFailureMechanismResultContext.FailureMechanismResult);
+            var viewName = info.GetViewName(viewMock, pipingFailureMechanism.PipingFailureMechanismSectionResults);
 
             //
             Assert.AreEqual("Oordeel", viewName);
@@ -108,9 +106,9 @@
             // Setup
             var viewMock = mocks.StrictMock<PipingFailureMechanismResultView>();
             var assessmentSectionMock = mocks.StrictMock<AssessmentSectionBase>();
-            var pipingFailureMechanismResultMock = mocks.StrictMock<PipingFailureMechanismResult>();
+            var pipingFailureMechanism = new PipingFailureMechanism();
 
-            viewMock.Expect(vm => vm.Data).Return(pipingFailureMechanismResultMock);
+            viewMock.Expect(vm => vm.Data).Return(pipingFailureMechanism.PipingFailureMechanismSectionResults);
             assessmentSectionMock.Expect(asm => asm.GetFailureMechanisms()).Return(new IFailureMechanism[0]);
 
             mocks.ReplayAll();
@@ -129,9 +127,9 @@
             var viewMock = mocks.StrictMock<PipingFailureMechanismResultView>();
             var assessmentSectionMock = mocks.StrictMock<AssessmentSectionBase>();
             var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
-            var pipingFailureMechanismResultMock = mocks.StrictMock<PipingFailureMechanismResult>();
+            var pipingFailureMechanism = new PipingFailureMechanism();
 
-            viewMock.Expect(vm => vm.Data).Return(pipingFailureMechanismResultMock);
+            viewMock.Expect(vm => vm.Data).Return(pipingFailureMechanism.PipingFailureMechanismSectionResults);
             assessmentSectionMock.Expect(asm => asm.GetFailureMechanisms()).Return(new[]
             {
                 pipingFailureMechanismMock
@@ -154,7 +152,7 @@
             var assessmentSectionMock = mocks.StrictMock<AssessmentSectionBase>();
             var pipingFailureMechanismMock = mocks.StrictMock<PipingFailureMechanism>();
 
-            viewMock.Expect(vm => vm.Data).Return(pipingFailureMechanismMock.AssessmentResult);
+            viewMock.Expect(vm => vm.Data).Return(pipingFailureMechanismMock.PipingFailureMechanismSectionResults);
             assessmentSectionMock.Expect(asm => asm.GetFailureMechanisms()).Return(new[]
             {
                 pipingFailureMechanismMock