Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismContext.cs
===================================================================
diff -u -r743c32ba40bc0d0165d0513d6ca95282b1021e6a -rdfad022e552dd79f31949b367c99d29b93c4f1e6
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismContext.cs	(.../FailureMechanismContext.cs)	(revision 743c32ba40bc0d0165d0513d6ca95282b1021e6a)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismContext.cs	(.../FailureMechanismContext.cs)	(revision dfad022e552dd79f31949b367c99d29b93c4f1e6)
@@ -31,15 +31,15 @@
     /// <summary>
     /// This class is a presentation object for a <see cref="IFailureMechanism"/> instance.
     /// </summary>
-    public abstract class FailureMechanismContext<T> : WrappedObjectContextBase<T>, IFailureMechanismContext<T> where T : IFailureMechanism
+    public class FailureMechanismContext<T> : WrappedObjectContextBase<T>, IFailureMechanismContext<T> where T : IFailureMechanism
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="FailureMechanismContext{T}"/> class.
         /// </summary>
         /// <param name="wrappedFailureMechanism">The failure mechanism.</param>
         /// <param name="parent">The parent of <paramref name="wrappedFailureMechanism"/>.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="wrappedFailureMechanism"/> or <paramref name="parent"/> are <c>null</c>.</exception>
-        protected FailureMechanismContext(T wrappedFailureMechanism, IAssessmentSection parent) : base(wrappedFailureMechanism)
+        public FailureMechanismContext(T wrappedFailureMechanism, IAssessmentSection parent) : base(wrappedFailureMechanism)
         {
             AssertInputsAreNotNull(parent);
 
Fisheye: Tag dfad022e552dd79f31949b367c99d29b93c4f1e6 refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/ArbitraryProbabilityFailureMechanismContext.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag dfad022e552dd79f31949b367c99d29b93c4f1e6 refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/NumericFailureMechanismContext.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag dfad022e552dd79f31949b367c99d29b93c4f1e6 refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/SimpleFailureMechanismContext.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj
===================================================================
diff -u -r08a279166007321b0ae0f2f15a2f13c191952e1b -rdfad022e552dd79f31949b367c99d29b93c4f1e6
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj	(.../Ringtoets.Integration.Forms.csproj)	(revision 08a279166007321b0ae0f2f15a2f13c191952e1b)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj	(.../Ringtoets.Integration.Forms.csproj)	(revision dfad022e552dd79f31949b367c99d29b93c4f1e6)
@@ -45,9 +45,6 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="MapDataFactory.cs" />
-    <Compile Include="PresentationObjects\ArbitraryProbabilityFailureMechanismContext.cs" />
-    <Compile Include="PresentationObjects\NumericFailureMechanismContext.cs" />
-    <Compile Include="PresentationObjects\SimpleFailureMechanismContext.cs" />
     <Compile Include="PresentationObjects\HydraulicBoundaryDatabaseContext.cs" />
     <Compile Include="PropertyClasses\CalculationContextProperties.cs" />
     <Compile Include="PropertyClasses\CalculationGroupContextProperties.cs" />
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs
===================================================================
diff -u -rd65d6b037600ccd69f386d9164172dd2c133356e -rdfad022e552dd79f31949b367c99d29b93c4f1e6
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision d65d6b037600ccd69f386d9164172dd2c133356e)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision dfad022e552dd79f31949b367c99d29b93c4f1e6)
@@ -56,6 +56,7 @@
 using Ringtoets.HydraRing.Calculation.Data.Output;
 using Ringtoets.HydraRing.Data;
 using Ringtoets.HydraRing.IO;
+using Ringtoets.Integration.Data.StandAlone;
 using Ringtoets.Integration.Data.StandAlone.SectionResult;
 using Ringtoets.Integration.Forms.PresentationObjects;
 using Ringtoets.Integration.Forms.PropertyClasses;
@@ -508,23 +509,23 @@
                 var grassCoverErosionInwards = failureMechanism as GrassCoverErosionInwardsFailureMechanism;
                 var heightStructuresFailureMechanism = failureMechanism as HeightStructuresFailureMechanism;
 
