Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs
===================================================================
diff -u -r63fbdd5525927fbf9d63925eef9da8e17a0d7b44 -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision 63fbdd5525927fbf9d63925eef9da8e17a0d7b44)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -134,7 +134,6 @@
             // Setup
             var guiMock = mocks.StrictMock<IGui>();
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
 
             var nodeData = new HydraulicBoundaryDatabaseContext(assessmentSectionMock);
@@ -149,21 +148,24 @@
             menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.Build()).Return(null);
-
-            guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(menuBuilderMock);
             guiMock.Stub(g => g.ProjectOpened += null).IgnoreArguments();
             guiMock.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
 
-            mocks.ReplayAll();
-
-            using (var plugin = new RingtoetsGuiPlugin())
+            using (var treeViewControl = new TreeViewControl())
             {
-                var info = GetInfo(plugin);
+                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilderMock);
 
-                plugin.Gui = guiMock;
+                mocks.ReplayAll();
 
-                // Call
-                info.ContextMenuStrip(nodeData, null, treeViewControlMock);
+                using (var plugin = new RingtoetsGuiPlugin())
+                {
+                    var info = GetInfo(plugin);
+
+                    plugin.Gui = guiMock;
+
+                    // Call
+                    info.ContextMenuStrip(nodeData, null, treeViewControl);
+                }
             }
             // Assert
             mocks.VerifyAll();
@@ -174,29 +176,31 @@
         {
             // Setup
             var guiMock = mocks.StrictMock<IGui>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
 
             var nodeData = new HydraulicBoundaryDatabaseContext(assessmentSectionMock);
-
-            guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder());
+            
             guiMock.Stub(g => g.ProjectOpened += null).IgnoreArguments();
             guiMock.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
 
-            mocks.ReplayAll();
-
-            using (var plugin = new RingtoetsGuiPlugin())
+            using (var treeViewControl = new TreeViewControl())
             {
-                var info = GetInfo(plugin);
+                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+                mocks.ReplayAll();
 
-                plugin.Gui = guiMock;
+                using (var plugin = new RingtoetsGuiPlugin())
+                {
+                    var info = GetInfo(plugin);
 
-                // Call
-                var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock);
+                    plugin.Gui = guiMock;
 
-                const string expectedItemText = "&Toetspeilen berekenen";
-                const string expectedItemTooltip = "Er is geen hydraulische randvoorwaarden database beschikbaar om de toetspeilen te berekenen.";
-                TestHelper.AssertContextMenuStripContainsItem(contextMenu, 3, expectedItemText, expectedItemTooltip, RingtoetsCommonFormsResources.FailureMechanismIcon, false);
+                    // Call
+                    var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
+
+                    const string expectedItemText = "&Toetspeilen berekenen";
+                    const string expectedItemTooltip = "Er is geen hydraulische randvoorwaarden database beschikbaar om de toetspeilen te berekenen.";
+                    TestHelper.AssertContextMenuStripContainsItem(contextMenu, 3, expectedItemText, expectedItemTooltip, RingtoetsCommonFormsResources.FailureMechanismIcon, false);
+                }
             }
             // Assert
             mocks.VerifyAll(); // Expect no calls on arguments
@@ -207,31 +211,32 @@
         {
             // Setup
             var guiMock = mocks.StrictMock<IGui>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
 
             var nodeData = new HydraulicBoundaryDatabaseContext(assessmentSectionMock);
             nodeData.WrappedData.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
-
-            guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder());
             guiMock.Stub(g => g.ProjectOpened += null).IgnoreArguments();
             guiMock.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
 
