Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc9396d0af18873fda14c7e486decbfca7d4e8b21 -ra1ec5faebf7ccf8e67fa34a2b73cd1063ab48840
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs	(.../FailureMechanismContextTreeNodeInfoTest.cs)	(revision c9396d0af18873fda14c7e486decbfca7d4e8b21)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs	(.../FailureMechanismContextTreeNodeInfoTest.cs)	(revision a1ec5faebf7ccf8e67fa34a2b73cd1063ab48840)
@@ -64,7 +64,7 @@
             // Setup
             mocks.ReplayAll();
 
-            using (var plugin = new RingtoetsGuiPlugin())
+            using (var plugin = new RingtoetsPlugin())
             {
                 var info = GetInfo(plugin);
 
@@ -96,7 +96,7 @@
             var failureMechanism = new TestFailureMechanism("name", "code");
             var failureMechanismContext = new FailureMechanismContext<IFailureMechanism>(failureMechanism, assessmentSection);
 
-            using (var plugin = new RingtoetsGuiPlugin())
+            using (var plugin = new RingtoetsPlugin())
             {
                 var info = GetInfo(plugin);
 
@@ -115,7 +115,7 @@
             // Setup
             mocks.ReplayAll();
 
-            using (var plugin = new RingtoetsGuiPlugin())
+            using (var plugin = new RingtoetsPlugin())
             {
                 var info = GetInfo(plugin);
 
@@ -132,7 +132,7 @@
         public void ForeColor_Always_ReturnsControlText()
         {
             // Setup
-            using (var plugin = new RingtoetsGuiPlugin())
+            using (var plugin = new RingtoetsPlugin())
             {
                 var info = GetInfo(plugin);
                 var assessmentSection = mocks.Stub<IAssessmentSection>();
@@ -157,7 +157,7 @@
             // Setup
             var assessmentSection = mocks.Stub<IAssessmentSection>();
 
-            using (var plugin = new RingtoetsGuiPlugin())
+            using (var plugin = new RingtoetsPlugin())
             {
                 var info = GetInfo(plugin);
 
@@ -230,44 +230,14 @@
             genericMethod.Invoke(this, null);
         }
 
-        /* Used in ChildNodeObjects_FailureMechanismIsRelevantWithDifferentFailureMechanismSectionResults_OutputNodeAdded(Type) */
-        public void ChildNodeObjects_FailureMechanismIsRelevantWithSectionResults_OutputNodeAdded<T>() where T : FailureMechanismSectionResult
-        {
-             // Setup
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-
-            using (var plugin = new RingtoetsGuiPlugin())
-            {
-                var info = GetInfo(plugin);
-
-                var failureMechanism = mocks.StrictMultiMock<IHasSectionResults<T>>(typeof(IFailureMechanism));
-                failureMechanism.Expect(fm => ((IFailureMechanism) fm).IsRelevant).Return(true);
-                failureMechanism.Expect(fm => fm.SectionResults).Return(new List<T>()).Repeat.Any();
-                var failureMechanismContext = mocks.Stub<FailureMechanismContext<IFailureMechanism>>(failureMechanism, assessmentSection);
-
-                mocks.ReplayAll();
-
-                // Call
-                object[] children = info.ChildNodeObjects(failureMechanismContext).ToArray();
-
-                // Assert
-                var outputFolder = (CategoryTreeFolder)children[1];
-
-                var failureMechanismResultsContext = (FailureMechanismSectionResultContext<T>)outputFolder.Contents[0];
-                Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
-                Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
-            }
-            mocks.VerifyAll();
-        }
-
         [Test]
         public void ChildNodeObjects_FailureMechanismIsNotRelevant_ReturnOnlyFailureMechanismComments()
         {
             // Setup
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            using (var plugin = new RingtoetsGuiPlugin())
+            using (var plugin = new RingtoetsPlugin())
             {
                 var info = GetInfo(plugin);
 
@@ -323,7 +293,7 @@
 
                 mocks.ReplayAll();
 
-                using (var plugin = new RingtoetsGuiPlugin())
+                using (var plugin = new RingtoetsPlugin())
                 {
                     var info = GetInfo(plugin);
 
@@ -365,7 +335,7 @@
 
                 mocks.ReplayAll();
 
-                using (var plugin = new RingtoetsGuiPlugin())
+                using (var plugin = new RingtoetsPlugin())
                 {
                     var info = GetInfo(plugin);
 
@@ -398,7 +368,7 @@
 
                 mocks.ReplayAll();
 
-                using (var plugin = new RingtoetsGuiPlugin())
+                using (var plugin = new RingtoetsPlugin())
                 {
                     plugin.Gui = gui;
 
@@ -449,11 +419,11 @@
 
                 mocks.ReplayAll();
 
-                using (var guiPlugin = new RingtoetsGuiPlugin())
+                using (var plugin = new RingtoetsPlugin())
                 {
-                    guiPlugin.Gui = gui;
+                    plugin.Gui = gui;
 
-                    var info = GetInfo(guiPlugin);
+                    var info = GetInfo(plugin);
 
                     var contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl);
 
@@ -495,11 +465,11 @@
 
                 mocks.ReplayAll();
 
-                using (var guiPlugin = new RingtoetsGuiPlugin())
+                using (var plugin = new RingtoetsPlugin())
                 {
-                    guiPlugin.Gui = gui;
+                    plugin.Gui = gui;
 
-                    var info = GetInfo(guiPlugin);
+                    var info = GetInfo(plugin);
 
                     var contextMenu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl);
 
@@ -513,12 +483,42 @@
             mocks.VerifyAll();
         }
 
+        /* Used in ChildNodeObjects_FailureMechanismIsRelevantWithDifferentFailureMechanismSectionResults_OutputNodeAdded(Type) */
+
+        public void ChildNodeObjects_FailureMechanismIsRelevantWithSectionResults_OutputNodeAdded<T>() where T : FailureMechanismSectionResult
+        {
+            // Setup
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+
+            using (var plugin = new RingtoetsPlugin())
+            {
+                var info = GetInfo(plugin);
+
+                var failureMechanism = mocks.StrictMultiMock<IHasSectionResults<T>>(typeof(IFailureMechanism));
+                failureMechanism.Expect(fm => ((IFailureMechanism) fm).IsRelevant).Return(true);
+                failureMechanism.Expect(fm => fm.SectionResults).Return(new List<T>()).Repeat.Any();
+                var failureMechanismContext = mocks.Stub<FailureMechanismContext<IFailureMechanism>>(failureMechanism, assessmentSection);
+
+                mocks.ReplayAll();
+
+                // Call
+                object[] children = info.ChildNodeObjects(failureMechanismContext).ToArray();
+
+                // Assert
+                var outputFolder = (CategoryTreeFolder) children[1];
+
+                var failureMechanismResultsContext = (FailureMechanismSectionResultContext<T>) outputFolder.Contents[0];
+                Assert.AreSame(failureMechanism, failureMechanismResultsContext.FailureMechanism);
+                Assert.AreSame(failureMechanism.SectionResults, failureMechanismResultsContext.WrappedData);
+            }
+            mocks.VerifyAll();
+        }
+
         private const int contextMenuRelevancyIndex = 0;
 
-        private TreeNodeInfo GetInfo(RingtoetsGuiPlugin guiPlugin)
+        private TreeNodeInfo GetInfo(RingtoetsPlugin plugin)
         {
-            return guiPlugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(FailureMechanismContext<IFailureMechanism>));
+            return plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(FailureMechanismContext<IFailureMechanism>));
         }
     }
-
 }
\ No newline at end of file