-                var duneErosion = failureMechanism as IHasSectionResults<DuneErosionFailureMechanismSectionResult>;
-                var grassCoverErosionOutwards = failureMechanism as IHasSectionResults<GrassCoverErosionOutwardsFailureMechanismSectionResult>;
-                var grassCoverSlipOffInwards = failureMechanism as IHasSectionResults<GrassCoverSlipOffInwardsFailureMechanismSectionResult>;
-                var grassCoverSlipOffOutwards = failureMechanism as IHasSectionResults<GrassCoverSlipOffOutwardsFailureMechanismSectionResult>;
-                var microstability = failureMechanism as IHasSectionResults<MicrostabilityFailureMechanismSectionResult>;
-                var pipingStructure = failureMechanism as IHasSectionResults<PipingStructureFailureMechanismSectionResult>;
-                var stabilityStoneCover = failureMechanism as IHasSectionResults<StabilityStoneCoverFailureMechanismSectionResult>;
-                var technicalInnovation = failureMechanism as IHasSectionResults<TechnicalInnovationFailureMechanismSectionResult>;
+                var duneErosion = failureMechanism as DuneErosionFailureMechanism;
+                var grassCoverErosionOutwards = failureMechanism as GrassCoverErosionOutwardsFailureMechanism;
+                var grassCoverSlipOffInwards = failureMechanism as GrassCoverSlipOffInwardsFailureMechanism;
+                var grassCoverSlipOffOutwards = failureMechanism as GrassCoverSlipOffOutwardsFailureMechanism;
+                var microstability = failureMechanism as MicrostabilityFailureMechanism;
+                var pipingStructure = failureMechanism as PipingStructureFailureMechanism;
+                var stabilityStoneCover = failureMechanism as StabilityStoneCoverFailureMechanism;
+                var technicalInnovation = failureMechanism as TechnicalInnovationFailureMechanism;
 
-                var strengthStabilityLengthwiseConstruction = failureMechanism as IHasSectionResults<StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult>;
-                var waterPressureAsphaltCover = failureMechanism as IHasSectionResults<WaterPressureAsphaltCoverFailureMechanismSectionResult>;
-                var waveImpactAsphaltCover = failureMechanism as IHasSectionResults<WaveImpactAsphaltCoverFailureMechanismSectionResult>;
+                var strengthStabilityLengthwiseConstruction = failureMechanism as StrengthStabilityLengthwiseConstructionFailureMechanism;
+                var waterPressureAsphaltCover = failureMechanism as WaterPressureAsphaltCoverFailureMechanism;
+                var waveImpactAsphaltCover = failureMechanism as WaveImpactAsphaltCoverFailureMechanism;
 
