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();