-            mocks.ReplayAll();
-
-            using (var plugin = new RingtoetsGuiPlugin())
+            using (var treeViewControl = new TreeViewControl())
             {
-                var info = GetInfo(plugin);
+                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+                mocks.ReplayAll();
 
-                plugin.Gui = guiMock;
+                using (var plugin = new RingtoetsGuiPlugin())
+                {
+                    var info = GetInfo(plugin);
 
-                // Call
-                nodeData.WrappedData.HydraulicBoundaryDatabase.FilePath = testDataPath;
-                var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock);
+                    plugin.Gui = guiMock;
 
-                const string expectedItemText = "&Toetspeilen berekenen";
-                const string expectedItemTooltip = "Bereken de toetspeilen";
-                TestHelper.AssertContextMenuStripContainsItem(contextMenu, 3, expectedItemText, expectedItemTooltip, RingtoetsCommonFormsResources.FailureMechanismIcon);
+                    // Call
+                    nodeData.WrappedData.HydraulicBoundaryDatabase.FilePath = testDataPath;
+                    var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
+
+                    const string expectedItemText = "&Toetspeilen berekenen";
+                    const string expectedItemTooltip = "Bereken de toetspeilen";
+                    TestHelper.AssertContextMenuStripContainsItem(contextMenu, 3, expectedItemText, expectedItemTooltip, RingtoetsCommonFormsResources.FailureMechanismIcon);
+                }
             }
             // Assert
             mocks.VerifyAll(); // Expect no calls on arguments
@@ -243,8 +248,6 @@
             // Given
             var gui = mocks.DynamicMock<IGui>();
 
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
-
             var contextMenuRunAssessmentLevelCalculationsIndex = 3;
 
             var hydraulicBoundaryLocation1 = new HydraulicBoundaryLocation(100001, "", 1.1, 2.2);
@@ -270,27 +273,30 @@
             };
             var hydraulicBoundaryDatabaseContext = new HydraulicBoundaryDatabaseContext(assessmentSectionMock);
 
-            gui.Expect(cmp => cmp.Get(hydraulicBoundaryDatabaseContext, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder());
+            using (var treeViewControl = new TreeViewControl())
+            {
+                gui.Expect(cmp => cmp.Get(hydraulicBoundaryDatabaseContext, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            using (var plugin = new RingtoetsGuiPlugin())
-            {
-                var info = GetInfo(plugin);
-                plugin.Gui = gui;
+                using (var plugin = new RingtoetsGuiPlugin())
+                {
+                    var info = GetInfo(plugin);
+                    plugin.Gui = gui;
 
-                var contextMenuAdapter = info.ContextMenuStrip(hydraulicBoundaryDatabaseContext, null, treeViewControlMock);
+                    var contextMenuAdapter = info.ContextMenuStrip(hydraulicBoundaryDatabaseContext, null, treeViewControl);
 
-                // When
-                Action action = () => { contextMenuAdapter.Items[contextMenuRunAssessmentLevelCalculationsIndex].PerformClick(); };
+                    // When
+                    Action action = () => { contextMenuAdapter.Items[contextMenuRunAssessmentLevelCalculationsIndex].PerformClick(); };
 
-                // Then
-                string message = string.Format("Berekeningen konden niet worden gestart. Fout bij het lezen van bestand '{0}': Het bestand bestaat niet.",
-                                               hydraulicBoundaryDatabase.FilePath);
-                TestHelper.AssertLogMessageWithLevelIsGenerated(action, new Tuple<string, LogLevelConstant>(message, LogLevelConstant.Error));
+                    // Then
+                    string message = string.Format("Berekeningen konden niet worden gestart. Fout bij het lezen van bestand '{0}': Het bestand bestaat niet.",
+                                                   hydraulicBoundaryDatabase.FilePath);
+                    TestHelper.AssertLogMessageWithLevelIsGenerated(action, new Tuple<string, LogLevelConstant>(message, LogLevelConstant.Error));
 
-                Assert.IsNaN(hydraulicBoundaryLocation1.DesignWaterLevel); // No result set
-                Assert.AreEqual(4.2, hydraulicBoundaryLocation2.DesignWaterLevel); // Previous result not cleared
+                    Assert.IsNaN(hydraulicBoundaryLocation1.DesignWaterLevel); // No result set
+                    Assert.AreEqual(4.2, hydraulicBoundaryLocation2.DesignWaterLevel); // Previous result not cleared
+                }
             }
             mocks.VerifyAll();
         }