-                var closingStructure = failureMechanism as IHasSectionResults<ClosingStructureFailureMechanismSectionResult>;
-                var macrostabilityInwards = failureMechanism as IHasSectionResults<MacrostabilityInwardsFailureMechanismSectionResult>;
-                var macrostabilityOutwards = failureMechanism as IHasSectionResults<MacrostabilityOutwardsFailureMechanismSectionResult>;
-                var strengthStabilityPointConstruction = failureMechanism as IHasSectionResults<StrengthStabilityPointConstructionFailureMechanismSectionResult>;
+                var closingStructure = failureMechanism as ClosingStructureFailureMechanism;
+                var macrostabilityInwards = failureMechanism as MacrostabilityInwardsFailureMechanism;
+                var macrostabilityOutwards = failureMechanism as MacrostabilityOutwardsFailureMechanism;
+                var strengthStabilityPointConstruction = failureMechanism as StrengthStabilityPointConstructionFailureMechanism;
 
                 if (piping != null)
                 {
@@ -540,63 +541,63 @@
                 }
                 else if (duneErosion != null)
                 {
-                    yield return new SimpleFailureMechanismContext(failureMechanism, nodeData);
+                    yield return new FailureMechanismContext<IFailureMechanism>(duneErosion, nodeData);
                 }
                 else if (grassCoverErosionOutwards != null)
                 {
-                    yield return new SimpleFailureMechanismContext(failureMechanism, nodeData);
+                    yield return new FailureMechanismContext<IFailureMechanism>(grassCoverErosionOutwards, nodeData);
                 }
                 else if (grassCoverSlipOffInwards != null)
                 {
-                    yield return new SimpleFailureMechanismContext(failureMechanism, nodeData);
+                    yield return new FailureMechanismContext<IFailureMechanism>(grassCoverSlipOffInwards, nodeData);
                 }
                 else if (grassCoverSlipOffOutwards != null)
                 {
-                    yield return new SimpleFailureMechanismContext(failureMechanism, nodeData);
+                    yield return new FailureMechanismContext<IFailureMechanism>(grassCoverSlipOffOutwards, nodeData);
                 }
                 else if (microstability != null)
                 {
-                    yield return new SimpleFailureMechanismContext(failureMechanism, nodeData);
+                    yield return new FailureMechanismContext<IFailureMechanism>(microstability, nodeData);
                 }
                 else if (pipingStructure != null)
                 {
-                    yield return new SimpleFailureMechanismContext(failureMechanism, nodeData);
+                    yield return new FailureMechanismContext<IFailureMechanism>(pipingStructure, nodeData);
                 }
                 else if (stabilityStoneCover != null)
                 {
-                    yield return new SimpleFailureMechanismContext(failureMechanism, nodeData);
+                    yield return new FailureMechanismContext<IFailureMechanism>(stabilityStoneCover, nodeData);
                 }
                 else if (technicalInnovation != null)
                 {
-                    yield return new SimpleFailureMechanismContext(failureMechanism, nodeData);
+                    yield return new FailureMechanismContext<IFailureMechanism>(technicalInnovation, nodeData);
                 }
                 else if (strengthStabilityLengthwiseConstruction != null)
                 {
-                    yield return new NumericFailureMechanismContext(failureMechanism, nodeData);
+                    yield return new FailureMechanismContext<IFailureMechanism>(strengthStabilityLengthwiseConstruction, nodeData);
                 }
                 else if (waterPressureAsphaltCover != null)
                 {
-                    yield return new NumericFailureMechanismContext(failureMechanism, nodeData);
+                    yield return new FailureMechanismContext<IFailureMechanism>(waterPressureAsphaltCover, nodeData);
                 }
                 else if (waveImpactAsphaltCover != null)
                 {
-                    yield return new NumericFailureMechanismContext(failureMechanism, nodeData);
+                    yield return new FailureMechanismContext<IFailureMechanism>(waveImpactAsphaltCover, nodeData);
                 }
                 else if (closingStructure != null)
                 {
-                    yield return new ArbitraryProbabilityFailureMechanismContext(failureMechanism, nodeData);
+                    yield return new FailureMechanismContext<IFailureMechanism>(closingStructure, nodeData);
                 }
                 else if (macrostabilityInwards != null)
                 {
-                    yield return new ArbitraryProbabilityFailureMechanismContext(failureMechanism, nodeData);
+                    yield return new FailureMechanismContext<IFailureMechanism>(macrostabilityInwards, nodeData);
                 }
                 else if (macrostabilityOutwards != null)
                 {
-                    yield return new ArbitraryProbabilityFailureMechanismContext(failureMechanism, nodeData);
+                    yield return new FailureMechanismContext<IFailureMechanism>(macrostabilityOutwards, nodeData);
                 }
                 else if (strengthStabilityPointConstruction != null)
                 {
-                    yield return new ArbitraryProbabilityFailureMechanismContext(failureMechanism, nodeData);
+                    yield return new FailureMechanismContext<IFailureMechanism>(strengthStabilityPointConstruction, nodeData);
                 }
                 else
                 {
Fisheye: Tag dfad022e552dd79f31949b367c99d29b93c4f1e6 refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/ArbitraryProbabilityFailureMechanismContextTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag dfad022e552dd79f31949b367c99d29b93c4f1e6 refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/NumericFailureMechanismContextTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag dfad022e552dd79f31949b367c99d29b93c4f1e6 refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/SimpleFailureMechanismContextTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/StandAloneFailureMechanismContextPropertiesTest.cs
===================================================================
diff -u -rb9d20365707e77623054f96f0c8b544e86658e67 -rdfad022e552dd79f31949b367c99d29b93c4f1e6
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/StandAloneFailureMechanismContextPropertiesTest.cs	(.../StandAloneFailureMechanismContextPropertiesTest.cs)	(revision b9d20365707e77623054f96f0c8b544e86658e67)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/StandAloneFailureMechanismContextPropertiesTest.cs	(.../StandAloneFailureMechanismContextPropertiesTest.cs)	(revision dfad022e552dd79f31949b367c99d29b93c4f1e6)
@@ -26,7 +26,6 @@
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.PresentationObjects;
-using Ringtoets.Integration.Forms.PresentationObjects;
 using Ringtoets.Integration.Forms.PropertyClasses;
 
 namespace Ringtoets.Integration.Forms.Test.PropertyClasses
@@ -54,26 +53,11 @@
             var properties = new StandAloneFailureMechanismContextProperties();
 
             // Call
-            properties.Data = new SimpleFailureMechanismContext(failureMechanism, new MockRepository().StrictMock<IAssessmentSection>());
+            properties.Data = new FailureMechanismContext<IFailureMechanism>(failureMechanism, new MockRepository().StrictMock<IAssessmentSection>());
 
             // Assert
             Assert.AreEqual(failureMechanism.Name, properties.Name);
             Assert.AreEqual(failureMechanism.Code, properties.Code);
         } 
-
-        [Test]
-        public void Data_SetNewNumericFailureMechanismContextInstance_ReturnCorrectPropertyValues()
-        {
-            // Setup
-            var failureMechanism = new TestFailureMechanism();
-            var properties = new StandAloneFailureMechanismContextProperties();
-
-            // Call
-            properties.Data = new NumericFailureMechanismContext(failureMechanism, new MockRepository().StrictMock<IAssessmentSection>());
-
-            // Assert
-            Assert.AreEqual(failureMechanism.Name, properties.Name);
-            Assert.AreEqual(failureMechanism.Code, properties.Code);
-        } 
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj
===================================================================
diff -u -r08a279166007321b0ae0f2f15a2f13c191952e1b -rdfad022e552dd79f31949b367c99d29b93c4f1e6
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision 08a279166007321b0ae0f2f15a2f13c191952e1b)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj	(.../Ringtoets.Integration.Forms.Test.csproj)	(revision dfad022e552dd79f31949b367c99d29b93c4f1e6)
@@ -59,10 +59,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MapDataFactoryTest.cs" />
-    <Compile Include="PresentationObjects\ArbitraryProbabilityFailureMechanismContextTest.cs" />
-    <Compile Include="PresentationObjects\SimpleFailureMechanismContextTest.cs" />
     <Compile Include="PresentationObjects\HydraulicBoundaryDatabaseContextTest.cs" />
-    <Compile Include="PresentationObjects\NumericFailureMechanismContextTest.cs" />
     <Compile Include="PropertyClasses\CalculationGroupContextPropertiesTest.cs" />
     <Compile Include="PropertyClasses\CalculationContextPropertiesTest.cs" />
     <Compile Include="PropertyClasses\StandAloneFailureMechanismContextPropertiesTest.cs" />
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs
===================================================================
diff -u -r76c2371398aaacdc8ee6b0c8debd722a747519db -rdfad022e552dd79f31949b367c99d29b93c4f1e6
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs	(.../AssessmentSectionTreeNodeInfoTest.cs)	(revision 76c2371398aaacdc8ee6b0c8debd722a747519db)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs	(.../AssessmentSectionTreeNodeInfoTest.cs)	(revision dfad022e552dd79f31949b367c99d29b93c4f1e6)
@@ -148,8 +148,20 @@
                 new PipingFailureMechanism(),
                 new GrassCoverErosionInwardsFailureMechanism(),
                 new HeightStructuresFailureMechanism(),
+
+                new DuneErosionFailureMechanism(), 
                 new GrassCoverErosionOutwardsFailureMechanism(),
+                new GrassCoverSlipOffInwardsFailureMechanism(), 
+                new GrassCoverSlipOffOutwardsFailureMechanism(), 
+                new MicrostabilityFailureMechanism(), 
+                new PipingStructureFailureMechanism(),
+                new StabilityStoneCoverFailureMechanism(), 
+                new TechnicalInnovationFailureMechanism(), 
+
+                new StrengthStabilityLengthwiseConstructionFailureMechanism(),
                 new WaterPressureAsphaltCoverFailureMechanism(),
+                new WaveImpactAsphaltCoverFailureMechanism(), 
+
                 new ClosingStructureFailureMechanism(), 
                 new MacrostabilityInwardsFailureMechanism(), 
                 new MacrostabilityOutwardsFailureMechanism(), 
@@ -169,7 +181,7 @@
                 var objects = info.ChildNodeObjects(assessmentSection).ToArray();
 
                 // Assert
-                Assert.AreEqual(13, objects.Length);
+                Assert.AreEqual(22, objects.Length);
                 var referenceLineContext = (ReferenceLineContext) objects[0];
                 Assert.AreSame(assessmentSection.ReferenceLine, referenceLineContext.WrappedData);
                 Assert.AreSame(assessmentSection, referenceLineContext.Parent);
@@ -197,28 +209,52 @@
                 Assert.AreSame(failureMechanisms[2], heightStructuresFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, heightStructuresFailureMechanismContext.Parent);
 
-                var simpleFailureMechanismContext = (SimpleFailureMechanismContext)objects[7];
-                Assert.AreSame(failureMechanisms[3], simpleFailureMechanismContext.WrappedData);
-                Assert.AreSame(assessmentSection, simpleFailureMechanismContext.Parent);
+                var duneErosionFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>)objects[7];
+                Assert.AreSame(failureMechanisms[3], duneErosionFailureMechanismContext.WrappedData);
+                Assert.AreSame(assessmentSection, duneErosionFailureMechanismContext.Parent);
+                var grassCoverErosionOutwardsFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>)objects[8];
+                Assert.AreSame(failureMechanisms[4], grassCoverErosionOutwardsFailureMechanismContext.WrappedData);
+                Assert.AreSame(assessmentSection, grassCoverErosionOutwardsFailureMechanismContext.Parent);
+                var grassCoverSlipOffInwardsFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>)objects[9];
+                Assert.AreSame(failureMechanisms[5], grassCoverSlipOffInwardsFailureMechanismContext.WrappedData);
+                Assert.AreSame(assessmentSection, grassCoverSlipOffInwardsFailureMechanismContext.Parent);
+                var grassCoverSlipOffOutwardsFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>)objects[10];
+                Assert.AreSame(failureMechanisms[6], grassCoverSlipOffOutwardsFailureMechanismContext.WrappedData);
+                Assert.AreSame(assessmentSection, grassCoverSlipOffOutwardsFailureMechanismContext.Parent);
+                var microstabilityFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>)objects[11];
+                Assert.AreSame(failureMechanisms[7], microstabilityFailureMechanismContext.WrappedData);
+                Assert.AreSame(assessmentSection, microstabilityFailureMechanismContext.Parent);
+                var pipingStructureFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>)objects[12];
+                Assert.AreSame(failureMechanisms[8], pipingStructureFailureMechanismContext.WrappedData);
+                Assert.AreSame(assessmentSection, pipingStructureFailureMechanismContext.Parent);
+                var stabilityStoneCoverFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>)objects[13];
+                Assert.AreSame(failureMechanisms[9], stabilityStoneCoverFailureMechanismContext.WrappedData);
+                Assert.AreSame(assessmentSection, stabilityStoneCoverFailureMechanismContext.Parent);
+                var technicalInnovationFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>)objects[14];
+                Assert.AreSame(failureMechanisms[10], technicalInnovationFailureMechanismContext.WrappedData);
+                Assert.AreSame(assessmentSection, technicalInnovationFailureMechanismContext.Parent);
 
-                var numericFailureMechanismContext = (NumericFailureMechanismContext)objects[8];
-                Assert.AreSame(failureMechanisms[4], numericFailureMechanismContext.WrappedData);
-                Assert.AreSame(assessmentSection, numericFailureMechanismContext.Parent);
+                var strengthStabilityLengthwiseConstructionFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>)objects[15];
+                Assert.AreSame(failureMechanisms[11], strengthStabilityLengthwiseConstructionFailureMechanismContext.WrappedData);
+                Assert.AreSame(assessmentSection, strengthStabilityLengthwiseConstructionFailureMechanismContext.Parent);
+                var waterPressureAsphaltCoverFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>)objects[16];
+                Assert.AreSame(failureMechanisms[12], waterPressureAsphaltCoverFailureMechanismContext.WrappedData);
+                Assert.AreSame(assessmentSection, waterPressureAsphaltCoverFailureMechanismContext.Parent);
+                var waveImpactAsphaltCoverFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>)objects[17];
+                Assert.AreSame(failureMechanisms[13], waveImpactAsphaltCoverFailureMechanismContext.WrappedData);
+                Assert.AreSame(assessmentSection, waveImpactAsphaltCoverFailureMechanismContext.Parent);
 
-                var closingStructureFailureMechnaismContext = (ArbitraryProbabilityFailureMechanismContext)objects[9];
-                Assert.AreSame(failureMechanisms[5], closingStructureFailureMechnaismContext.WrappedData);
+                var closingStructureFailureMechnaismContext = (FailureMechanismContext<IFailureMechanism>)objects[18];
+                Assert.AreSame(failureMechanisms[14], closingStructureFailureMechnaismContext.WrappedData);
                 Assert.AreSame(assessmentSection, closingStructureFailureMechnaismContext.Parent);
-
-                var macrostabilityInwardsFailureMechanismContext = (ArbitraryProbabilityFailureMechanismContext)objects[10];
-                Assert.AreSame(failureMechanisms[6], macrostabilityInwardsFailureMechanismContext.WrappedData);
+                var macrostabilityInwardsFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>)objects[19];
+                Assert.AreSame(failureMechanisms[15], macrostabilityInwardsFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, macrostabilityInwardsFailureMechanismContext.Parent);
-
-                var macrostabilityOutwardsFailureMechanismContext = (ArbitraryProbabilityFailureMechanismContext)objects[11];
-                Assert.AreSame(failureMechanisms[7], macrostabilityOutwardsFailureMechanismContext.WrappedData);
+                var macrostabilityOutwardsFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>)objects[20];
+                Assert.AreSame(failureMechanisms[16], macrostabilityOutwardsFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, macrostabilityOutwardsFailureMechanismContext.Parent);
-
-                var strengthStabilityPointConstructionFailureMechanismContext = (ArbitraryProbabilityFailureMechanismContext)objects[12];
-                Assert.AreSame(failureMechanisms[8], strengthStabilityPointConstructionFailureMechanismContext.WrappedData);
+                var strengthStabilityPointConstructionFailureMechanismContext = (FailureMechanismContext<IFailureMechanism>)objects[21];
+                Assert.AreSame(failureMechanisms[17], strengthStabilityPointConstructionFailureMechanismContext.WrappedData);
                 Assert.AreSame(assessmentSection, strengthStabilityPointConstructionFailureMechanismContext.Parent);
             }
             mocks.VerifyAll();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r08a279166007321b0ae0f2f15a2f13c191952e1b -rdfad022e552dd79f31949b367c99d29b93c4f1e6
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs	(.../FailureMechanismContextTreeNodeInfoTest.cs)	(revision 08a279166007321b0ae0f2f15a2f13c191952e1b)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs	(.../FailureMechanismContextTreeNodeInfoTest.cs)	(revision dfad022e552dd79f31949b367c99d29b93c4f1e6)
@@ -40,7 +40,6 @@
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.Integration.Data.StandAlone.SectionResult;
-using Ringtoets.Integration.Forms.PresentationObjects;
 using Ringtoets.Integration.Plugin;
 using RingtoetsFormsResources = Ringtoets.Integration.Forms.Properties.Resources;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
@@ -91,7 +90,7 @@
             mocks.ReplayAll();
 
             var failureMechanism = new TestFailureMechanism("name", "code");
-            var failureMechanismContext = new NumericFailureMechanismContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new FailureMechanismContext<IFailureMechanism>(failureMechanism, assessmentSection);
 
             using (var plugin = new RingtoetsGuiPlugin())
             {
@@ -133,7 +132,7 @@
                 mocks.ReplayAll();
 
                 var failureMechanism = new TestFailureMechanism("C", "C");
-                var context = new NumericFailureMechanismContext(failureMechanism, assessmentSection);
+                var context = new FailureMechanismContext<IFailureMechanism>(failureMechanism, assessmentSection);
 
                 // Call
                 var textColor = info.ForeColor(context);
@@ -258,7 +257,7 @@
                     new Point2D(1, 2),
                     new Point2D(5, 6)
                 }));
-                var failureMechanismContext = new NumericFailureMechanismContext(failureMechanism, assessmentSection);
+                var failureMechanismContext = new FailureMechanismContext<IFailureMechanism>(failureMechanism, assessmentSection);
 
                 // Call
                 object[] children = info.ChildNodeObjects(failureMechanismContext).ToArray();
@@ -279,7 +278,7 @@
             {
                 var failureMechanism = new TestFailureMechanism("A", "C");
                 var assessmentSection = mocks.Stub<IAssessmentSection>();
-                var context = new NumericFailureMechanismContext(failureMechanism, assessmentSection);
+                var context = new FailureMechanismContext<IFailureMechanism>(failureMechanism, assessmentSection);
 
                 var gui = mocks.StrictMock<IGui>();
                 var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
@@ -326,7 +325,7 @@
                     IsRelevant = false
                 };
                 var assessmentSection = mocks.Stub<IAssessmentSection>();
-                var context = new NumericFailureMechanismContext(failureMechanism, assessmentSection);
+                var context = new FailureMechanismContext<IFailureMechanism>(failureMechanism, assessmentSection);
 
                 var gui = mocks.StrictMock<IGui>();
                 var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
@@ -365,7 +364,7 @@
             {
                 var assessmentSection = mocks.Stub<IAssessmentSection>();
                 var failureMechanism = new TestFailureMechanism("A", "C");
-                var context = new NumericFailureMechanismContext(failureMechanism, assessmentSection);
+                var context = new FailureMechanismContext<IFailureMechanism>(failureMechanism, assessmentSection);
 
                 var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
@@ -410,7 +409,7 @@
             failureMechanism.Attach(failureMechanismObserver);
 
             var assessmentSection = mocks.Stub<IAssessmentSection>();
-            var failureMechanismContext = new NumericFailureMechanismContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new FailureMechanismContext<IFailureMechanism>(failureMechanism, assessmentSection);
 
             var viewCommands = mocks.StrictMock<IViewCommands>();
             viewCommands.Expect(vs => vs.RemoveAllViewsForItem(failureMechanismContext));
@@ -457,7 +456,7 @@
             failureMechanism.Attach(failureMechanismObserver);
 
             var assessmentSection = mocks.Stub<IAssessmentSection>();
-            var failureMechanismContext = new NumericFailureMechanismContext(failureMechanism, assessmentSection);
+            var failureMechanismContext = new FailureMechanismContext<IFailureMechanism>(failureMechanism, assessmentSection);
 
             var treeViewControl = mocks.StrictMock<TreeViewControl>();
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();