Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs
===================================================================
diff -u -r41fac7fff0a505c08945108d795dcb877f10b816 -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs	(.../ContextMenuBuilderTest.cs)	(revision 41fac7fff0a505c08945108d795dcb877f10b816)
+++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs	(.../ContextMenuBuilderTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -47,16 +47,17 @@
             // Setup
             var importExportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             mocks.ReplayAll();
 
-            // Call
-            TestDelegate test = () => new ContextMenuBuilder(null, importExportHandlerMock, viewCommandsMock, new object(), treeViewControlMock);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                // Call
+                TestDelegate test = () => new ContextMenuBuilder(null, importExportHandlerMock, viewCommandsMock, new object(), treeViewControl);
 
-            // Assert
-            var message = Assert.Throws<ContextMenuBuilderException>(test).Message;
-            Assert.AreEqual(Resources.ContextMenuBuilder_ContextMenuBuilder_Cannot_create_instances_of_factories, message);
-
+                // Assert
+                var message = Assert.Throws<ContextMenuBuilderException>(test).Message;
+                Assert.AreEqual(Resources.ContextMenuBuilder_ContextMenuBuilder_Cannot_create_instances_of_factories, message);
+            }
             mocks.VerifyAll();
         }
 
@@ -66,16 +67,17 @@
             // Setup
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             mocks.ReplayAll();
 
-            // Call
-            TestDelegate test = () => new ContextMenuBuilder(applicationFeatureCommandsMock, null, viewCommandsMock, new object(), treeViewControlMock);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                // Call
+                TestDelegate test = () => new ContextMenuBuilder(applicationFeatureCommandsMock, null, viewCommandsMock, new object(), treeViewControl);
 
-            // Assert
-            var message = Assert.Throws<ContextMenuBuilderException>(test).Message;
-            Assert.AreEqual(Resources.ContextMenuBuilder_ContextMenuBuilder_Cannot_create_instances_of_factories, message);
-
+                // Assert
+                var message = Assert.Throws<ContextMenuBuilderException>(test).Message;
+                Assert.AreEqual(Resources.ContextMenuBuilder_ContextMenuBuilder_Cannot_create_instances_of_factories, message);
+            }
             mocks.VerifyAll();
         }
 
@@ -85,16 +87,17 @@
             // Setup
             var applicationFeatureCommandsMockMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             mocks.ReplayAll();
 
-            // Call
-            TestDelegate test = () => new ContextMenuBuilder(applicationFeatureCommandsMockMock, exportImportHandlerMock, null, new object(), treeViewControlMock);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                // Call
+                TestDelegate test = () => new ContextMenuBuilder(applicationFeatureCommandsMockMock, exportImportHandlerMock, null, new object(), treeViewControl);
 
-            // Assert
-            var message = Assert.Throws<ContextMenuBuilderException>(test).Message;
-            Assert.AreEqual(Resources.ContextMenuBuilder_ContextMenuBuilder_Cannot_create_instances_of_factories, message);
-
+                // Assert
+                var message = Assert.Throws<ContextMenuBuilderException>(test).Message;
+                Assert.AreEqual(Resources.ContextMenuBuilder_ContextMenuBuilder_Cannot_create_instances_of_factories, message);
+            }
             mocks.VerifyAll();
         }
 
@@ -105,14 +108,18 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var importExportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
+            mocks.ReplayAll();
 
-            // Call
-            TestDelegate test = () => new ContextMenuBuilder(applicationFeatureCommandsMock, importExportHandlerMock, viewCommandsMock, null, treeViewControlMock);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                // Call
+                TestDelegate test = () => new ContextMenuBuilder(applicationFeatureCommandsMock, importExportHandlerMock, viewCommandsMock, null, treeViewControl);
 
-            // Assert
-            var message = Assert.Throws<ContextMenuBuilderException>(test).Message;
-            Assert.AreEqual(Resources.ContextMenuBuilder_ContextMenuBuilder_Cannot_create_instances_of_factories, message);
+                // Assert
+                var message = Assert.Throws<ContextMenuBuilderException>(test).Message;
+                Assert.AreEqual(Resources.ContextMenuBuilder_ContextMenuBuilder_Cannot_create_instances_of_factories, message);
+            }
+            mocks.VerifyAll();
         }
 
         [Test]
@@ -138,15 +145,16 @@
             var applicationFeatureCommandsMockMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             mocks.ReplayAll();
 
-            // Call
-            TestDelegate test = () => new ContextMenuBuilder(applicationFeatureCommandsMockMock, exportImportHandlerMock, viewCommandsMock, new object(), treeViewControlMock);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                // Call
+                TestDelegate test = () => new ContextMenuBuilder(applicationFeatureCommandsMockMock, exportImportHandlerMock, viewCommandsMock, new object(), treeViewControl);
 
-            // Assert
-            Assert.DoesNotThrow(test);
-
+                // Assert
+                Assert.DoesNotThrow(test);
+            }
             mocks.VerifyAll();
         }
 
@@ -157,18 +165,19 @@
             var applicationFeatureCommandsMockMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             mocks.ReplayAll();
 
-            var builder = new ContextMenuBuilder(applicationFeatureCommandsMockMock, exportImportHandlerMock, viewCommandsMock, new object(), treeViewControlMock);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var builder = new ContextMenuBuilder(applicationFeatureCommandsMockMock, exportImportHandlerMock, viewCommandsMock, new object(), treeViewControl);
 
-            // Call
-            var result = builder.Build();
+                // Call
+                var result = builder.Build();
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            CollectionAssert.IsEmpty(result.Items);
-
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                CollectionAssert.IsEmpty(result.Items);
+            }
             mocks.VerifyAll();
         }
 
@@ -311,24 +320,25 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
+            
             var nodeData = new object();
-
             viewCommandsMock.Expect(ch => ch.CanOpenViewFor(nodeData)).Return(hasViewForNodeData);
 
             mocks.ReplayAll();
 
-            var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, nodeData, treeViewControlMock);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, nodeData, treeViewControl);
 
-            // Call
-            var result = builder.AddOpenItem().Build();
+                // Call
+                var result = builder.AddOpenItem().Build();
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
 
-            TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.Open, Resources.Open_ToolTip, Resources.OpenIcon, hasViewForNodeData);
-
+                TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.Open, Resources.Open_ToolTip, Resources.OpenIcon, hasViewForNodeData);
+            }
             mocks.VerifyAll();
         } 
 
@@ -341,23 +351,26 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
+
             var nodeData = new object();
             exportImportHandlerMock.Expect(ch => ch.CanExportFrom(nodeData)).Return(hasExportersForNodeData);
 
             mocks.ReplayAll();
 
-            var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, nodeData, treeViewControlMock);
+            using (var treeViewControl = new TreeViewControl())
+            {
 
-            // Call
-            var result = builder.AddExportItem().Build();
+                var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, nodeData, treeViewControl);
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
+                // Call
+                var result = builder.AddExportItem().Build();
 
-            TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.Export, Resources.Export_ToolTip, Resources.ExportIcon, hasExportersForNodeData);
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
 
+                TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.Export, Resources.Export_ToolTip, Resources.ExportIcon, hasExportersForNodeData);
+            }
             mocks.VerifyAll();
         } 
 
@@ -370,23 +383,26 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
+
             var nodeData = new object();
             exportImportHandlerMock.Expect(ch => ch.CanImportOn(nodeData)).Return(hasImportersForNodeData);
 
             mocks.ReplayAll();
 
-            var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, nodeData, treeViewControlMock);
+            using (var treeViewControl = new TreeViewControl())
+            {
 
-            // Call
-            var result = builder.AddImportItem().Build();
+                var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, nodeData, treeViewControl);
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
+                // Call
+                var result = builder.AddImportItem().Build();
 
-            TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.Import, Resources.Import_ToolTip, Resources.ImportIcon, hasImportersForNodeData);
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
 
+                TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.Import, Resources.Import_ToolTip, Resources.ImportIcon, hasImportersForNodeData);
+            }
             mocks.VerifyAll();
         } 
 
@@ -399,24 +415,26 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
-            var nodeData = new object();
 
+            var nodeData = new object();
             applicationFeatureCommandsMock.Expect(ch => ch.CanShowPropertiesFor(nodeData)).Return(hasPropertiesForNodeData);
 
             mocks.ReplayAll();
 
-            var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, nodeData, treeViewControlMock);
-            
-            // Call
-            var result = builder.AddPropertiesItem().Build();
+            using (var treeViewControl = new TreeViewControl())
+            {
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
+                var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, nodeData, treeViewControl);
 
-            TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.Properties, Resources.Properties_ToolTip, Resources.PropertiesHS, hasPropertiesForNodeData);
+                // Call
+                var result = builder.AddPropertiesItem().Build();
 
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
+
+                TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.Properties, Resources.Properties_ToolTip, Resources.PropertiesHS, hasPropertiesForNodeData);
+            }
             mocks.VerifyAll();
         }
 
@@ -427,21 +445,22 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             mocks.ReplayAll();
 
-            var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, new object(), treeViewControlMock);
-            var item = new StrictContextMenuItem(null,null,null,null);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, new object(), treeViewControl);
+                var item = new StrictContextMenuItem(null, null, null, null);
 
-            // Call
-            var result = builder.AddCustomItem(item).Build();
+                // Call
+                var result = builder.AddCustomItem(item).Build();
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
-            
-            Assert.AreSame(item, result.Items[0]);
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
 
+                Assert.AreSame(item, result.Items[0]);
+            }
             mocks.VerifyAll();
         }
 
@@ -452,18 +471,19 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             mocks.ReplayAll();
 
-            var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, new object(), treeViewControlMock);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, new object(), treeViewControl);
 
-            // Call
-            var result = builder.AddSeparator().Build();
+                // Call
+                var result = builder.AddSeparator().Build();
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.IsEmpty(result.Items);
-
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.IsEmpty(result.Items);
+            }
             mocks.VerifyAll();
         }
 
@@ -476,26 +496,27 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             mocks.ReplayAll();
 
-            var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, new object(), treeViewControlMock);
-
-            var someItem = new StrictContextMenuItem(null, null, null, null);
-
-            // Call
-            for (int i = 0; i < count; i++)
+            using (var treeViewControl = new TreeViewControl())
             {
-                builder.AddSeparator();
-            }
-            var result = builder.AddCustomItem(someItem).Build();
+                var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, new object(), treeViewControl);
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
+                var someItem = new StrictContextMenuItem(null, null, null, null);
 
-            Assert.IsInstanceOf<ToolStripMenuItem>(result.Items[0]);
+                // Call
+                for (int i = 0; i < count; i++)
+                {
+                    builder.AddSeparator();
+                }
+                var result = builder.AddCustomItem(someItem).Build();
 
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
+
+                Assert.IsInstanceOf<ToolStripMenuItem>(result.Items[0]);
+            }
             mocks.VerifyAll();
         }
 
@@ -508,30 +529,31 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             mocks.ReplayAll();
 
-            var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, new object(), treeViewControlMock);
-
-            var someItem = new StrictContextMenuItem(null, null, null, null);
-            var someOtherItem = new StrictContextMenuItem(null, null, null, null);
-            
-            builder.AddCustomItem(someItem);
-            
-            // Call
-            for (int i = 0; i < count; i++)
+            using (var treeViewControl = new TreeViewControl())
             {
-                builder.AddSeparator();
-            }
-            var result = builder.AddCustomItem(someOtherItem).Build();
+                var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, new object(), treeViewControl);
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(3, result.Items.Count);
+                var someItem = new StrictContextMenuItem(null, null, null, null);
+                var someOtherItem = new StrictContextMenuItem(null, null, null, null);
 
-            Assert.IsInstanceOf<ToolStripSeparator>(result.Items[1]);
-            Assert.IsInstanceOf<ToolStripMenuItem>(result.Items[2]);
+                builder.AddCustomItem(someItem);
 
+                // Call
+                for (int i = 0; i < count; i++)
+                {
+                    builder.AddSeparator();
+                }
+                var result = builder.AddCustomItem(someOtherItem).Build();
+
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(3, result.Items.Count);
+
+                Assert.IsInstanceOf<ToolStripSeparator>(result.Items[1]);
+                Assert.IsInstanceOf<ToolStripMenuItem>(result.Items[2]);
+            }
             mocks.VerifyAll();
         }
 
@@ -544,24 +566,25 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             mocks.ReplayAll();
 
-            var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, new object(), treeViewControlMock);
-
-            builder.AddCustomItem(new StrictContextMenuItem(null, null, null, null));
-
-            // Call
-            for (int i = 0; i < count; i++)
+            using (var treeViewControl = new TreeViewControl())
             {
-                builder.AddSeparator();
-            }
-            var result = builder.Build();
+                var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, new object(), treeViewControl);
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
+                builder.AddCustomItem(new StrictContextMenuItem(null, null, null, null));
 
+                // Call
+                for (int i = 0; i < count; i++)
+                {
+                    builder.AddSeparator();
+                }
+                var result = builder.Build();
+
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
+            }
             mocks.VerifyAll();
         }
     }
Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs
===================================================================
diff -u -ref1c61d94f2aec3b4ff32fcf03253d7ad386c8e5 -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs	(.../TreeViewContextMenuItemFactoryTest.cs)	(revision ef1c61d94f2aec3b4ff32fcf03253d7ad386c8e5)
+++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs	(.../TreeViewContextMenuItemFactoryTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -24,15 +24,16 @@
         public void Constructor_WithoutDataObject_ThrowsArgumentNullException()
         {
             // Setup
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                // Call
+                TestDelegate test = () => new TreeViewContextMenuItemFactory(null, treeViewControl);
 
-            // Call
-            TestDelegate test = () => new TreeViewContextMenuItemFactory(null, treeViewControlMock);
-
-            // Assert
-            var message = Assert.Throws<ArgumentNullException>(test).Message;
-            StringAssert.StartsWith(Resources.ContextMenuItemFactory_Can_not_create_context_menu_items_without_data, message);
-            StringAssert.EndsWith("dataObject", message);
+                // Assert
+                var message = Assert.Throws<ArgumentNullException>(test).Message;
+                StringAssert.StartsWith(Resources.ContextMenuItemFactory_Can_not_create_context_menu_items_without_data, message);
+                StringAssert.EndsWith("dataObject", message);
+            }
         }
 
         [Test]
@@ -51,16 +52,16 @@
         public void Constructor_WithAllInput_DoesNotThrow()
         {
             // Setup
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                mocks.ReplayAll();
 
-            mocks.ReplayAll();
+                // Call
+                TestDelegate test = () => new TreeViewContextMenuItemFactory(new object(), treeViewControl);
 
-            // Call
-            TestDelegate test = () => new TreeViewContextMenuItemFactory(new object(), treeViewControlMock);
-
-            // Assert
-            Assert.DoesNotThrow(test);
-
+                // Assert
+                Assert.DoesNotThrow(test);
+            }
             mocks.VerifyAll();
         }
 
Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs
===================================================================
diff -u -recef7aa46cb8fb7d138a5cc00a35f9e7aa7676b6 -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs	(.../MapDataCollectionTreeNodeInfoTest.cs)	(revision ecef7aa46cb8fb7d138a5cc00a35f9e7aa7676b6)
+++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Legend/MapDataCollectionTreeNodeInfoTest.cs	(.../MapDataCollectionTreeNodeInfoTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -199,23 +199,21 @@
                 mapData1,
                 mapData2,
                 mapData3
-            }, "test data");
+            }, "test data");observer.Expect(o => o.UpdateObserver());
 
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
-
-            observer.Expect(o => o.UpdateObserver());
-
             mocks.ReplayAll();
+            
+            using (var treeViewControl = new TreeViewControl())
+            {
+                mapDataCollection.Attach(observer);
 
-            mapDataCollection.Attach(observer);
+                // Call
+                info.OnDrop(mapData1, mapDataCollection, mapDataCollection, position, treeViewControl);
 
-            // Call
-            info.OnDrop(mapData1, mapDataCollection, mapDataCollection, position, treeViewControlMock);
-
-            // Assert
-            var reversedIndex = 2 - position;
-            Assert.AreSame(mapData1, mapDataCollection.List.ElementAt(reversedIndex));
-
+                // Assert
+                var reversedIndex = 2 - position;
+                Assert.AreSame(mapData1, mapDataCollection.List.ElementAt(reversedIndex));
+            }
             mocks.VerifyAll(); // UpdateObserver should be called
         }
 
@@ -239,17 +237,16 @@
             }, "test data");
 
             mapDataCollection.Attach(observer);
-
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
-
             mocks.ReplayAll();
 
-            // Call
-            TestDelegate test = () => info.OnDrop(mapData1, mapDataCollection, mapDataCollection, position, treeViewControlMock);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                // Call
+                TestDelegate test = () => info.OnDrop(mapData1, mapDataCollection, mapDataCollection, position, treeViewControl);
 
-            // Assert
-            Assert.Throws<ArgumentOutOfRangeException>(test);
-
+                // Assert
+                Assert.Throws<ArgumentOutOfRangeException>(test);
+            }
             mocks.VerifyAll(); // UpdateObserver should not be called
         }
 
@@ -258,20 +255,20 @@
         {
             // Setup
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
-
             var mapDataCollection = mocks.StrictMock<MapDataCollection>(Enumerable.Empty<MapData>(), "test data");
 
             menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.Build()).Return(null);
 
-            contextMenuBuilderProvider.Expect(cmbp => cmbp.Get(mapDataCollection, treeViewControlMock)).Return(menuBuilderMock);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                contextMenuBuilderProvider.Expect(cmbp => cmbp.Get(mapDataCollection, treeViewControl)).Return(menuBuilderMock);
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            // Call
-            info.ContextMenuStrip(mapDataCollection, null, treeViewControlMock);
-
+                // Call
+                info.ContextMenuStrip(mapDataCollection, null, treeViewControl);
+            }
             // Assert
             mocks.VerifyAll();
         }
@@ -282,18 +279,19 @@
             // Setup
             const string expectedItemText = "&Voeg kaartlaag toe...";
             const string expectedItemTooltip = "Importeer een nieuwe kaartlaag en voeg deze toe.";
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var mapDataCollection = mocks.StrictMock<MapDataCollection>(Enumerable.Empty<MapData>(), "test data");
 
-            contextMenuBuilderProvider.Expect(cmbp => cmbp.Get(mapDataCollection, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder());
+            using (var treeViewControl = new TreeViewControl())
+            {
+                contextMenuBuilderProvider.Expect(cmbp => cmbp.Get(mapDataCollection, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+                mocks.ReplayAll();
 
-            mocks.ReplayAll();
+                // Call
+                var contextMenu = info.ContextMenuStrip(mapDataCollection, null, treeViewControl);
 
-            // Call
-            var contextMenu = info.ContextMenuStrip(mapDataCollection, null, treeViewControlMock);
-
-            // Assert
-            TestHelper.AssertContextMenuStripContainsItem(contextMenu, 0, expectedItemText, expectedItemTooltip, DotSpatialResources.MapIcon);
+                // Assert
+                TestHelper.AssertContextMenuStripContainsItem(contextMenu, 0, expectedItemText, expectedItemTooltip, DotSpatialResources.MapIcon);
+            }
             mocks.VerifyAll();
         }
     }
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartDataCollectionTreeNodeInfoTest.cs
===================================================================
diff -u -r170ec8698dfed095e23f4fa822fe2198b3e5f242 -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartDataCollectionTreeNodeInfoTest.cs	(.../ChartDataCollectionTreeNodeInfoTest.cs)	(revision 170ec8698dfed095e23f4fa822fe2198b3e5f242)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartDataCollectionTreeNodeInfoTest.cs	(.../ChartDataCollectionTreeNodeInfoTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -204,21 +204,21 @@
                 chartData3
             }, "test data");
 
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
             observer.Expect(o => o.UpdateObserver());
-
             mocks.ReplayAll();
 
             chartDataCollection.Attach(observer);
 
-            // Call
-            info.OnDrop(chartData1, chartDataCollection, chartDataCollection, position, treeViewControlMock);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                // Call
+                info.OnDrop(chartData1, chartDataCollection, chartDataCollection, position, treeViewControl);
 
-            // Assert
-            var reversedIndex = 2 - position;
-            Assert.AreSame(chartData1, chartDataCollection.List.ElementAt(reversedIndex));
-
+                // Assert
+                var reversedIndex = 2 - position;
+                Assert.AreSame(chartData1, chartDataCollection.List.ElementAt(reversedIndex));
+            }
             mocks.VerifyAll(); // UpdateObserver should be called
         }
 
@@ -242,17 +242,16 @@
             }, "test data");
 
             chartDataCollection.Attach(observer);
-
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
-
             mocks.ReplayAll();
 
-            // Call
-            TestDelegate test = () => info.OnDrop(chartData1, chartDataCollection, chartDataCollection, position, treeViewControlMock);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                // Call
+                TestDelegate test = () => info.OnDrop(chartData1, chartDataCollection, chartDataCollection, position, treeViewControl);
 
-            // Assert
-            Assert.Throws<ArgumentOutOfRangeException>(test);
-
+                // Assert
+                Assert.Throws<ArgumentOutOfRangeException>(test);
+            }
             mocks.VerifyAll(); // UpdateObserver should be not called
         }
     }
Index: Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/TreeNodeInfos/ProjectTreeNodeInfoTest.cs
===================================================================
diff -u -rc96f5829ddb898717ba2e98091a2219308f05d3e -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/TreeNodeInfos/ProjectTreeNodeInfoTest.cs	(.../ProjectTreeNodeInfoTest.cs)	(revision c96f5829ddb898717ba2e98091a2219308f05d3e)
+++ Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/TreeNodeInfos/ProjectTreeNodeInfoTest.cs	(.../ProjectTreeNodeInfoTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -111,32 +111,33 @@
         {
             // Setup
             var gui = mocks.StrictMultiMock<IGui>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
 
-            gui.Expect(g => g.Get(null, treeViewControlMock)).Return(menuBuilderMock);
-            gui.Expect(g => g.ViewCommands).Return(viewCommandsMock);
-            gui.Expect(g => g.GetTreeNodeInfos()).Return(Enumerable.Empty<TreeNodeInfo>());
+            using (var treeViewControl = new TreeViewControl())
+            {
+                gui.Expect(g => g.Get(null, treeViewControl)).Return(menuBuilderMock);
+                gui.Expect(g => g.ViewCommands).Return(viewCommandsMock);
+                gui.Expect(g => g.GetTreeNodeInfos()).Return(Enumerable.Empty<TreeNodeInfo>());
 
-            menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddExpandAllItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.Build()).Return(null);
+                menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddExpandAllItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.Build()).Return(null);
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            plugin.Gui = gui;
+                plugin.Gui = gui;
 
-            // Call
-            info.ContextMenuStrip(null, null, treeViewControlMock);
-
+                // Call
+                info.ContextMenuStrip(null, null, treeViewControl);
+            }
             // Assert
             mocks.VerifyAll();
         }
@@ -148,28 +149,31 @@
             // Setup
             var project = new Project();
             var guiMock = mocks.StrictMock<IGui>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
             var projectCommandsMock = mocks.StrictMock<IProjectCommands>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
 
-            guiMock.Stub(g => g.Get(project, treeViewControlMock)).Return(menuBuilder);
             guiMock.Stub(g => g.ProjectCommands).Return(projectCommandsMock);
             guiMock.Stub(g => g.ViewCommands).Return(viewCommandsMock);
             guiMock.Stub(g => g.GetTreeNodeInfos()).Return(Enumerable.Empty<TreeNodeInfo>());
             projectCommandsMock.Expect(g => g.AddNewItem(project));
 
-            mocks.ReplayAll();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Stub(g => g.Get(project, treeViewControl)).Return(menuBuilder);
 
-            plugin.Gui = guiMock;
+                mocks.ReplayAll();
 
-            // Call
-            var result = info.ContextMenuStrip(project, null, treeViewControlMock);
+                plugin.Gui = guiMock;
 
-            result.Items[0].PerformClick();
+                // Call
+                var result = info.ContextMenuStrip(project, null, treeViewControl);
 
-            // Assert
-            TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.AddItem, Resources.AddItem_ToolTip, Resources.PlusIcon);
+                result.Items[0].PerformClick();
+
+                // Assert
+                TestHelper.AssertContextMenuStripContainsItem(result, 0, Resources.AddItem, Resources.AddItem_ToolTip, Resources.PlusIcon);
+            }
             mocks.VerifyAll();
         }
     }
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuBuilderTest.cs
===================================================================
diff -u -rd08c15413bbb6009c6da8ee05833a4c3531b358c -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuBuilderTest.cs	(.../RingtoetsContextMenuBuilderTest.cs)	(revision d08c15413bbb6009c6da8ee05833a4c3531b358c)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsContextMenuBuilderTest.cs	(.../RingtoetsContextMenuBuilderTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -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 System.Windows.Forms;
 using Core.Common.Base;
@@ -49,26 +50,27 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
             mocks.ReplayAll();
 
-            var calculationGroup = new CalculationGroup();
-            var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculationGroup, treeViewControlMock);
-            var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var calculationGroup = new CalculationGroup();
+                var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculationGroup, treeViewControl);
+                var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Call
-            var result = ringtoetsContextMenuBuilder.AddCreateCalculationGroupItem(calculationGroup).Build();
+                // Call
+                var result = ringtoetsContextMenuBuilder.AddCreateCalculationGroupItem(calculationGroup).Build();
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
 
-            TestHelper.AssertContextMenuStripContainsItem(result, 0,
-                                                          RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup,
-                                                          RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip,
-                                                          RingtoetsFormsResources.AddFolderIcon);
-
+                TestHelper.AssertContextMenuStripContainsItem(result, 0,
+                                                              RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup,
+                                                              RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip,
+                                                              RingtoetsFormsResources.AddFolderIcon);
+            }
             mocks.VerifyAll();
         }
 
@@ -80,28 +82,29 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var failureMechanismMock = mocks.StrictMock<IFailureMechanism>();
 
             mocks.ReplayAll();
 
-            var calculationGroup = new CalculationGroup();
-            var calculationGroupContext = new TestCalculationGroupContext(calculationGroup, failureMechanismMock);
-            var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculationGroup, treeViewControlMock);
-            var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var calculationGroup = new CalculationGroup();
+                var calculationGroupContext = new TestCalculationGroupContext(calculationGroup, failureMechanismMock);
+                var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculationGroup, treeViewControl);
+                var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Call
-            var result = ringtoetsContextMenuBuilder.AddCreateCalculationItem(calculationGroupContext, context => { }).Build();
+                // Call
+                var result = ringtoetsContextMenuBuilder.AddCreateCalculationItem(calculationGroupContext, context => { }).Build();
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
 
-            TestHelper.AssertContextMenuStripContainsItem(result, 0,
-                                                          RingtoetsFormsResources.CalculationGroup_Add_Calculation,
-                                                          RingtoetsFormsResources.CalculationGroup_Add_Calculation_Tooltip,
-                                                          RingtoetsFormsResources.FailureMechanismIcon);
-
+                TestHelper.AssertContextMenuStripContainsItem(result, 0,
+                                                              RingtoetsFormsResources.CalculationGroup_Add_Calculation,
+                                                              RingtoetsFormsResources.CalculationGroup_Add_Calculation_Tooltip,
+                                                              RingtoetsFormsResources.FailureMechanismIcon);
+            }
             mocks.VerifyAll();
         }
 
@@ -113,7 +116,6 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var calculationWithOutputMock = mocks.StrictMock<ICalculation>();
 
             calculationWithOutputMock.Expect(c => c.HasOutput).Return(true);
@@ -127,22 +129,23 @@
                     calculationWithOutputMock
                 }
             };
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculationGroup, treeViewControl);
+                var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculationGroup, treeViewControlMock);
-            var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
+                // Call
+                var result = ringtoetsContextMenuBuilder.AddClearAllCalculationOutputInGroupItem(calculationGroup).Build();
 
-            // Call
-            var result = ringtoetsContextMenuBuilder.AddClearAllCalculationOutputInGroupItem(calculationGroup).Build();
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
-
-            TestHelper.AssertContextMenuStripContainsItem(result, 0,
-                                                          RingtoetsFormsResources.Clear_all_output,
-                                                          RingtoetsFormsResources.CalculationGroup_ClearOutput_ToolTip,
-                                                          RingtoetsFormsResources.ClearIcon);
-
+                TestHelper.AssertContextMenuStripContainsItem(result, 0,
+                                                              RingtoetsFormsResources.Clear_all_output,
+                                                              RingtoetsFormsResources.CalculationGroup_ClearOutput_ToolTip,
+                                                              RingtoetsFormsResources.ClearIcon);
+            }
             mocks.VerifyAll();
         }
 
@@ -154,27 +157,29 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
             mocks.ReplayAll();
 
             var calculationGroup = new CalculationGroup();
-            var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculationGroup, treeViewControlMock);
-            var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Call
-            var result = ringtoetsContextMenuBuilder.AddClearAllCalculationOutputInGroupItem(calculationGroup).Build();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculationGroup, treeViewControl);
+                var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
+                // Call
+                var result = ringtoetsContextMenuBuilder.AddClearAllCalculationOutputInGroupItem(calculationGroup).Build();
 
-            TestHelper.AssertContextMenuStripContainsItem(result, 0,
-                                                          RingtoetsFormsResources.Clear_all_output,
-                                                          RingtoetsFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear,
-                                                          RingtoetsFormsResources.ClearIcon,
-                                                          false);
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
 
+                TestHelper.AssertContextMenuStripContainsItem(result, 0,
+                                                              RingtoetsFormsResources.Clear_all_output,
+                                                              RingtoetsFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear,
+                                                              RingtoetsFormsResources.ClearIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
@@ -186,7 +191,6 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var calculationWithOutputMock = mocks.StrictMock<ICalculation>();
             calculationWithOutputMock.Expect(c => c.HasOutput).Return(true);
             var failureMechanismMock = mocks.StrictMock<IFailureMechanism>();
@@ -196,21 +200,23 @@
             });
             mocks.ReplayAll();
 
-            var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, failureMechanismMock, treeViewControlMock);
-            var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, failureMechanismMock, treeViewControl);
+                var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Call
-            var result = ringtoetsContextMenuBuilder.AddClearAllCalculationOutputInFailureMechanismItem(failureMechanismMock).Build();
+                // Call
+                var result = ringtoetsContextMenuBuilder.AddClearAllCalculationOutputInFailureMechanismItem(failureMechanismMock).Build();
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
 
-            TestHelper.AssertContextMenuStripContainsItem(result, 0,
-                                                          RingtoetsFormsResources.Clear_all_output,
-                                                          RingtoetsFormsResources.Clear_all_output_ToolTip,
-                                                          RingtoetsFormsResources.ClearIcon);
-
+                TestHelper.AssertContextMenuStripContainsItem(result, 0,
+                                                              RingtoetsFormsResources.Clear_all_output,
+                                                              RingtoetsFormsResources.Clear_all_output_ToolTip,
+                                                              RingtoetsFormsResources.ClearIcon);
+            }
             mocks.VerifyAll();
         }
 
@@ -222,27 +228,29 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
-            var failureMechanismMock = mocks.StrictMock<IFailureMechanism>();
-            failureMechanismMock.Expect(fm => fm.Calculations).Return(Enumerable.Empty<ICalculation>());
+            var failureMechanismMock = mocks.Stub<IFailureMechanism>();
+            failureMechanismMock.Stub(fm => fm.Calculations).Return(new List<ICalculation>());
+
             mocks.ReplayAll();
 
-            var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, failureMechanismMock, treeViewControlMock);
-            var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, failureMechanismMock, treeViewControl);
+                var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Call
-            var result = ringtoetsContextMenuBuilder.AddClearAllCalculationOutputInFailureMechanismItem(failureMechanismMock).Build();
+                // Call
+                var result = ringtoetsContextMenuBuilder.AddClearAllCalculationOutputInFailureMechanismItem(failureMechanismMock).Build();
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
 
-            TestHelper.AssertContextMenuStripContainsItem(result, 0,
-                                                          RingtoetsFormsResources.Clear_all_output,
-                                                          RingtoetsFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear,
-                                                          RingtoetsFormsResources.ClearIcon,
-                                                          false);
-
+                TestHelper.AssertContextMenuStripContainsItem(result, 0,
+                                                              RingtoetsFormsResources.Clear_all_output,
+                                                              RingtoetsFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear,
+                                                              RingtoetsFormsResources.ClearIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
@@ -256,28 +264,29 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var failureMechanismMock = mocks.StrictMock<IFailureMechanism>();
             failureMechanismMock.Expect(fm => fm.IsRelevant).Return(isRelevant);
             var failureMechanismContextMock = mocks.StrictMock<IFailureMechanismContext<IFailureMechanism>>();
             failureMechanismContextMock.Expect(fmc => fmc.WrappedData).Return(failureMechanismMock);
             mocks.ReplayAll();
 
-            var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, failureMechanismMock, treeViewControlMock);
-            var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, failureMechanismMock, treeViewControl);
+                var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Call
-            var result = ringtoetsContextMenuBuilder.AddToggleRelevancyOfFailureMechanismItem(failureMechanismContextMock, null).Build();
+                // Call
+                var result = ringtoetsContextMenuBuilder.AddToggleRelevancyOfFailureMechanismItem(failureMechanismContextMock, null).Build();
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
-            var checkboxIcon = isRelevant ? RingtoetsFormsResources.Checkbox_empty : RingtoetsFormsResources.Checkbox_ticked;
-            TestHelper.AssertContextMenuStripContainsItem(result, 0,
-                                                          RingtoetsFormsResources.FailureMechanismContextMenuStrip_Is_relevant,
-                                                          RingtoetsFormsResources.FailureMechanismContextMenuStrip_Is_relevant_Tooltip,
-                                                          checkboxIcon);
-
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
+                var checkboxIcon = isRelevant ? RingtoetsFormsResources.Checkbox_empty : RingtoetsFormsResources.Checkbox_ticked;
+                TestHelper.AssertContextMenuStripContainsItem(result, 0,
+                                                              RingtoetsFormsResources.FailureMechanismContextMenuStrip_Is_relevant,
+                                                              RingtoetsFormsResources.FailureMechanismContextMenuStrip_Is_relevant_Tooltip,
+                                                              checkboxIcon);
+            }
             mocks.VerifyAll();
         }
 
@@ -289,28 +298,29 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var calculationWithOutputMock = mocks.StrictMock<ICalculation>();
 
             calculationWithOutputMock.Expect(c => c.HasOutput).Return(true);
 
             mocks.ReplayAll();
 
-            var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculationWithOutputMock, treeViewControlMock);
-            var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculationWithOutputMock, treeViewControl);
+                var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Call
-            var result = ringtoetsContextMenuBuilder.AddClearCalculationOutputItem(calculationWithOutputMock).Build();
+                // Call
+                var result = ringtoetsContextMenuBuilder.AddClearCalculationOutputItem(calculationWithOutputMock).Build();
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
 
-            TestHelper.AssertContextMenuStripContainsItem(result, 0,
-                                                          RingtoetsFormsResources.Clear_output,
-                                                          RingtoetsFormsResources.Clear_output_ToolTip,
-                                                          RingtoetsFormsResources.ClearIcon);
-
+                TestHelper.AssertContextMenuStripContainsItem(result, 0,
+                                                              RingtoetsFormsResources.Clear_output,
+                                                              RingtoetsFormsResources.Clear_output_ToolTip,
+                                                              RingtoetsFormsResources.ClearIcon);
+            }
             mocks.VerifyAll();
         }
 
@@ -322,29 +332,30 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var calculationWithoutOutputMock = mocks.StrictMock<ICalculation>();
 
             calculationWithoutOutputMock.Expect(c => c.HasOutput).Return(false);
 
             mocks.ReplayAll();
 
-            var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculationWithoutOutputMock, treeViewControlMock);
-            var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculationWithoutOutputMock, treeViewControl);
+                var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Call
-            var result = ringtoetsContextMenuBuilder.AddClearCalculationOutputItem(calculationWithoutOutputMock).Build();
+                // Call
+                var result = ringtoetsContextMenuBuilder.AddClearCalculationOutputItem(calculationWithoutOutputMock).Build();
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
 
-            TestHelper.AssertContextMenuStripContainsItem(result, 0,
-                                                          RingtoetsFormsResources.Clear_output,
-                                                          RingtoetsFormsResources.ClearOutput_No_output_to_clear,
-                                                          RingtoetsFormsResources.ClearIcon,
-                                                          false);
-
+                TestHelper.AssertContextMenuStripContainsItem(result, 0,
+                                                              RingtoetsFormsResources.Clear_output,
+                                                              RingtoetsFormsResources.ClearOutput_No_output_to_clear,
+                                                              RingtoetsFormsResources.ClearIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
@@ -579,28 +590,30 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var failureMechanisMock = mocks.StrictMock<IFailureMechanism>();
 
             mocks.ReplayAll();
 
             var calculation = new TestCalculation();
             var calculationContext = new TestCalculationContext(calculation, failureMechanisMock);
-            var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculation, treeViewControlMock);
-            var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Call
-            ContextMenuStrip result = ringtoetsContextMenuBuilder.AddPerformCalculationItem(calculation, calculationContext, null, context => null).Build();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculation, treeViewControl);
+                var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
+                // Call
+                ContextMenuStrip result = ringtoetsContextMenuBuilder.AddPerformCalculationItem(calculation, calculationContext, null, context => null).Build();
 
-            TestHelper.AssertContextMenuStripContainsItem(result, 0,
-                                                          RingtoetsFormsResources.Calculate,
-                                                          RingtoetsFormsResources.Calculate_ToolTip,
-                                                          RingtoetsFormsResources.CalculateIcon);
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
 
+                TestHelper.AssertContextMenuStripContainsItem(result, 0,
+                                                              RingtoetsFormsResources.Calculate,
+                                                              RingtoetsFormsResources.Calculate_ToolTip,
+                                                              RingtoetsFormsResources.CalculateIcon);
+            }
             mocks.VerifyAll();
         }
 
@@ -612,31 +625,33 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var failureMechanisMock = mocks.StrictMock<IFailureMechanism>();
 
             mocks.ReplayAll();
 
             var calculation = new TestCalculation();
             var calculationContext = new TestCalculationContext(calculation, failureMechanisMock);
-            var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculation, treeViewControlMock);
-            var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
-            
-            var errorMessage = "No valid data";
 
-            // Call
-            ContextMenuStrip result = ringtoetsContextMenuBuilder.AddPerformCalculationItem(calculation, calculationContext, null, context => errorMessage).Build();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculation, treeViewControl);
+                var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
+                var errorMessage = "No valid data";
 
-            TestHelper.AssertContextMenuStripContainsItem(result, 0,
-                                                          RingtoetsFormsResources.Calculate,
-                                                          errorMessage,
-                                                          RingtoetsFormsResources.CalculateIcon,
-                                                          false);
+                // Call
+                ContextMenuStrip result = ringtoetsContextMenuBuilder.AddPerformCalculationItem(calculation, calculationContext, null, context => errorMessage).Build();
 
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
+
+                TestHelper.AssertContextMenuStripContainsItem(result, 0,
+                                                              RingtoetsFormsResources.Calculate,
+                                                              errorMessage,
+                                                              RingtoetsFormsResources.CalculateIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
@@ -652,26 +667,28 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
             mocks.ReplayAll();
 
             var calculation = new TestCalculation();
-            var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculation, treeViewControlMock);
-            var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Call
-            ContextMenuStrip result = ringtoetsContextMenuBuilder.AddValidateCalculationItem(calculation, null, c => null).Build();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculation, treeViewControl);
+                var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
+                // Call
+                ContextMenuStrip result = ringtoetsContextMenuBuilder.AddValidateCalculationItem(calculation, null, c => null).Build();
 
-            TestHelper.AssertContextMenuStripContainsItem(result, 0,
-                                                          RingtoetsFormsResources.Validate,
-                                                          RingtoetsFormsResources.Validate_ToolTip,
-                                                          RingtoetsFormsResources.ValidateIcon);
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
 
+                TestHelper.AssertContextMenuStripContainsItem(result, 0,
+                                                              RingtoetsFormsResources.Validate,
+                                                              RingtoetsFormsResources.Validate_ToolTip,
+                                                              RingtoetsFormsResources.ValidateIcon);
+            }
             mocks.VerifyAll();
         }
 
@@ -683,29 +700,31 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
             mocks.ReplayAll();
 
             var calculation = new TestCalculation();
-            var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculation, treeViewControlMock);
-            var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
-            
-            var errorMessage = "No valid data";
 
-            // Call
-            ContextMenuStrip result = ringtoetsContextMenuBuilder.AddValidateCalculationItem(calculation, null, c => errorMessage).Build();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculation, treeViewControl);
+                var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
+                var errorMessage = "No valid data";
 
-            TestHelper.AssertContextMenuStripContainsItem(result, 0,
-                                                          RingtoetsFormsResources.Validate,
-                                                          errorMessage,
-                                                          RingtoetsFormsResources.ValidateIcon,
-                                                          false);
+                // Call
+                ContextMenuStrip result = ringtoetsContextMenuBuilder.AddValidateCalculationItem(calculation, null, c => errorMessage).Build();
 
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
+
+                TestHelper.AssertContextMenuStripContainsItem(result, 0,
+                                                              RingtoetsFormsResources.Validate,
+                                                              errorMessage,
+                                                              RingtoetsFormsResources.ValidateIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
@@ -721,7 +740,6 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
             mocks.ReplayAll();
 
@@ -735,23 +753,25 @@
             };
 
             var failureMechanism = new TestFailureMechanism(new[] { calculation });
-
             var calculationGroupContext = new TestCalculationGroupContext(calculationGroup, failureMechanism);
-            var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculationGroup, treeViewControlMock);
-            var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Call
-            ContextMenuStrip result = ringtoetsContextMenuBuilder.AddPerformAllCalculationsInGroupItem(calculationGroup, calculationGroupContext, null, context => null).Build();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculationGroup, treeViewControl);
+                var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
+                // Call
+                ContextMenuStrip result = ringtoetsContextMenuBuilder.AddPerformAllCalculationsInGroupItem(calculationGroup, calculationGroupContext, null, context => null).Build();
 
-            TestHelper.AssertContextMenuStripContainsItem(result, 0,
-                                                          RingtoetsFormsResources.Calculate_all,
-                                                          RingtoetsFormsResources.CalculationGroup_CalculateAll_ToolTip,
-                                                          RingtoetsFormsResources.CalculateAllIcon);
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
 
+                TestHelper.AssertContextMenuStripContainsItem(result, 0,
+                                                              RingtoetsFormsResources.Calculate_all,
+                                                              RingtoetsFormsResources.CalculationGroup_CalculateAll_ToolTip,
+                                                              RingtoetsFormsResources.CalculateAllIcon);
+            }
             mocks.VerifyAll();
         }
 
@@ -763,29 +783,31 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
             mocks.ReplayAll();
 
             var failureMechanism = new TestFailureMechanism(Enumerable.Empty<ICalculation>());
             var calculationGroup = new CalculationGroup();
             var calculationGroupContext = new TestCalculationGroupContext(calculationGroup, failureMechanism);
-            var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculationGroup, treeViewControlMock);
-            var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Call
-            ContextMenuStrip result = ringtoetsContextMenuBuilder.AddPerformAllCalculationsInGroupItem(calculationGroup, calculationGroupContext, null, context => null).Build();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculationGroup, treeViewControl);
+                var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
+                // Call
+                ContextMenuStrip result = ringtoetsContextMenuBuilder.AddPerformAllCalculationsInGroupItem(calculationGroup, calculationGroupContext, null, context => null).Build();
 
-            TestHelper.AssertContextMenuStripContainsItem(result, 0,
-                                                          RingtoetsFormsResources.Calculate_all,
-                                                          RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run,
-                                                          RingtoetsFormsResources.CalculateAllIcon,
-                                                          false);
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
 
+                TestHelper.AssertContextMenuStripContainsItem(result, 0,
+                                                              RingtoetsFormsResources.Calculate_all,
+                                                              RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run,
+                                                              RingtoetsFormsResources.CalculateAllIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
@@ -797,7 +819,6 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
             mocks.ReplayAll();
 
@@ -811,26 +832,28 @@
             };
 
             var failureMechanism = new TestFailureMechanism(new[] { calculation });
-
             var calculationGroupContext = new TestCalculationGroupContext(calculationGroup, failureMechanism);
-            var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculationGroup, treeViewControlMock);
-            var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            var errorMessage = "Additional validation failed.";
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculationGroup, treeViewControl);
+                var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Call
-            ContextMenuStrip result = ringtoetsContextMenuBuilder.AddPerformAllCalculationsInGroupItem(calculationGroup, calculationGroupContext, null, context => errorMessage).Build();
+                var errorMessage = "Additional validation failed.";
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
+                // Call
+                ContextMenuStrip result = ringtoetsContextMenuBuilder.AddPerformAllCalculationsInGroupItem(calculationGroup, calculationGroupContext, null, context => errorMessage).Build();
 
-            TestHelper.AssertContextMenuStripContainsItem(result, 0,
-                                                          RingtoetsFormsResources.Calculate_all,
-                                                          errorMessage,
-                                                          RingtoetsFormsResources.CalculateAllIcon,
-                                                          false);
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
 
+                TestHelper.AssertContextMenuStripContainsItem(result, 0,
+                                                              RingtoetsFormsResources.Calculate_all,
+                                                              errorMessage,
+                                                              RingtoetsFormsResources.CalculateAllIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
@@ -842,31 +865,33 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
             mocks.ReplayAll();
 
             var failureMechanism = new TestFailureMechanism(Enumerable.Empty<ICalculation>());
             var calculationGroup = new CalculationGroup();
             var calculationGroupContext = new TestCalculationGroupContext(calculationGroup, failureMechanism);
-            var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculationGroup, treeViewControlMock);
-            var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            var errorMessage = "Additional validation failed.";
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculationGroup, treeViewControl);
+                var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Call
-            ContextMenuStrip result = ringtoetsContextMenuBuilder.AddPerformAllCalculationsInGroupItem(calculationGroup, calculationGroupContext, null, context => errorMessage).Build();
+                var errorMessage = "Additional validation failed.";
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
+                // Call
+                ContextMenuStrip result = ringtoetsContextMenuBuilder.AddPerformAllCalculationsInGroupItem(calculationGroup, calculationGroupContext, null, context => errorMessage).Build();
 
-            TestHelper.AssertContextMenuStripContainsItem(result, 0,
-                                                          RingtoetsFormsResources.Calculate_all,
-                                                          RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run,
-                                                          RingtoetsFormsResources.CalculateAllIcon,
-                                                          false);
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
 
+                TestHelper.AssertContextMenuStripContainsItem(result, 0,
+                                                              RingtoetsFormsResources.Calculate_all,
+                                                              RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run,
+                                                              RingtoetsFormsResources.CalculateAllIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
@@ -882,7 +907,6 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
             mocks.ReplayAll();
 
@@ -896,23 +920,25 @@
             };
 
             var failureMechanism = new TestFailureMechanism(new[] { calculation });
-
             var calculationGroupContext = new TestCalculationGroupContext(calculationGroup, failureMechanism);
-            var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculationGroup, treeViewControlMock);
-            var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Call
-            ContextMenuStrip result = ringtoetsContextMenuBuilder.AddValidateAllCalculationsInGroupItem(calculationGroup, calculationGroupContext, null, context => null).Build();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculationGroup, treeViewControl);
+                var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
+                // Call
+                ContextMenuStrip result = ringtoetsContextMenuBuilder.AddValidateAllCalculationsInGroupItem(calculationGroup, calculationGroupContext, null, context => null).Build();
 
-            TestHelper.AssertContextMenuStripContainsItem(result, 0,
-                                                          RingtoetsFormsResources.Validate_all,
-                                                          RingtoetsFormsResources.CalculationGroup_Validate_all_ToolTip,
-                                                          RingtoetsFormsResources.ValidateAllIcon);
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
 
+                TestHelper.AssertContextMenuStripContainsItem(result, 0,
+                                                              RingtoetsFormsResources.Validate_all,
+                                                              RingtoetsFormsResources.CalculationGroup_Validate_all_ToolTip,
+                                                              RingtoetsFormsResources.ValidateAllIcon);
+            }
             mocks.VerifyAll();
         }
 
@@ -924,29 +950,31 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
             mocks.ReplayAll();
 
             var failureMechanism = new TestFailureMechanism(Enumerable.Empty<ICalculation>());
             var calculationGroup = new CalculationGroup();
             var calculationGroupContext = new TestCalculationGroupContext(calculationGroup, failureMechanism);
-            var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculationGroup, treeViewControlMock);
-            var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Call
-            ContextMenuStrip result = ringtoetsContextMenuBuilder.AddValidateAllCalculationsInGroupItem(calculationGroup, calculationGroupContext, null, context => null).Build();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculationGroup, treeViewControl);
+                var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
+                // Call
+                ContextMenuStrip result = ringtoetsContextMenuBuilder.AddValidateAllCalculationsInGroupItem(calculationGroup, calculationGroupContext, null, context => null).Build();
 
-            TestHelper.AssertContextMenuStripContainsItem(result, 0,
-                                                          RingtoetsFormsResources.Validate_all,
-                                                          RingtoetsFormsResources.ValidateAll_No_calculations_to_validate,
-                                                          RingtoetsFormsResources.ValidateAllIcon,
-                                                          false);
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
 
+                TestHelper.AssertContextMenuStripContainsItem(result, 0,
+                                                              RingtoetsFormsResources.Validate_all,
+                                                              RingtoetsFormsResources.ValidateAll_No_calculations_to_validate,
+                                                              RingtoetsFormsResources.ValidateAllIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
@@ -958,7 +986,6 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
             mocks.ReplayAll();
 
@@ -972,26 +999,28 @@
             };
 
             var failureMechanism = new TestFailureMechanism(new[] { calculation });
-
             var calculationGroupContext = new TestCalculationGroupContext(calculationGroup, failureMechanism);
-            var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculationGroup, treeViewControlMock);
-            var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            var errorMessage = "Additional validation failed.";
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculationGroup, treeViewControl);
+                var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Call
-            ContextMenuStrip result = ringtoetsContextMenuBuilder.AddValidateAllCalculationsInGroupItem(calculationGroup, calculationGroupContext, null, context => errorMessage).Build();
+                var errorMessage = "Additional validation failed.";
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
+                // Call
+                ContextMenuStrip result = ringtoetsContextMenuBuilder.AddValidateAllCalculationsInGroupItem(calculationGroup, calculationGroupContext, null, context => errorMessage).Build();
 
-            TestHelper.AssertContextMenuStripContainsItem(result, 0,
-                                                          RingtoetsFormsResources.Validate_all,
-                                                          errorMessage,
-                                                          RingtoetsFormsResources.ValidateAllIcon,
-                                                          false);
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
 
+                TestHelper.AssertContextMenuStripContainsItem(result, 0,
+                                                              RingtoetsFormsResources.Validate_all,
+                                                              errorMessage,
+                                                              RingtoetsFormsResources.ValidateAllIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
@@ -1003,31 +1032,33 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
             mocks.ReplayAll();
 
             var failureMechanism = new TestFailureMechanism(Enumerable.Empty<ICalculation>());
             var calculationGroup = new CalculationGroup();
             var calculationGroupContext = new TestCalculationGroupContext(calculationGroup, failureMechanism);
-            var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculationGroup, treeViewControlMock);
-            var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            var errorMessage = "Additional validation failed.";
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, calculationGroup, treeViewControl);
+                var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Call
-            ContextMenuStrip result = ringtoetsContextMenuBuilder.AddValidateAllCalculationsInGroupItem(calculationGroup, calculationGroupContext, null, context => errorMessage).Build();
+                var errorMessage = "Additional validation failed.";
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
+                // Call
+                ContextMenuStrip result = ringtoetsContextMenuBuilder.AddValidateAllCalculationsInGroupItem(calculationGroup, calculationGroupContext, null, context => errorMessage).Build();
 
-            TestHelper.AssertContextMenuStripContainsItem(result, 0,
-                                                          RingtoetsFormsResources.Validate_all,
-                                                          RingtoetsFormsResources.ValidateAll_No_calculations_to_validate,
-                                                          RingtoetsFormsResources.ValidateAllIcon,
-                                                          false);
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
 
+                TestHelper.AssertContextMenuStripContainsItem(result, 0,
+                                                              RingtoetsFormsResources.Validate_all,
+                                                              RingtoetsFormsResources.ValidateAll_No_calculations_to_validate,
+                                                              RingtoetsFormsResources.ValidateAllIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
@@ -1043,28 +1074,29 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
 
             var failureMechanism = new TestFailureMechanism(new[] { new TestCalculation() });
             var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSectionMock);
 
             mocks.ReplayAll();
 
-            var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, failureMechanismContext, treeViewControlMock);
-            var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, failureMechanismContext, treeViewControl);
+                var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Call
-            ContextMenuStrip result = ringtoetsContextMenuBuilder.AddPerformAllCalculationsInFailureMechanismItem(failureMechanismContext, null, context => null).Build();
+                // Call
+                ContextMenuStrip result = ringtoetsContextMenuBuilder.AddPerformAllCalculationsInFailureMechanismItem(failureMechanismContext, null, context => null).Build();
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
-            TestHelper.AssertContextMenuStripContainsItem(result, 0,
-                                                          RingtoetsFormsResources.Calculate_all,
-                                                          RingtoetsFormsResources.Calculate_all_ToolTip,
-                                                          RingtoetsFormsResources.CalculateAllIcon);
-
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
+                TestHelper.AssertContextMenuStripContainsItem(result, 0,
+                                                              RingtoetsFormsResources.Calculate_all,
+                                                              RingtoetsFormsResources.Calculate_all_ToolTip,
+                                                              RingtoetsFormsResources.CalculateAllIcon);
+            }
             mocks.VerifyAll();
         }
 
@@ -1076,29 +1108,30 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
 
             var failureMechanism = new TestFailureMechanism(Enumerable.Empty<ICalculation>());
             var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSectionMock);
 
             mocks.ReplayAll();
 
-            var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, failureMechanismContext, treeViewControlMock);
-            var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, failureMechanismContext, treeViewControl);
+                var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Call
-            ContextMenuStrip result = ringtoetsContextMenuBuilder.AddPerformAllCalculationsInFailureMechanismItem(failureMechanismContext, null, context => null).Build();
+                // Call
+                ContextMenuStrip result = ringtoetsContextMenuBuilder.AddPerformAllCalculationsInFailureMechanismItem(failureMechanismContext, null, context => null).Build();
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
-            TestHelper.AssertContextMenuStripContainsItem(result, 0,
-                                                          RingtoetsFormsResources.Calculate_all,
-                                                          RingtoetsFormsResources.FailureMechanism_CreateCalculateAllItem_No_calculations_to_run,
-                                                          RingtoetsFormsResources.CalculateAllIcon,
-                                                          false);
-
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
+                TestHelper.AssertContextMenuStripContainsItem(result, 0,
+                                                              RingtoetsFormsResources.Calculate_all,
+                                                              RingtoetsFormsResources.FailureMechanism_CreateCalculateAllItem_No_calculations_to_run,
+                                                              RingtoetsFormsResources.CalculateAllIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
@@ -1110,31 +1143,32 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
 
             var failureMechanism = new TestFailureMechanism(new[] { new TestCalculation() });
             var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSectionMock);
 
             mocks.ReplayAll();
 
-            var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, failureMechanismContext, treeViewControlMock);
-            var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, failureMechanismContext, treeViewControl);
+                var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            var errorMessage = "Additional validation failed.";
+                var errorMessage = "Additional validation failed.";
 
-            // Call
-            ContextMenuStrip result = ringtoetsContextMenuBuilder.AddPerformAllCalculationsInFailureMechanismItem(failureMechanismContext, null, context => errorMessage).Build();
+                // Call
+                ContextMenuStrip result = ringtoetsContextMenuBuilder.AddPerformAllCalculationsInFailureMechanismItem(failureMechanismContext, null, context => errorMessage).Build();
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
-            TestHelper.AssertContextMenuStripContainsItem(result, 0,
-                                                          RingtoetsFormsResources.Calculate_all,
-                                                          errorMessage,
-                                                          RingtoetsFormsResources.CalculateAllIcon,
-                                                          false);
-
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
+                TestHelper.AssertContextMenuStripContainsItem(result, 0,
+                                                              RingtoetsFormsResources.Calculate_all,
+                                                              errorMessage,
+                                                              RingtoetsFormsResources.CalculateAllIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
@@ -1146,31 +1180,32 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
 
             var failureMechanism = new TestFailureMechanism(Enumerable.Empty<ICalculation>());
             var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSectionMock);
 
             mocks.ReplayAll();
 
-            var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, failureMechanismContext, treeViewControlMock);
-            var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, failureMechanismContext, treeViewControl);
+                var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            var errorMessage = "Additional validation failed.";
+                var errorMessage = "Additional validation failed.";
 
-            // Call
-            ContextMenuStrip result = ringtoetsContextMenuBuilder.AddPerformAllCalculationsInFailureMechanismItem(failureMechanismContext, null, context => errorMessage).Build();
+                // Call
+                ContextMenuStrip result = ringtoetsContextMenuBuilder.AddPerformAllCalculationsInFailureMechanismItem(failureMechanismContext, null, context => errorMessage).Build();
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
-            TestHelper.AssertContextMenuStripContainsItem(result, 0,
-                                                          RingtoetsFormsResources.Calculate_all,
-                                                          RingtoetsFormsResources.FailureMechanism_CreateCalculateAllItem_No_calculations_to_run,
-                                                          RingtoetsFormsResources.CalculateAllIcon,
-                                                          false);
-
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
+                TestHelper.AssertContextMenuStripContainsItem(result, 0,
+                                                              RingtoetsFormsResources.Calculate_all,
+                                                              RingtoetsFormsResources.FailureMechanism_CreateCalculateAllItem_No_calculations_to_run,
+                                                              RingtoetsFormsResources.CalculateAllIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
@@ -1186,28 +1221,29 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
 
             var failureMechanism = new TestFailureMechanism(new[] { new TestCalculation() });
             var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSectionMock);
 
             mocks.ReplayAll();
 
-            var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, failureMechanismContext, treeViewControlMock);
-            var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, failureMechanismContext, treeViewControl);
+                var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Call
-            ContextMenuStrip result = ringtoetsContextMenuBuilder.AddValidateAllCalculationsInFailureMechanismItem(failureMechanism, null, fm => null).Build();
+                // Call
+                ContextMenuStrip result = ringtoetsContextMenuBuilder.AddValidateAllCalculationsInFailureMechanismItem(failureMechanism, null, fm => null).Build();
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
-            TestHelper.AssertContextMenuStripContainsItem(result, 0,
-                                                          RingtoetsFormsResources.Validate_all,
-                                                          RingtoetsFormsResources.FailureMechanism_Validate_all_ToolTip,
-                                                          RingtoetsFormsResources.ValidateAllIcon);
-
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
+                TestHelper.AssertContextMenuStripContainsItem(result, 0,
+                                                              RingtoetsFormsResources.Validate_all,
+                                                              RingtoetsFormsResources.FailureMechanism_Validate_all_ToolTip,
+                                                              RingtoetsFormsResources.ValidateAllIcon);
+            }
             mocks.VerifyAll();
         }
 
@@ -1219,29 +1255,30 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
 
             var failureMechanism = new TestFailureMechanism(Enumerable.Empty<ICalculation>());
             var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSectionMock);
 
             mocks.ReplayAll();
 
-            var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, failureMechanismContext, treeViewControlMock);
-            var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, failureMechanismContext, treeViewControl);
+                var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            // Call
-            ContextMenuStrip result = ringtoetsContextMenuBuilder.AddValidateAllCalculationsInFailureMechanismItem(failureMechanism, null, fm => null).Build();
+                // Call
+                ContextMenuStrip result = ringtoetsContextMenuBuilder.AddValidateAllCalculationsInFailureMechanismItem(failureMechanism, null, fm => null).Build();
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
-            TestHelper.AssertContextMenuStripContainsItem(result, 0,
-                                                          RingtoetsFormsResources.Validate_all,
-                                                          RingtoetsFormsResources.ValidateAll_No_calculations_to_validate,
-                                                          RingtoetsFormsResources.ValidateAllIcon,
-                                                          false);
-
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
+                TestHelper.AssertContextMenuStripContainsItem(result, 0,
+                                                              RingtoetsFormsResources.Validate_all,
+                                                              RingtoetsFormsResources.ValidateAll_No_calculations_to_validate,
+                                                              RingtoetsFormsResources.ValidateAllIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
@@ -1253,31 +1290,32 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
 
             var failureMechanism = new TestFailureMechanism(new[] { new TestCalculation() });
             var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSectionMock);
 
             mocks.ReplayAll();
 
-            var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, failureMechanismContext, treeViewControlMock);
-            var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, failureMechanismContext, treeViewControl);
+                var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            var errorMessage = "Additional validation failed.";
+                var errorMessage = "Additional validation failed.";
 
-            // Call
-            ContextMenuStrip result = ringtoetsContextMenuBuilder.AddValidateAllCalculationsInFailureMechanismItem(failureMechanism, null, fm => errorMessage).Build();
+                // Call
+                ContextMenuStrip result = ringtoetsContextMenuBuilder.AddValidateAllCalculationsInFailureMechanismItem(failureMechanism, null, fm => errorMessage).Build();
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
-            TestHelper.AssertContextMenuStripContainsItem(result, 0,
-                                                          RingtoetsFormsResources.Validate_all,
-                                                          errorMessage,
-                                                          RingtoetsFormsResources.ValidateAllIcon,
-                                                          false);
-
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
+                TestHelper.AssertContextMenuStripContainsItem(result, 0,
+                                                              RingtoetsFormsResources.Validate_all,
+                                                              errorMessage,
+                                                              RingtoetsFormsResources.ValidateAllIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
@@ -1289,31 +1327,32 @@
             var applicationFeatureCommandsMock = mocks.StrictMock<IApplicationFeatureCommands>();
             var exportImportHandlerMock = mocks.StrictMock<IExportImportCommandHandler>();
             var viewCommandsMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
 
             var failureMechanism = new TestFailureMechanism(Enumerable.Empty<ICalculation>());
             var failureMechanismContext = new TestFailureMechanismContext(failureMechanism, assessmentSectionMock);
 
             mocks.ReplayAll();
 
-            var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, failureMechanismContext, treeViewControlMock);
-            var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var contextMenuBuilder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, failureMechanismContext, treeViewControl);
+                var ringtoetsContextMenuBuilder = new RingtoetsContextMenuBuilder(contextMenuBuilder);
 
-            var errorMessage = "Additional validation failed.";
+                var errorMessage = "Additional validation failed.";
 
-            // Call
-            ContextMenuStrip result = ringtoetsContextMenuBuilder.AddValidateAllCalculationsInFailureMechanismItem(failureMechanism, null, fm => errorMessage).Build();
+                // Call
+                ContextMenuStrip result = ringtoetsContextMenuBuilder.AddValidateAllCalculationsInFailureMechanismItem(failureMechanism, null, fm => errorMessage).Build();
 
-            // Assert
-            Assert.IsInstanceOf<ContextMenuStrip>(result);
-            Assert.AreEqual(1, result.Items.Count);
-            TestHelper.AssertContextMenuStripContainsItem(result, 0,
-                                                          RingtoetsFormsResources.Validate_all,
-                                                          RingtoetsFormsResources.ValidateAll_No_calculations_to_validate,
-                                                          RingtoetsFormsResources.ValidateAllIcon,
-                                                          false);
-
+                // Assert
+                Assert.IsInstanceOf<ContextMenuStrip>(result);
+                Assert.AreEqual(1, result.Items.Count);
+                TestHelper.AssertContextMenuStripContainsItem(result, 0,
+                                                              RingtoetsFormsResources.Validate_all,
+                                                              RingtoetsFormsResources.ValidateAll_No_calculations_to_validate,
+                                                              RingtoetsFormsResources.ValidateAllIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsTreeNodeInfoFactoryTest.cs
===================================================================
diff -u -rcfbc63bdf527a3b6b51c6bfb5442eecd8c7a9c37 -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsTreeNodeInfoFactoryTest.cs	(.../RingtoetsTreeNodeInfoFactoryTest.cs)	(revision cfbc63bdf527a3b6b51c6bfb5442eecd8c7a9c37)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/TreeNodeInfos/RingtoetsTreeNodeInfoFactoryTest.cs	(.../RingtoetsTreeNodeInfoFactoryTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -378,7 +378,6 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var failureMechanismMock = mocks.StrictMock<IFailureMechanism>();
             var originalOwnerObserverMock = mocks.StrictMock<IObserver>();
             var newOwnerObserverMock = mocks.StrictMock<IObserver>();
@@ -410,15 +409,17 @@
             CollectionAssert.Contains(originalOwnerGroup.Children, draggedItem);
             CollectionAssert.DoesNotContain(newOwnerGroup.Children, draggedItem);
 
-            // Call
-            treeNodeInfo.OnDrop(draggedItemContext, newOwnerGroupContext, originalOwnerGroupContext, 0, treeViewControlMock);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                // Call
+                treeNodeInfo.OnDrop(draggedItemContext, newOwnerGroupContext, originalOwnerGroupContext, 0, treeViewControl);
 
-            // Assert
-            CollectionAssert.DoesNotContain(originalOwnerGroup.Children, draggedItem);
-            CollectionAssert.Contains(newOwnerGroup.Children, draggedItem);
-            Assert.AreSame(draggedItem, newOwnerGroup.Children.Last(),
-                           "Dragging node at the end of the target TestCalculationGroup should put the dragged data at the end of 'newOwnerGroup'.");
-
+                // Assert
+                CollectionAssert.DoesNotContain(originalOwnerGroup.Children, draggedItem);
+                CollectionAssert.Contains(newOwnerGroup.Children, draggedItem);
+                Assert.AreSame(draggedItem, newOwnerGroup.Children.Last(),
+                               "Dragging node at the end of the target TestCalculationGroup should put the dragged data at the end of 'newOwnerGroup'.");
+            }
             mocks.VerifyAll();
         }
 
@@ -430,7 +431,6 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var failureMechanismMock = mocks.StrictMock<IFailureMechanism>();
             var existingItemMock = mocks.StrictMock<ICalculationBase>();
             var originalOwnerObserverMock = mocks.StrictMock<IObserver>();
@@ -461,18 +461,20 @@
             // Precondition
             CollectionAssert.Contains(originalOwnerGroup.Children, draggedItem);
 
-            // Call
-            treeNodeInfo.OnDrop(draggedItemContext, originalOwnerGroupContext, originalOwnerGroupContext, newIndex, treeViewControlMock);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                // Call
+                treeNodeInfo.OnDrop(draggedItemContext, originalOwnerGroupContext, originalOwnerGroupContext, newIndex, treeViewControl);
 
-            // Assert
-            CollectionAssert.Contains(originalOwnerGroup.Children, draggedItem);
-            Assert.AreNotSame(draggedItem, originalOwnerGroup.Children[1],
-                              "Should have removed 'draggedItem' from its original location in the collection.");
-            Assert.AreSame(draggedItem, originalOwnerGroup.Children[newIndex],
-                           "Dragging node to specific location within owning TestCalculationGroup should put the dragged data at that index.");
-            Assert.AreEqual(name, draggedItem.Name,
-                            "No renaming should occur when dragging within the same TestCalculationGroup.");
-
+                // Assert
+                CollectionAssert.Contains(originalOwnerGroup.Children, draggedItem);
+                Assert.AreNotSame(draggedItem, originalOwnerGroup.Children[1],
+                                  "Should have removed 'draggedItem' from its original location in the collection.");
+                Assert.AreSame(draggedItem, originalOwnerGroup.Children[newIndex],
+                               "Dragging node to specific location within owning TestCalculationGroup should put the dragged data at that index.");
+                Assert.AreEqual(name, draggedItem.Name,
+                                "No renaming should occur when dragging within the same TestCalculationGroup.");
+            }
             mocks.VerifyAll();
         }
 
@@ -488,7 +490,9 @@
 
             ICalculationBase draggedItem;
             object draggedItemContext;
+
             CreateCalculationItemAndContext(draggedItemType, out draggedItem, out draggedItemContext, failureMechanismMock);
+            treeViewControlMock.Expect(tvc => tvc.TryRenameNodeForData(draggedItemContext));
 
             CalculationGroup originalOwnerGroup;
             TestCalculationGroupContext originalOwnerGroupContext;
@@ -508,7 +512,6 @@
             var newOwnerObserver = mocks.StrictMock<IObserver>();
             newOwnerObserver.Expect(o => o.UpdateObserver());
 
-            treeViewControlMock.Expect(tvc => tvc.TryRenameNodeForData(draggedItemContext));
 
             mocks.ReplayAll();
 
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsDikeProfileSelectionView.Designer.cs
===================================================================
diff -u -r7d790a82bda0347f47961162de614bacfa8e288c -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsDikeProfileSelectionView.Designer.cs	(.../GrassCoverErosionInwardsDikeProfileSelectionView.Designer.cs)	(revision 7d790a82bda0347f47961162de614bacfa8e288c)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsDikeProfileSelectionView.Designer.cs	(.../GrassCoverErosionInwardsDikeProfileSelectionView.Designer.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -35,7 +35,7 @@
             this.panel2 = new System.Windows.Forms.Panel();
             this.DikeProfileDataGrid = new System.Windows.Forms.DataGridView();
             this.UseColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.SurfaceLineNameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.DikeProfileNameColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.panel1.SuspendLayout();
             this.panel2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.DikeProfileDataGrid)).BeginInit();
@@ -77,7 +77,7 @@
             this.DikeProfileDataGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.DikeProfileDataGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.UseColumn,
-            this.SurfaceLineNameColumn});
+            this.DikeProfileNameColumn});
             resources.ApplyResources(this.DikeProfileDataGrid, "DikeProfileDataGrid");
             this.DikeProfileDataGrid.Name = "DikeProfileDataGrid";
             this.DikeProfileDataGrid.RowHeadersVisible = false;
@@ -93,10 +93,10 @@
             // 
             // SurfaceLineNameColumn
             // 
-            this.SurfaceLineNameColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.SurfaceLineNameColumn.DataPropertyName = "Name";
-            resources.ApplyResources(this.SurfaceLineNameColumn, "SurfaceLineNameColumn");
-            this.SurfaceLineNameColumn.Name = "SurfaceLineNameColumn";
+            this.DikeProfileNameColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.DikeProfileNameColumn.DataPropertyName = "Name";
+            resources.ApplyResources(this.DikeProfileNameColumn, "DikeProfileNameColumn");
+            this.DikeProfileNameColumn.Name = "DikeProfileNameColumn";
             // 
             // GrassCoverErosionInwardsDikeProfileSelectionView
             // 
@@ -120,6 +120,6 @@
         private System.Windows.Forms.Button SelectNoneButton;
         private System.Windows.Forms.Button SelectAllButton;
         private System.Windows.Forms.DataGridViewCheckBoxColumn UseColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn SurfaceLineNameColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn DikeProfileNameColumn;
     }
 }
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsDikeProfileSelectionView.resx
===================================================================
diff -u -r7d790a82bda0347f47961162de614bacfa8e288c -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsDikeProfileSelectionView.resx	(.../GrassCoverErosionInwardsDikeProfileSelectionView.resx)	(revision 7d790a82bda0347f47961162de614bacfa8e288c)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsDikeProfileSelectionView.resx	(.../GrassCoverErosionInwardsDikeProfileSelectionView.resx)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -201,10 +201,10 @@
   <data name="UseColumn.Width" type="System.Int32, mscorlib">
     <value>60</value>
   </data>
-  <metadata name="SurfaceLineNameColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="DikeProfileNameColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <data name="SurfaceLineNameColumn.HeaderText" xml:space="preserve">
+  <data name="DikeProfileNameColumn.HeaderText" xml:space="preserve">
     <value>Dijkprofiel</value>
   </data>
   <data name="DikeProfileDataGrid.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
@@ -270,10 +270,10 @@
   <data name="&gt;&gt;UseColumn.Type" xml:space="preserve">
     <value>System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;SurfaceLineNameColumn.Name" xml:space="preserve">
-    <value>SurfaceLineNameColumn</value>
+  <data name="&gt;&gt;DikeProfileNameColumn.Name" xml:space="preserve">
+    <value>DikeProfileNameColumn</value>
   </data>
-  <data name="&gt;&gt;SurfaceLineNameColumn.Type" xml:space="preserve">
+  <data name="&gt;&gt;DikeProfileNameColumn.Type" xml:space="preserve">
     <value>System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs
===================================================================
diff -u -r8d33f259735b765767405b7691924bc8c0182d72 -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs	(.../GrassCoverErosionInwardsGuiPlugin.cs)	(revision 8d33f259735b765767405b7691924bc8c0182d72)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs	(.../GrassCoverErosionInwardsGuiPlugin.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -361,11 +361,11 @@
 
         private ContextMenuStrip CalculationGroupContextContextMenuStrip(GrassCoverErosionInwardsCalculationGroupContext context, object parentData, TreeViewControl treeViewControl)
         {
-            var group = context.WrappedData;
+            CalculationGroup group = context.WrappedData;
             var builder = new RingtoetsContextMenuBuilder(Gui.Get(context, treeViewControl));
             var isNestedGroup = parentData is GrassCoverErosionInwardsCalculationGroupContext;
 
-            var generateCalculationsItem = CreateGenerateCalculationsItem(context);
+            StrictContextMenuItem generateCalculationsItem = CreateGenerateCalculationsItem(context);
 
             if (!isNestedGroup)
             {
@@ -401,12 +401,11 @@
 
         private StrictContextMenuItem CreateGenerateCalculationsItem(GrassCoverErosionInwardsCalculationGroupContext nodeData)
         {
-            var isDikeProfileAvailable = nodeData.AvailableDikeProfiles.Any();
+            bool isDikeProfileAvailable = nodeData.AvailableDikeProfiles.Any();
 
-            var calculationGroupGenerateCalculationsToolTip =
-                isDikeProfileAvailable ?
-                    GrassCoverErosionInwardsPluginResources.GrassCoverErosionInwardsGuiPlugin_CreateGenerateCalculationsItem_ToolTip :
-                    GrassCoverErosionInwardsPluginResources.GrassCoverErosionInwardsGuiPlugin_CreateGenerateCalculationsItem_NoDikeLocations_ToolTip;
+            string calculationGroupGenerateCalculationsToolTip = isDikeProfileAvailable
+                ? GrassCoverErosionInwardsPluginResources.GrassCoverErosionInwardsGuiPlugin_CreateGenerateCalculationsItem_ToolTip 
+                : GrassCoverErosionInwardsPluginResources.GrassCoverErosionInwardsGuiPlugin_CreateGenerateCalculationsItem_NoDikeLocations_ToolTip;
 
             var generateCalculationsItem = new StrictContextMenuItem(
                 RingtoetsCommonFormsResources.CalculationGroup_Generate_Scenarios,
@@ -420,11 +419,11 @@
 
         private void ShowDikeProfileSelectionDialog(GrassCoverErosionInwardsCalculationGroupContext nodeData)
         {
-            var view = new GrassCoverErosionInwardsDikeProfileSelectionDialog(Gui.MainWindow, nodeData.AvailableDikeProfiles);
-            view.ShowDialog();
-
-            GenerateCalculations(nodeData.WrappedData, view.SelectedDikeProfiles);
-
+            using (var view = new GrassCoverErosionInwardsDikeProfileSelectionDialog(Gui.MainWindow, nodeData.AvailableDikeProfiles))
+            {
+                view.ShowDialog();
+                GenerateCalculations(nodeData.WrappedData, view.SelectedDikeProfiles);
+            }
             nodeData.NotifyObservers();
         }
 
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/GrassCoverErosionInwardsDikeProfileSelectionDialogTest.cs
===================================================================
diff -u -r7d790a82bda0347f47961162de614bacfa8e288c -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/GrassCoverErosionInwardsDikeProfileSelectionDialogTest.cs	(.../GrassCoverErosionInwardsDikeProfileSelectionDialogTest.cs)	(revision 7d790a82bda0347f47961162de614bacfa8e288c)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/GrassCoverErosionInwardsDikeProfileSelectionDialogTest.cs	(.../GrassCoverErosionInwardsDikeProfileSelectionDialogTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -40,7 +40,6 @@
             // Call
             using (var dialog = new GrassCoverErosionInwardsDikeProfileSelectionDialog(new Form(), Enumerable.Empty<DikeProfile>()))
             {
-
                 // Assert
                 Assert.IsEmpty(dialog.SelectedDikeProfiles);
                 Assert.IsInstanceOf<GrassCoverErosionInwardsDikeProfileSelectionView>(new ControlTester("GrassCoverErosionInwardsDikeProfileSelectionView", dialog).TheObject);
@@ -75,9 +74,8 @@
 
             using (var dialog = new GrassCoverErosionInwardsDikeProfileSelectionDialog(new Form(), dikeProfiles))
             {
+                var selectionView = (DataGridView) new ControlTester("DikeProfileDataGrid", dialog).TheObject;
 
-                var selectionView = (DataGridView)new ControlTester("DikeProfileDataGrid", dialog).TheObject;
-
                 dialog.Show();
                 selectionView.Rows[0].Cells[0].Value = true;
 
@@ -89,11 +87,6 @@
             }
         }
 
-        private Point2D CreateTestPoint()
-        {
-            return new Point2D(0,0);
-        }
-
         [Test]
         public void GivenDialogWithSelectedDikeProfiles_WhenCancelButtonClicked_ThenReturnsSelectedCollection()
         {
@@ -107,7 +100,7 @@
 
             using (var dialog = new GrassCoverErosionInwardsDikeProfileSelectionDialog(new Form(), dikeProfiles))
             {
-                var selectionView = (DataGridView)new ControlTester("DikeProfileDataGrid", dialog).TheObject;
+                var selectionView = (DataGridView) new ControlTester("DikeProfileDataGrid", dialog).TheObject;
 
                 dialog.Show();
                 selectionView.Rows[0].Cells[0].Value = true;
@@ -134,7 +127,7 @@
 
             using (var dialog = new GrassCoverErosionInwardsDikeProfileSelectionDialog(new Form(), dikeProfiles))
             {
-                var selectionView = (DataGridView)new ControlTester("DikeProfileDataGrid", dialog).TheObject;
+                var selectionView = (DataGridView) new ControlTester("DikeProfileDataGrid", dialog).TheObject;
 
                 dialog.Show();
                 selectionView.Rows[0].Cells[0].Value = true;
@@ -150,6 +143,11 @@
                     selectedDikeProfile
                 }, result);
             }
-        } 
+        }
+
+        private Point2D CreateTestPoint()
+        {
+            return new Point2D(0, 0);
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r82136d8f4a3bb2c3a7669e788b62a1578e82c1f2 -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs)	(revision 82136d8f4a3bb2c3a7669e788b62a1578e82c1f2)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -170,7 +170,6 @@
         {
             // Setup
             var guiMock = mocks.StrictMock<IGui>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             var calculation = new GrassCoverErosionInwardsCalculation();
@@ -191,15 +190,18 @@
             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);
 
-            mocks.ReplayAll();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilderMock);
 
-            plugin.Gui = guiMock;
+                mocks.ReplayAll();
 
-            // Call
-            info.ContextMenuStrip(nodeData, null, treeViewControlMock);
+                plugin.Gui = guiMock;
 
+                // Call
+                info.ContextMenuStrip(nodeData, null, treeViewControl);
+            }
             // Assert
             mocks.VerifyAll(); // Expect no calls on arguments
         }
@@ -209,76 +211,79 @@
         {
             // Setup
             var guiMock = mocks.StrictMock<IGui>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             var calculation = new GrassCoverErosionInwardsCalculation();
             var nodeData = new GrassCoverErosionInwardsCalculationContext(calculation, failureMechanism, assessmentSectionMock);
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
             string validFilePath = Path.Combine(testDataPath, "complete.sqlite");
 
-            guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(menuBuilder);
-            assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase
+            using (var treeViewControl = new TreeViewControl())
             {
-                FilePath = validFilePath,
-                Version = "random"
-            });
+                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder);
+                assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase
+                {
+                    FilePath = validFilePath,
+                    Version = "random"
+                });
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            plugin.Gui = guiMock;
-            failureMechanism.AddSection(new FailureMechanismSection("test", new[]
-            {
-                new Point2D(0, 0)
-            }));
+                plugin.Gui = guiMock;
+                failureMechanism.AddSection(new FailureMechanismSection("test", new[]
+                {
+                    new Point2D(0, 0)
+                }));
 
-            // Call
-            var menu = info.ContextMenuStrip(nodeData, assessmentSectionMock, treeViewControlMock);
+                // Call
+                var menu = info.ContextMenuStrip(nodeData, assessmentSectionMock, treeViewControl);
 
-            // Assert
-            Assert.AreEqual(6, menu.Items.Count);
+                // Assert
+                Assert.AreEqual(6, menu.Items.Count);
 
-            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateIndex,
-                                                          RingtoetsCommonFormsResources.Calculate,
-                                                          RingtoetsCommonFormsResources.Calculate_ToolTip,
-                                                          RingtoetsCommonFormsResources.CalculateIcon);
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateIndex,
+                                                              RingtoetsCommonFormsResources.Calculate,
+                                                              RingtoetsCommonFormsResources.Calculate_ToolTip,
+                                                              RingtoetsCommonFormsResources.CalculateIcon);
 
-            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearIndex,
-                                                          RingtoetsCommonFormsResources.Clear_output,
-                                                          RingtoetsCommonFormsResources.ClearOutput_No_output_to_clear,
-                                                          RingtoetsCommonFormsResources.ClearIcon,
-                                                          false);
-
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearIndex,
+                                                              RingtoetsCommonFormsResources.Clear_output,
+                                                              RingtoetsCommonFormsResources.ClearOutput_No_output_to_clear,
+                                                              RingtoetsCommonFormsResources.ClearIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
         [Test]
         public void ContextMenuStrip_NoFailureMechanismSections_ContextMenuItemPerformCalculationDisabledAndTooltipSet()
         {
             // Setup
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             var calculation = new GrassCoverErosionInwardsCalculation();
 
             var nodeData = new GrassCoverErosionInwardsCalculationContext(calculation, failureMechanism, assessmentSectionMock);
             var guiMock = mocks.StrictMock<IGui>();
-            guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder());
 
-            mocks.ReplayAll();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
 
-            plugin.Gui = guiMock;
+                mocks.ReplayAll();
 
-            // Call
-            var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock);
+                plugin.Gui = guiMock;
 
-            // Assert
-            TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex,
-                                                          RingtoetsCommonFormsResources.Calculate,
-                                                          RingtoetsCommonFormsResources.GuiPlugin_AllDataAvailable_No_failure_mechanism_sections_imported,
-                                                          RingtoetsCommonFormsResources.CalculateIcon,
-                                                          false);
+                // Call
+                var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
+                // Assert
+                TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex,
+                                                              RingtoetsCommonFormsResources.Calculate,
+                                                              RingtoetsCommonFormsResources.GuiPlugin_AllDataAvailable_No_failure_mechanism_sections_imported,
+                                                              RingtoetsCommonFormsResources.CalculateIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
@@ -287,7 +292,6 @@
         {
             // Setup
             var guiMock = mocks.StrictMock<IGui>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
             failureMechanism.AddSection(new FailureMechanismSection("test", new[]
@@ -301,22 +305,24 @@
             var calculation = new GrassCoverErosionInwardsCalculation();
             var nodeData = new GrassCoverErosionInwardsCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
-            guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder());
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            plugin.Gui = guiMock;
+                plugin.Gui = guiMock;
 
-            // Call
-            var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock);
+                // Call
+                var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
-            // Assert
-            TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex,
-                                                          RingtoetsCommonFormsResources.Calculate,
-                                                          RingtoetsCommonFormsResources.GuiPlugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
-                                                          RingtoetsCommonFormsResources.CalculateIcon,
-                                                          false);
-
+                // Assert
+                TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex,
+                                                              RingtoetsCommonFormsResources.Calculate,
+                                                              RingtoetsCommonFormsResources.GuiPlugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
+                                                              RingtoetsCommonFormsResources.CalculateIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
@@ -325,7 +331,6 @@
         {
             // Setup
             var guiMock = mocks.StrictMock<IGui>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
             failureMechanism.AddSection(new FailureMechanismSection("test", new[]
@@ -339,23 +344,25 @@
             var calculation = new GrassCoverErosionInwardsCalculation();
             var nodeData = new GrassCoverErosionInwardsCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
-            guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder());
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            plugin.Gui = guiMock;
+                plugin.Gui = guiMock;
 
-            // Call
-            ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock);
+                // Call
+                ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
-            // Assert
-            ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateIndex];
+                // Assert
+                ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateIndex];
 
-            Assert.AreEqual(RingtoetsCommonFormsResources.Calculate, contextMenuItem.Text);
-            StringAssert.Contains(String.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.CalculateIcon, contextMenuItem.Image);
-            Assert.IsFalse(contextMenuItem.Enabled);
-
+                Assert.AreEqual(RingtoetsCommonFormsResources.Calculate, contextMenuItem.Text);
+                StringAssert.Contains(String.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.CalculateIcon, contextMenuItem.Image);
+                Assert.IsFalse(contextMenuItem.Enabled);
+            }
             mocks.VerifyAll();
         }
 
@@ -364,7 +371,6 @@
         {
             // Setup
             var guiMock = mocks.StrictMock<IGui>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
             string validFilePath = Path.Combine(testDataPath, "complete.sqlite");
 
@@ -386,21 +392,23 @@
             var calculation = new GrassCoverErosionInwardsCalculation();
             var nodeData = new GrassCoverErosionInwardsCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
-            guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder());
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            plugin.Gui = guiMock;
+                plugin.Gui = guiMock;
 
-            // Call
-            var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock);
+                // Call
+                var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
-            // Assert
-            TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex,
-                                                          RingtoetsCommonFormsResources.Calculate,
-                                                          RingtoetsCommonFormsResources.Calculate_ToolTip,
-                                                          RingtoetsCommonFormsResources.CalculateIcon);
-
+                // Assert
+                TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex,
+                                                              RingtoetsCommonFormsResources.Calculate,
+                                                              RingtoetsCommonFormsResources.Calculate_ToolTip,
+                                                              RingtoetsCommonFormsResources.CalculateIcon);
+            }
             mocks.VerifyAll();
         }
 
@@ -411,7 +419,6 @@
             var gui = mocks.DynamicMock<IGui>();
             var mainWindow = mocks.DynamicMock<IMainWindow>();
             var observerMock = mocks.StrictMock<IObserver>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var calculateContextMenuItemIndex = 0;
 
             var section = new FailureMechanismSection("A", new[]
@@ -449,38 +456,40 @@
 
             var calculationContext = new GrassCoverErosionInwardsCalculationContext(calculation, failureMechanism, assessmentSection);
 
-            gui.Expect(g => g.Get(calculationContext, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder());
-            gui.Expect(g => g.MainWindow).Return(mainWindow);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                gui.Expect(g => g.Get(calculationContext, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+                gui.Expect(g => g.MainWindow).Return(mainWindow);
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            plugin.Gui = gui;
+                plugin.Gui = gui;
 
-            calculation.Attach(observerMock);
+                calculation.Attach(observerMock);
 
-            var contextMenuAdapter = info.ContextMenuStrip(calculationContext, null, treeViewControlMock);
+                var contextMenuAdapter = info.ContextMenuStrip(calculationContext, null, treeViewControl);
 
-            DialogBoxHandler = (name, wnd) =>
-            {
-                // Expect an activity dialog which is automatically closed
-            };
+                DialogBoxHandler = (name, wnd) =>
+                {
+                    // Expect an activity dialog which is automatically closed
+                };
 
-            // When
-            Action action = () => { contextMenuAdapter.Items[calculateContextMenuItemIndex].PerformClick(); };
+                // When
+                Action action = () => { contextMenuAdapter.Items[calculateContextMenuItemIndex].PerformClick(); };
 
-            // Then
-            TestHelper.AssertLogMessages(action, messages =>
-            {
-                var msgs = messages.ToArray();
-                StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]);
-                StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]);
-                StringAssert.StartsWith(String.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]);
-                StringAssert.StartsWith(String.Format("De berekening voor grasbekleding erosie kruin en binnentalud '{0}' is niet gelukt.", calculation.Name), msgs[3]);
-                StringAssert.StartsWith(String.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[4]);
-            });
+                // Then
+                TestHelper.AssertLogMessages(action, messages =>
+                {
+                    var msgs = messages.ToArray();
+                    StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]);
+                    StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]);
+                    StringAssert.StartsWith(String.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]);
+                    StringAssert.StartsWith(String.Format("De berekening voor grasbekleding erosie kruin en binnentalud '{0}' is niet gelukt.", calculation.Name), msgs[3]);
+                    StringAssert.StartsWith(String.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[4]);
+                });
 
-            Assert.IsNull(calculation.Output);
-
+                Assert.IsNull(calculation.Output);
+            }
             mocks.VerifyAll();
         }
 
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r82136d8f4a3bb2c3a7669e788b62a1578e82c1f2 -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 82136d8f4a3bb2c3a7669e788b62a1578e82c1f2)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -165,7 +165,7 @@
             var groupContext = new GrassCoverErosionInwardsCalculationGroupContext(group,
                                                                                    failureMechanism,
                                                                                    assessmentSectionMock);
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
+
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
 
             menuBuilderMock.Expect(mb => mb.AddOpenItem()).Return(menuBuilderMock);
@@ -186,12 +186,15 @@
             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(groupContext, treeViewControlMock)).Return(menuBuilderMock);
 
-            mocks.ReplayAll();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(groupContext, treeViewControl)).Return(menuBuilderMock);
+                mocks.ReplayAll();
 
-            // Call
-            info.ContextMenuStrip(groupContext, null, treeViewControlMock);
+                // Call
+                info.ContextMenuStrip(groupContext, null, treeViewControl);
+            }
 
             // Assert
             mocks.VerifyAll();
@@ -207,37 +210,38 @@
             var groupContext = new GrassCoverErosionInwardsCalculationGroupContext(group,
                                                                                    failureMechanism,
                                                                                    assessmentSectionMock);
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
-            var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
-            guiMock.Expect(g => g.Get(groupContext, treeViewControlMock)).Return(menuBuilder);
+                guiMock.Expect(g => g.Get(groupContext, treeViewControl)).Return(menuBuilder);
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            // Call
-            ContextMenuStrip menu = info.ContextMenuStrip(groupContext, null, treeViewControlMock);
+                // Call
+                ContextMenuStrip menu = info.ContextMenuStrip(groupContext, null, treeViewControl);
 
-            // Assert
-            Assert.AreEqual(11, menu.Items.Count);
-            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexRootGroup,
-                RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup,
-                RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip,
-                RingtoetsFormsResources.AddFolderIcon);
-            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexRootGroup,
-                RingtoetsFormsResources.CalculationGroup_Add_Calculation,
-                RingtoetsFormsResources.CalculationGroup_Add_Calculation_Tooltip,
-                RingtoetsFormsResources.FailureMechanismIcon);
-            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup,
-                RingtoetsFormsResources.Calculate_all,
-                RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run,
-                RingtoetsFormsResources.CalculateIcon,
-                false);
-            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup,
-                RingtoetsFormsResources.Clear_all_output,
-                RingtoetsFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear,
-                RingtoetsFormsResources.ClearIcon,
-                false);
-
+                // Assert
+                Assert.AreEqual(11, menu.Items.Count);
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexRootGroup,
+                                                              RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup,
+                                                              RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip,
+                                                              RingtoetsFormsResources.AddFolderIcon);
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexRootGroup,
+                                                              RingtoetsFormsResources.CalculationGroup_Add_Calculation,
+                                                              RingtoetsFormsResources.CalculationGroup_Add_Calculation_Tooltip,
+                                                              RingtoetsFormsResources.FailureMechanismIcon);
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup,
+                                                              RingtoetsFormsResources.Calculate_all,
+                                                              RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run,
+                                                              RingtoetsFormsResources.CalculateIcon,
+                                                              false);
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup,
+                                                              RingtoetsFormsResources.Clear_all_output,
+                                                              RingtoetsFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear,
+                                                              RingtoetsFormsResources.ClearIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
@@ -255,33 +259,34 @@
             var parentGroupContext = new GrassCoverErosionInwardsCalculationGroupContext(parentGroup,
                                                                                          failureMechanism,
                                                                                          assessmentSectionMock);
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
-            var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
 
-            menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddRenameItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddDeleteItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddExpandAllItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilderMock);
-            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(groupContext, treeViewControlMock)).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddRenameItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddDeleteItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddExpandAllItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilderMock);
+                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(groupContext, treeViewControl)).Return(menuBuilderMock);
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            // Call
-            info.ContextMenuStrip(groupContext, parentGroupContext, treeViewControlMock);
-
+                // Call
+                info.ContextMenuStrip(groupContext, parentGroupContext, treeViewControl);
+            }
             // Assert
             mocks.VerifyAll();
         }
@@ -300,39 +305,39 @@
             var parentGroupContext = new GrassCoverErosionInwardsCalculationGroupContext(parentGroup,
                                                                                          failureMechanism,
                                                                                          assessmentSectionMock);
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
-            var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
+                guiMock.Expect(g => g.Get(groupContext, treeViewControl)).Return(menuBuilder);
 
-            guiMock.Expect(g => g.Get(groupContext, treeViewControlMock)).Return(menuBuilder);
+                mocks.ReplayAll();
 
-            mocks.ReplayAll();
+                // Call
+                ContextMenuStrip menu = info.ContextMenuStrip(groupContext, parentGroupContext, treeViewControl);
 
-            // Call
-            ContextMenuStrip menu = info.ContextMenuStrip(groupContext, parentGroupContext, treeViewControlMock);
+                // Assert
+                Assert.AreEqual(9, menu.Items.Count);
 
-            // Assert
-            Assert.AreEqual(9, menu.Items.Count);
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexNestedGroup,
+                                                              RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup,
+                                                              RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip,
+                                                              RingtoetsFormsResources.AddFolderIcon);
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexNestedGroup,
+                                                              RingtoetsFormsResources.CalculationGroup_Add_Calculation,
+                                                              RingtoetsFormsResources.CalculationGroup_Add_Calculation_Tooltip,
+                                                              RingtoetsFormsResources.FailureMechanismIcon);
 
-            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexNestedGroup,
-                                                          RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup,
-                                                          RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip,
-                                                          RingtoetsFormsResources.AddFolderIcon);
-            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexNestedGroup,
-                                                          RingtoetsFormsResources.CalculationGroup_Add_Calculation,
-                                                          RingtoetsFormsResources.CalculationGroup_Add_Calculation_Tooltip,
-                                                          RingtoetsFormsResources.FailureMechanismIcon);
-
-            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexNestedGroup,
-                                                          RingtoetsFormsResources.Calculate_all,
-                                                          RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run,
-                                                          RingtoetsFormsResources.CalculateIcon,
-                                                          false);
-            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexNestedGroup,
-                                                          RingtoetsFormsResources.Clear_all_output,
-                                                          RingtoetsFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear,
-                                                          RingtoetsFormsResources.ClearIcon,
-                                                          false);
-
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexNestedGroup,
+                                                              RingtoetsFormsResources.Calculate_all,
+                                                              RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run,
+                                                              RingtoetsFormsResources.CalculateIcon,
+                                                              false);
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexNestedGroup,
+                                                              RingtoetsFormsResources.Clear_all_output,
+                                                              RingtoetsFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear,
+                                                              RingtoetsFormsResources.ClearIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
@@ -358,25 +363,26 @@
             var applicationFeatureCommandHandlerStub = mocks.Stub<IApplicationFeatureCommands>();
             var exportImportHandlerStub = mocks.Stub<IExportImportCommandHandler>();
             var viewCommandsHandlerMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
-            var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControlMock);
-            guiMock.Expect(g => g.Get(nodeData, treeViewControlMock)).Return(menuBuilder);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControl);
+                guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder);
 
-            treeViewControlMock.Expect(tvc => tvc.CanExpandOrCollapseForData(nodeData)).Repeat.Twice().Return(false);
-            viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false);
+                viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false);
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            // Call
-            ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControlMock);
+                // Call
+                ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
-            // Assert
-            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup,
-                                                          RingtoetsFormsResources.Calculate_all,
-                                                          RingtoetsFormsResources.GuiPlugin_AllDataAvailable_No_failure_mechanism_sections_imported,
-                                                          RingtoetsFormsResources.CalculateAllIcon,
-                                                          false);
+                // Assert
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup,
+                                                              RingtoetsFormsResources.Calculate_all,
+                                                              RingtoetsFormsResources.GuiPlugin_AllDataAvailable_No_failure_mechanism_sections_imported,
+                                                              RingtoetsFormsResources.CalculateAllIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
@@ -409,26 +415,26 @@
             var applicationFeatureCommandHandlerStub = mocks.Stub<IApplicationFeatureCommands>();
             var exportImportHandlerStub = mocks.Stub<IExportImportCommandHandler>();
             var viewCommandsHandlerMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
-            var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControlMock);
-            guiMock.Expect(g => g.Get(nodeData, treeViewControlMock)).Return(menuBuilder);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControl);
+                guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder);
 
-            treeViewControlMock.Expect(tvc => tvc.CanExpandOrCollapseForData(nodeData)).Repeat.Twice().Return(false);
-            viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false);
+                viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false);
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            // Call
-            var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock);
+                // Call
+                var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
-            // Assert
-            TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuClearAllIndexRootGroup,
-                                                          RingtoetsFormsResources.Calculate_all,
-                                                          RingtoetsFormsResources.GuiPlugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
-                                                          RingtoetsFormsResources.CalculateAllIcon,
-                                                          false);
-
+                // Assert
+                TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuClearAllIndexRootGroup,
+                                                              RingtoetsFormsResources.Calculate_all,
+                                                              RingtoetsFormsResources.GuiPlugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
+                                                              RingtoetsFormsResources.CalculateAllIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
@@ -461,27 +467,27 @@
             var applicationFeatureCommandHandlerStub = mocks.Stub<IApplicationFeatureCommands>();
             var exportImportHandlerStub = mocks.Stub<IExportImportCommandHandler>();
             var viewCommandsHandlerMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
-            var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControlMock);
-            guiMock.Expect(g => g.Get(nodeData, treeViewControlMock)).Return(menuBuilder);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControl);
+                guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder);
 
-            treeViewControlMock.Expect(tvc => tvc.CanExpandOrCollapseForData(nodeData)).Repeat.Twice().Return(false);
-            viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false);
+                viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false);
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            // Call
-            ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock);
+                // Call
+                ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
-            // Assert
-            ToolStripItem contextMenuItem = contextMenu.Items[contextMenuClearAllIndexRootGroup];
+                // Assert
+                ToolStripItem contextMenuItem = contextMenu.Items[contextMenuClearAllIndexRootGroup];
 
-            Assert.AreEqual(RingtoetsFormsResources.Calculate_all, contextMenuItem.Text);
-            StringAssert.Contains(string.Format(RingtoetsFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
-            TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.CalculateAllIcon, contextMenuItem.Image);
-            Assert.IsFalse(contextMenuItem.Enabled);
-
+                Assert.AreEqual(RingtoetsFormsResources.Calculate_all, contextMenuItem.Text);
+                StringAssert.Contains(string.Format(RingtoetsFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
+                TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.CalculateAllIcon, contextMenuItem.Image);
+                Assert.IsFalse(contextMenuItem.Enabled);
+            }
             mocks.VerifyAll();
         }
 
@@ -522,27 +528,28 @@
             var applicationFeatureCommandHandlerStub = mocks.Stub<IApplicationFeatureCommands>();
             var exportImportHandlerStub = mocks.Stub<IExportImportCommandHandler>();
             var viewCommandsHandlerMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
-            var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControlMock);
-            guiMock.Expect(g => g.Get(nodeData, treeViewControlMock)).Return(menuBuilder);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControl);
+                guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder);
 
-            treeViewControlMock.Expect(tvc => tvc.CanExpandOrCollapseForData(nodeData)).Repeat.Twice().Return(false);
-            viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false);
+                viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false);
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            // Call
-            ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControlMock);
+                // Call
+                ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
-            // Assert
-            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup,
-                                                          RingtoetsFormsResources.Calculate_all,
-                                                          RingtoetsFormsResources.CalculationGroup_CalculateAll_ToolTip,
-                                                          RingtoetsFormsResources.CalculateIcon);
+                // Assert
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup,
+                                                              RingtoetsFormsResources.Calculate_all,
+                                                              RingtoetsFormsResources.CalculationGroup_CalculateAll_ToolTip,
+                                                              RingtoetsFormsResources.CalculateIcon);
+            }
             mocks.VerifyAll();
         }
-        
+
         [Test]
         public void ContextMenuStrip_FailureMechanismWithoutDikeProfiles_ContextMenuItemGenerateCalculationsDisabledAndTooltipSet()
         {
@@ -556,31 +563,32 @@
                                                                                failureMechanism,
                                                                                assessmentSectionMock);
 
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
-            var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
-            guiMock.Expect(g => g.Get(nodeData, treeViewControlMock)).Return(menuBuilder);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
+                guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder);
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            // Call
-            var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock);
+                // Call
+                var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
-            // Assert
-            TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuGenerateCalculationsIndexRootGroup,
-                RingtoetsFormsResources.CalculationGroup_Generate_Scenarios,
-                GrassCoverErosionInwardsPluginResources.GrassCoverErosionInwardsGuiPlugin_CreateGenerateCalculationsItem_NoDikeLocations_ToolTip,
-                RingtoetsFormsResources.GenerateScenariosIcon,
-                false);
-
+                // Assert
+                TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuGenerateCalculationsIndexRootGroup,
+                                                              RingtoetsFormsResources.CalculationGroup_Generate_Scenarios,
+                                                              GrassCoverErosionInwardsPluginResources.GrassCoverErosionInwardsGuiPlugin_CreateGenerateCalculationsItem_NoDikeLocations_ToolTip,
+                                                              RingtoetsFormsResources.GenerateScenariosIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
-        
+
         [Test]
         public void ContextMenuStrip_FailureMechanismWithDikeProfiles_ContextMenuItemGenerateCalculationsDisabledAndTooltipSet()
         {
             // Setup
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
-            failureMechanism.DikeProfiles.Add(new DikeProfile(new Point2D(1,2)));
+            failureMechanism.DikeProfiles.Add(new DikeProfile(new Point2D(1, 2)));
 
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             assessmentSectionMock.Stub(asm => asm.HydraulicBoundaryDatabase).Return(null);
@@ -589,21 +597,22 @@
                                                                                failureMechanism,
                                                                                assessmentSectionMock);
 
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
-            var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
-            guiMock.Expect(g => g.Get(nodeData, treeViewControlMock)).Return(menuBuilder);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
+                guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder);
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            // Call
-            var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock);
+                // Call
+                var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
-            // Assert
-            TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuGenerateCalculationsIndexRootGroup,
-                RingtoetsFormsResources.CalculationGroup_Generate_Scenarios,
-                GrassCoverErosionInwardsPluginResources.GrassCoverErosionInwardsGuiPlugin_CreateGenerateCalculationsItem_ToolTip,
-                RingtoetsFormsResources.GenerateScenariosIcon);
-
+                // Assert
+                TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuGenerateCalculationsIndexRootGroup,
+                                                              RingtoetsFormsResources.CalculationGroup_Generate_Scenarios,
+                                                              GrassCoverErosionInwardsPluginResources.GrassCoverErosionInwardsGuiPlugin_CreateGenerateCalculationsItem_ToolTip,
+                                                              RingtoetsFormsResources.GenerateScenariosIcon);
+            }
             mocks.VerifyAll();
         }
 
@@ -612,7 +621,6 @@
         {
             // Setup
             var mainWindowStub = mocks.Stub<IMainWindow>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
@@ -650,43 +658,45 @@
             assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabaseStub;
 
             var groupContext = new GrassCoverErosionInwardsCalculationGroupContext(failureMechanism.CalculationsGroup,
-                                                                           failureMechanism,
-                                                                           assessmentSection);
+                                                                                   failureMechanism,
+                                                                                   assessmentSection);
 
-            guiMock.Expect(g => g.Get(groupContext, treeViewControlMock)).Return(menuBuilder);
-            guiMock.Expect(g => g.MainWindow).Return(mainWindowStub);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(g => g.Get(groupContext, treeViewControl)).Return(menuBuilder);
+                guiMock.Expect(g => g.MainWindow).Return(mainWindowStub);
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            plugin.Gui = guiMock;
-            var contextMenu = info.ContextMenuStrip(groupContext, null, treeViewControlMock);
+                plugin.Gui = guiMock;
+                var contextMenu = info.ContextMenuStrip(groupContext, null, treeViewControl);
 
-            DialogBoxHandler = (name, wnd) =>
-            {
-                // Expect an activity dialog which is automatically closed
-            };
+                DialogBoxHandler = (name, wnd) =>
+                {
+                    // Expect an activity dialog which is automatically closed
+                };
 
-            // Call
-            TestHelper.AssertLogMessages(() => contextMenu.Items[contextMenuCalculateAllIndexRootGroup].PerformClick(), messages =>
-            {
-                var messageList = messages.ToList();
+                // Call
+                TestHelper.AssertLogMessages(() => contextMenu.Items[contextMenuCalculateAllIndexRootGroup].PerformClick(), messages =>
+                {
+                    var messageList = messages.ToList();
 
-                // Assert
-                Assert.AreEqual(12, messageList.Count);
-                StringAssert.StartsWith("Validatie van 'A' gestart om: ", messageList[0]);
-                StringAssert.StartsWith("Validatie van 'A' beëindigd om: ", messageList[1]);
-                StringAssert.StartsWith("Berekening van 'A' gestart om: ", messageList[2]);
-                Assert.AreEqual("De berekening voor grasbekleding erosie kruin en binnentalud 'A' is niet gelukt.", messageList[3]);
-                StringAssert.StartsWith("Berekening van 'A' beëindigd om: ", messageList[4]);
-                StringAssert.StartsWith("Validatie van 'B' gestart om: ", messageList[5]);
-                StringAssert.StartsWith("Validatie van 'B' beëindigd om: ", messageList[6]);
-                StringAssert.StartsWith("Berekening van 'B' gestart om: ", messageList[7]);
-                Assert.AreEqual("De berekening voor grasbekleding erosie kruin en binnentalud 'B' is niet gelukt.", messageList[8]);
-                StringAssert.StartsWith("Berekening van 'B' beëindigd om: ", messageList[9]);
-                Assert.AreEqual("Uitvoeren van 'A' is mislukt.", messageList[10]);
-                Assert.AreEqual("Uitvoeren van 'B' is mislukt.", messageList[11]);
-            });
-
+                    // Assert
+                    Assert.AreEqual(12, messageList.Count);
+                    StringAssert.StartsWith("Validatie van 'A' gestart om: ", messageList[0]);
+                    StringAssert.StartsWith("Validatie van 'A' beëindigd om: ", messageList[1]);
+                    StringAssert.StartsWith("Berekening van 'A' gestart om: ", messageList[2]);
+                    Assert.AreEqual("De berekening voor grasbekleding erosie kruin en binnentalud 'A' is niet gelukt.", messageList[3]);
+                    StringAssert.StartsWith("Berekening van 'A' beëindigd om: ", messageList[4]);
+                    StringAssert.StartsWith("Validatie van 'B' gestart om: ", messageList[5]);
+                    StringAssert.StartsWith("Validatie van 'B' beëindigd om: ", messageList[6]);
+                    StringAssert.StartsWith("Berekening van 'B' gestart om: ", messageList[7]);
+                    Assert.AreEqual("De berekening voor grasbekleding erosie kruin en binnentalud 'B' is niet gelukt.", messageList[8]);
+                    StringAssert.StartsWith("Berekening van 'B' beëindigd om: ", messageList[9]);
+                    Assert.AreEqual("Uitvoeren van 'A' is mislukt.", messageList[10]);
+                    Assert.AreEqual("Uitvoeren van 'B' is mislukt.", messageList[11]);
+                });
+            }
             mocks.VerifyAll();
         }
 
@@ -706,31 +716,32 @@
                 Name = "Nieuwe map"
             };
             var observerMock = mocks.StrictMock<IObserver>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
-
             observerMock.Expect(o => o.UpdateObserver());
-            guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(menuBuilder);
 
-            mocks.ReplayAll();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder);
 
-            group.Children.Add(calculationGroup);
-            nodeData.Attach(observerMock);
+                mocks.ReplayAll();
 
-            ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock);
+                group.Children.Add(calculationGroup);
+                nodeData.Attach(observerMock);
 
-            // Precondition
-            Assert.AreEqual(1, group.Children.Count);
+                ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
-            // Call
-            contextMenu.Items[contextMenuAddCalculationGroupIndexRootGroup].PerformClick();
+                // Precondition
+                Assert.AreEqual(1, group.Children.Count);
 
-            // Assert
-            Assert.AreEqual(2, group.Children.Count);
-            var newlyAddedItem = group.Children.Last();
-            Assert.IsInstanceOf<CalculationGroup>(newlyAddedItem);
-            Assert.AreEqual("Nieuwe map (1)", newlyAddedItem.Name,
-                            "An item with the same name default name already exists, therefore '(1)' needs to be appended.");
+                // Call
+                contextMenu.Items[contextMenuAddCalculationGroupIndexRootGroup].PerformClick();
 
+                // Assert
+                Assert.AreEqual(2, group.Children.Count);
+                var newlyAddedItem = group.Children.Last();
+                Assert.IsInstanceOf<CalculationGroup>(newlyAddedItem);
+                Assert.AreEqual("Nieuwe map (1)", newlyAddedItem.Name,
+                                "An item with the same name default name already exists, therefore '(1)' needs to be appended.");
+            }
             mocks.VerifyAll();
         }
 
@@ -750,31 +761,32 @@
                 Name = "Nieuwe berekening"
             };
             var observerMock = mocks.StrictMock<IObserver>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
-
             observerMock.Expect(o => o.UpdateObserver());
-            guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(menuBuilder);
 
-            mocks.ReplayAll();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder);
 
-            group.Children.Add(calculationItem);
-            nodeData.Attach(observerMock);
+                mocks.ReplayAll();
 
-            var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock);
+                group.Children.Add(calculationItem);
+                nodeData.Attach(observerMock);
 
-            // Precondition
-            Assert.AreEqual(1, group.Children.Count);
+                var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
-            // Call
-            contextMenu.Items[contextMenuAddCalculationIndexRootGroup].PerformClick();
+                // Precondition
+                Assert.AreEqual(1, group.Children.Count);
 
-            // Assert
-            Assert.AreEqual(2, group.Children.Count);
-            var newlyAddedItem = group.Children.Last();
-            Assert.IsInstanceOf<GrassCoverErosionInwardsCalculation>(newlyAddedItem);
-            Assert.AreEqual("Nieuwe berekening (1)", newlyAddedItem.Name,
-                            "An item with the same name default name already exists, therefore '(1)' needs to be appended.");
+                // Call
+                contextMenu.Items[contextMenuAddCalculationIndexRootGroup].PerformClick();
 
+                // Assert
+                Assert.AreEqual(2, group.Children.Count);
+                var newlyAddedItem = group.Children.Last();
+                Assert.IsInstanceOf<GrassCoverErosionInwardsCalculation>(newlyAddedItem);
+                Assert.AreEqual("Nieuwe berekening (1)", newlyAddedItem.Name,
+                                "An item with the same name default name already exists, therefore '(1)' needs to be appended.");
+            }
             mocks.VerifyAll();
         }
 
@@ -806,8 +818,8 @@
                 };
 
                 var nodeData = new GrassCoverErosionInwardsCalculationGroupContext(failureMechanism.CalculationsGroup,
-                                                                 failureMechanism,
-                                                                 assessmentSectionMock);
+                                                                                   failureMechanism,
+                                                                                   assessmentSectionMock);
 
                 var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
                 var mainWindow = mocks.Stub<IMainWindow>();
@@ -822,8 +834,8 @@
 
                 DialogBoxHandler = (name, wnd) =>
                 {
-                    var selectionDialog = (GrassCoverErosionInwardsDikeProfileSelectionDialog)new FormTester(name).TheObject;
-                    var grid = (DataGridView)new ControlTester("DikeProfileDataGrid", selectionDialog).TheObject;
+                    var selectionDialog = (GrassCoverErosionInwardsDikeProfileSelectionDialog) new FormTester(name).TheObject;
+                    var grid = (DataGridView) new ControlTester("DikeProfileDataGrid", selectionDialog).TheObject;
 
                     grid.Rows[0].Cells[0].Value = true;
 
@@ -870,8 +882,8 @@
                 };
 
                 var nodeData = new GrassCoverErosionInwardsCalculationGroupContext(failureMechanism.CalculationsGroup,
-                                                                 failureMechanism,
-                                                                 assessmentSectionMock);
+                                                                                   failureMechanism,
+                                                                                   assessmentSectionMock);
 
                 var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
                 var mainWindow = mocks.Stub<IMainWindow>();
@@ -883,11 +895,11 @@
                 mocks.ReplayAll();
 
                 plugin.Gui = gui;
-                
+
                 DialogBoxHandler = (name, wnd) =>
                 {
-                    var selectionDialog = (GrassCoverErosionInwardsDikeProfileSelectionDialog)new FormTester(name).TheObject;
-                    var grid = (DataGridView)new ControlTester("DikeProfileDataGrid", selectionDialog).TheObject;
+                    var selectionDialog = (GrassCoverErosionInwardsDikeProfileSelectionDialog) new FormTester(name).TheObject;
+                    var grid = (DataGridView) new ControlTester("DikeProfileDataGrid", selectionDialog).TheObject;
 
                     grid.Rows[0].Cells[0].Value = true;
 
@@ -900,8 +912,7 @@
                 contextMenu.Items[contextMenuGenerateCalculationsIndexRootGroup].PerformClick();
 
                 // Then
-                var grassCoverErosionInwardsCalculations = failureMechanism.Calculations.OfType<GrassCoverErosionInwardsCalculation>().ToArray();
-                Assert.AreEqual(0, grassCoverErosionInwardsCalculations.Length);
+                Assert.AreEqual(0, failureMechanism.Calculations.OfType<GrassCoverErosionInwardsCalculation>().Count());
             }
             mocks.VerifyAll();
         }
@@ -939,8 +950,8 @@
                 };
 
                 var nodeData = new GrassCoverErosionInwardsCalculationGroupContext(failureMechanism.CalculationsGroup,
-                                                                 failureMechanism,
-                                                                 assessmentSectionMock);
+                                                                                   failureMechanism,
+                                                                                   assessmentSectionMock);
 
                 var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
                 var mainWindow = mocks.Stub<IMainWindow>();
@@ -952,20 +963,20 @@
                 mocks.ReplayAll();
 
                 plugin.Gui = gui;
-                
+
                 DialogBoxHandler = (name, wnd) =>
                 {
-                    var selectionDialog = (GrassCoverErosionInwardsDikeProfileSelectionDialog)new FormTester(name).TheObject;
-                    var grid = (DataGridView)new ControlTester("DikeProfileDataGrid", selectionDialog).TheObject;
+                    var selectionDialog = (GrassCoverErosionInwardsDikeProfileSelectionDialog) new FormTester(name).TheObject;
+                    var grid = (DataGridView) new ControlTester("DikeProfileDataGrid", selectionDialog).TheObject;
 
                     grid.Rows[0].Cells[0].Value = true;
 
                     new ButtonTester("OkButton", selectionDialog).Click();
                 };
 
-                var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
+                ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
-                var expectedNewName = NamingHelper.GetUniqueName(failureMechanism.CalculationsGroup.Children, existingCalculationName, c => c.Name);
+                string expectedNewName = NamingHelper.GetUniqueName(failureMechanism.CalculationsGroup.Children, existingCalculationName, c => c.Name);
 
                 // When
                 contextMenu.Items[contextMenuGenerateCalculationsIndexRootGroup].PerformClick();
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/ProbabilityAssessmentOutputTreeNodeInfoTest.cs
===================================================================
diff -u -r95e76a7e90e94621a5e9773c2a365fa8e3b6dd31 -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/ProbabilityAssessmentOutputTreeNodeInfoTest.cs	(.../ProbabilityAssessmentOutputTreeNodeInfoTest.cs)	(revision 95e76a7e90e94621a5e9773c2a365fa8e3b6dd31)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/ProbabilityAssessmentOutputTreeNodeInfoTest.cs	(.../ProbabilityAssessmentOutputTreeNodeInfoTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -98,21 +98,23 @@
             // Setup
             var guiMock = mocksRepository.StrictMock<IGui>();
             var menuBuilderMock = mocksRepository.StrictMock<IContextMenuBuilder>();
-            var treeViewControlMock = mocksRepository.StrictMock<TreeViewControl>();
 
             menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock);
             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(null, treeViewControlMock)).Return(menuBuilderMock);
-            mocksRepository.ReplayAll();
 
-            plugin.Gui = guiMock;
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(null, treeViewControl)).Return(menuBuilderMock);
+                mocksRepository.ReplayAll();
 
-            // Call
-            info.ContextMenuStrip(null, null, treeViewControlMock);
+                plugin.Gui = guiMock;
 
+                // Call
+                info.ContextMenuStrip(null, null, treeViewControl);
+            }
             // Assert
             mocksRepository.VerifyAll();
         }
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsDikeProfileSelectionViewTest.cs
===================================================================
diff -u -r7d790a82bda0347f47961162de614bacfa8e288c -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsDikeProfileSelectionViewTest.cs	(.../GrassCoverErosionInwardsDikeProfileSelectionViewTest.cs)	(revision 7d790a82bda0347f47961162de614bacfa8e288c)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsDikeProfileSelectionViewTest.cs	(.../GrassCoverErosionInwardsDikeProfileSelectionViewTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -14,8 +14,6 @@
     public class GrassCoverErosionInwardsDikeProfileSelectionViewTest
     {
         private Form testForm;
-        private const int dikeProfileNameColumnIndex = 1;
-        private const int selectedColumnIndex = 0;
 
         [SetUp]
         public void Setup()
@@ -49,21 +47,19 @@
             // Assert
             ShowPipingCalculationsView(view);
 
-            var dikeProfileDataGrid = (DataGridView)new ControlTester("DikeProfileDataGrid").TheObject;
+            var dikeProfileDataGrid = (DataGridView) new ControlTester("DikeProfileDataGrid").TheObject;
 
             Assert.AreEqual(2, dikeProfileDataGrid.ColumnCount);
             Assert.IsFalse(dikeProfileDataGrid.RowHeadersVisible);
 
-            var selectedColumn = dikeProfileDataGrid.Columns[0] as DataGridViewCheckBoxColumn;
-            var dikeProfileNameColumn = dikeProfileDataGrid.Columns[1] as DataGridViewTextBoxColumn;
+            var selectedColumn = (DataGridViewCheckBoxColumn) dikeProfileDataGrid.Columns[0];
+            var dikeProfileNameColumn = (DataGridViewTextBoxColumn) dikeProfileDataGrid.Columns[1];
 
-            Assert.NotNull(selectedColumn);
             Assert.AreEqual("Selected", selectedColumn.DataPropertyName);
             Assert.AreEqual("Gebruiken", selectedColumn.HeaderText);
             Assert.AreEqual(60, selectedColumn.Width);
             Assert.IsFalse(selectedColumn.ReadOnly);
 
-            Assert.NotNull(dikeProfileNameColumn);
             Assert.AreEqual("Name", dikeProfileNameColumn.DataPropertyName);
             Assert.AreEqual("Dijkprofiel", dikeProfileNameColumn.HeaderText);
             Assert.AreEqual(DataGridViewAutoSizeColumnMode.Fill, dikeProfileNameColumn.AutoSizeMode);
@@ -77,7 +73,7 @@
         {
             // Setup
             var testname = "testName";
-            var ringtoetsGrassCoverErosionInwardsDikeProfile = CreateTestDikeProfile();
+            DikeProfile ringtoetsGrassCoverErosionInwardsDikeProfile = CreateTestDikeProfile();
             ringtoetsGrassCoverErosionInwardsDikeProfile.Name = testname;
 
             // Call
@@ -88,19 +84,19 @@
 
             // Assert
             ShowPipingCalculationsView(view);
-            var dikeProfileDataGrid = (DataGridView)new ControlTester("DikeProfileDataGrid").TheObject;
+            var dikeProfileDataGrid = (DataGridView) new ControlTester("DikeProfileDataGrid").TheObject;
 
             Assert.AreEqual(1, dikeProfileDataGrid.RowCount);
-            Assert.IsFalse((bool)dikeProfileDataGrid.Rows[0].Cells[selectedColumnIndex].Value);
-            Assert.AreEqual(testname, (string)dikeProfileDataGrid.Rows[0].Cells[dikeProfileNameColumnIndex].Value);
+            Assert.IsFalse((bool) dikeProfileDataGrid.Rows[0].Cells[selectedColumnIndex].Value);
+            Assert.AreEqual(testname, (string) dikeProfileDataGrid.Rows[0].Cells[dikeProfileNameColumnIndex].Value);
         }
 
         [Test]
         public void OnSelectAllClicked_WithDikeProfiles_AllDikeProfilesSelected()
         {
             // Setup
-            var ringtoetsGrassCoverErosionInwardsDikeProfile = CreateTestDikeProfile();
-            var ringtoetsGrassCoverErosionInwardsDikeProfile2 = CreateTestDikeProfile();
+            DikeProfile ringtoetsGrassCoverErosionInwardsDikeProfile = CreateTestDikeProfile();
+            DikeProfile ringtoetsGrassCoverErosionInwardsDikeProfile2 = CreateTestDikeProfile();
 
             var view = new GrassCoverErosionInwardsDikeProfileSelectionView(new[]
             {
@@ -115,20 +111,20 @@
             selectAllButtonTester.Click();
 
             // Assert
-            var dikeProfileDataGrid = (DataGridView)new ControlTester("DikeProfileDataGrid").TheObject;
+            var dikeProfileDataGrid = (DataGridView) new ControlTester("DikeProfileDataGrid").TheObject;
             for (int i = 0; i < dikeProfileDataGrid.RowCount; i++)
             {
-                var row = dikeProfileDataGrid.Rows[i];
-                Assert.IsTrue((bool)row.Cells[selectedColumnIndex].Value);
+                DataGridViewRow row = dikeProfileDataGrid.Rows[i];
+                Assert.IsTrue((bool) row.Cells[selectedColumnIndex].Value);
             }
         }
 
         [Test]
         public void OnSelectNoneClicked_WithDikeProfiles_AllDikeProfilesDeselected()
         {
             // Setup
-            var ringtoetsGrassCoverErosionInwardsDikeProfile = CreateTestDikeProfile();
-            var ringtoetsGrassCoverErosionInwardsDikeProfile2 = CreateTestDikeProfile();
+            DikeProfile ringtoetsGrassCoverErosionInwardsDikeProfile = CreateTestDikeProfile();
+            DikeProfile ringtoetsGrassCoverErosionInwardsDikeProfile2 = CreateTestDikeProfile();
 
             var view = new GrassCoverErosionInwardsDikeProfileSelectionView(new[]
             {
@@ -139,10 +135,10 @@
             ShowPipingCalculationsView(view);
             var selectNoneButtonTester = new ButtonTester("SelectNoneButton");
 
-            var dikeProfileDataGrid = (DataGridView)new ControlTester("DikeProfileDataGrid").TheObject;
+            var dikeProfileDataGrid = (DataGridView) new ControlTester("DikeProfileDataGrid").TheObject;
             for (int i = 0; i < dikeProfileDataGrid.RowCount; i++)
             {
-                var row = dikeProfileDataGrid.Rows[i];
+                DataGridViewRow row = dikeProfileDataGrid.Rows[i];
                 row.Cells[selectedColumnIndex].Value = true;
             }
 
@@ -152,19 +148,19 @@
             // Assert
             for (int i = 0; i < dikeProfileDataGrid.RowCount; i++)
             {
-                var row = dikeProfileDataGrid.Rows[i];
-                Assert.IsFalse((bool)row.Cells[selectedColumnIndex].Value);
+                DataGridViewRow row = dikeProfileDataGrid.Rows[i];
+                Assert.IsFalse((bool) row.Cells[selectedColumnIndex].Value);
             }
         }
 
         [Test]
         public void GetSelectedDikeProfiles_WithDikeProfilesMultipleSelected_ReturnSelectedDikeProfiles()
         {
             // Setup
-            var ringtoetsGrassCoverErosionInwardsDikeProfile = CreateTestDikeProfile();
-            var ringtoetsGrassCoverErosionInwardsDikeProfile2 = CreateTestDikeProfile();
-            var ringtoetsGrassCoverErosionInwardsDikeProfile3 = CreateTestDikeProfile();
-            var ringtoetsGrassCoverErosionInwardsDikeProfile4 = CreateTestDikeProfile();
+            DikeProfile ringtoetsGrassCoverErosionInwardsDikeProfile = CreateTestDikeProfile();
+            DikeProfile ringtoetsGrassCoverErosionInwardsDikeProfile2 = CreateTestDikeProfile();
+            DikeProfile ringtoetsGrassCoverErosionInwardsDikeProfile3 = CreateTestDikeProfile();
+            DikeProfile ringtoetsGrassCoverErosionInwardsDikeProfile4 = CreateTestDikeProfile();
 
             var view = new GrassCoverErosionInwardsDikeProfileSelectionView(new[]
             {
@@ -176,25 +172,29 @@
 
             ShowPipingCalculationsView(view);
 
-            var dikeProfileDataGrid = (DataGridView)new ControlTester("DikeProfileDataGrid").TheObject;
+            var dikeProfileDataGrid = (DataGridView) new ControlTester("DikeProfileDataGrid").TheObject;
             dikeProfileDataGrid.Rows[1].Cells[selectedColumnIndex].Value = true;
             dikeProfileDataGrid.Rows[3].Cells[selectedColumnIndex].Value = true;
 
             // Call
             IEnumerable<DikeProfile> dikeProfiles = view.GetSelectedDikeProfiles();
 
             // Assert
-            CollectionAssert.AreEqual(new[] { ringtoetsGrassCoverErosionInwardsDikeProfile2, ringtoetsGrassCoverErosionInwardsDikeProfile4 }, dikeProfiles);
+            CollectionAssert.AreEqual(new[]
+            {
+                ringtoetsGrassCoverErosionInwardsDikeProfile2,
+                ringtoetsGrassCoverErosionInwardsDikeProfile4
+            }, dikeProfiles);
         }
 
         [Test]
         public void GetSelectedDikeProfiles_WithDikeProfilesNoneSelected_ReturnEmptyDikeProfilesCollection()
         {
             // Setup
-            var ringtoetsGrassCoverErosionInwardsDikeProfile = CreateTestDikeProfile();
-            var ringtoetsGrassCoverErosionInwardsDikeProfile2 = CreateTestDikeProfile();
-            var ringtoetsGrassCoverErosionInwardsDikeProfile3 = CreateTestDikeProfile();
-            var ringtoetsGrassCoverErosionInwardsDikeProfile4 = CreateTestDikeProfile();
+            DikeProfile ringtoetsGrassCoverErosionInwardsDikeProfile = CreateTestDikeProfile();
+            DikeProfile ringtoetsGrassCoverErosionInwardsDikeProfile2 = CreateTestDikeProfile();
+            DikeProfile ringtoetsGrassCoverErosionInwardsDikeProfile3 = CreateTestDikeProfile();
+            DikeProfile ringtoetsGrassCoverErosionInwardsDikeProfile4 = CreateTestDikeProfile();
 
             var view = new GrassCoverErosionInwardsDikeProfileSelectionView(new[]
             {
@@ -217,10 +217,10 @@
         public void GetSelectedDikeProfiles_WithDikeProfilesAllSelected_ReturnAllDikeProfiles()
         {
             // Setup
-            var ringtoetsGrassCoverErosionInwardsDikeProfile = CreateTestDikeProfile();
-            var ringtoetsGrassCoverErosionInwardsDikeProfile2 = CreateTestDikeProfile();
-            var ringtoetsGrassCoverErosionInwardsDikeProfile3 = CreateTestDikeProfile();
-            var ringtoetsGrassCoverErosionInwardsDikeProfile4 = CreateTestDikeProfile();
+            DikeProfile ringtoetsGrassCoverErosionInwardsDikeProfile = CreateTestDikeProfile();
+            DikeProfile ringtoetsGrassCoverErosionInwardsDikeProfile2 = CreateTestDikeProfile();
+            DikeProfile ringtoetsGrassCoverErosionInwardsDikeProfile3 = CreateTestDikeProfile();
+            DikeProfile ringtoetsGrassCoverErosionInwardsDikeProfile4 = CreateTestDikeProfile();
 
             var dikeProfileCollection = new[]
             {
@@ -233,7 +233,7 @@
 
             ShowPipingCalculationsView(view);
 
-            var dikeProfileDataGrid = (DataGridView)new ControlTester("DikeProfileDataGrid").TheObject;
+            var dikeProfileDataGrid = (DataGridView) new ControlTester("DikeProfileDataGrid").TheObject;
             dikeProfileDataGrid.Rows[0].Cells[selectedColumnIndex].Value = true;
             dikeProfileDataGrid.Rows[1].Cells[selectedColumnIndex].Value = true;
             dikeProfileDataGrid.Rows[2].Cells[selectedColumnIndex].Value = true;
@@ -261,15 +261,18 @@
             Assert.IsEmpty(dikeProfiles);
         }
 
+        private const int dikeProfileNameColumnIndex = 1;
+        private const int selectedColumnIndex = 0;
+
         private DikeProfile CreateTestDikeProfile()
         {
-            return new DikeProfile(new Point2D(0,0));
+            return new DikeProfile(new Point2D(0, 0));
         }
 
         private void ShowPipingCalculationsView(GrassCoverErosionInwardsDikeProfileSelectionView pipingCalculationsView)
         {
             testForm.Controls.Add(pipingCalculationsView);
             testForm.Show();
-        } 
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/EmptyProbabilityAssessmentOutputTreeNodeInfoTest.cs
===================================================================
diff -u -rcfbc63bdf527a3b6b51c6bfb5442eecd8c7a9c37 -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/EmptyProbabilityAssessmentOutputTreeNodeInfoTest.cs	(.../EmptyProbabilityAssessmentOutputTreeNodeInfoTest.cs)	(revision cfbc63bdf527a3b6b51c6bfb5442eecd8c7a9c37)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/EmptyProbabilityAssessmentOutputTreeNodeInfoTest.cs	(.../EmptyProbabilityAssessmentOutputTreeNodeInfoTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -52,21 +52,23 @@
             // Setup
             var guiMock = mocksRepository.StrictMock<IGui>();
             var menuBuilderMock = mocksRepository.StrictMock<IContextMenuBuilder>();
-            var treeViewControlMock = mocksRepository.StrictMock<TreeViewControl>();
 
             menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock);
             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(null, treeViewControlMock)).Return(menuBuilderMock);
-            mocksRepository.ReplayAll();
 
-            plugin.Gui = guiMock;
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(null, treeViewControl)).Return(menuBuilderMock);
+                mocksRepository.ReplayAll();
 
-            // Call
-            info.ContextMenuStrip(null, null, treeViewControlMock);
+                plugin.Gui = guiMock;
 
+                // Call
+                info.ContextMenuStrip(null, null, treeViewControl);
+            }
             // Assert
             mocksRepository.VerifyAll();
         }
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/FailureMechanismResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4d2271ee60b40225ccfeb4a8eadc40c7e0fae357 -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/FailureMechanismResultContextTreeNodeInfoTest.cs	(.../FailureMechanismResultContextTreeNodeInfoTest.cs)	(revision 4d2271ee60b40225ccfeb4a8eadc40c7e0fae357)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/FailureMechanismResultContextTreeNodeInfoTest.cs	(.../FailureMechanismResultContextTreeNodeInfoTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -99,22 +99,25 @@
         {
             // Setup
             var guiMock = mocks.StrictMock<IGui>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
+
             var failureMechanism = new HeightStructuresFailureMechanism();
             var nodeData = new FailureMechanismSectionResultContext<HeightStructuresFailureMechanismSectionResult>(Enumerable.Empty<HeightStructuresFailureMechanismSectionResult>(), failureMechanism);
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
 
             menuBuilderMock.Expect(mb => mb.AddOpenItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.Build()).Return(null);
-            guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(menuBuilderMock);
 
-            mocks.ReplayAll();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilderMock);
 
-            plugin.Gui = guiMock;
+                mocks.ReplayAll();
 
-            // Call
-            info.ContextMenuStrip(nodeData, null, treeViewControlMock);
+                plugin.Gui = guiMock;
 
+                // Call
+                info.ContextMenuStrip(nodeData, null, treeViewControl);
+            }
             // Assert
             mocks.VerifyAll(); // Expect no calls on arguments
         }
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r5e6eacaf76f765ba77febee673e9e94895e46feb -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 5e6eacaf76f765ba77febee673e9e94895e46feb)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -170,7 +170,6 @@
         {
             // Setup
             var guiMock = mocks.StrictMock<IGui>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var failureMechanism = new HeightStructuresFailureMechanism();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             var calculation = new HeightStructuresCalculation();
@@ -191,15 +190,18 @@
             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);
 
-            mocks.ReplayAll();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilderMock);
 
-            plugin.Gui = guiMock;
+                mocks.ReplayAll();
 
-            // Call
-            info.ContextMenuStrip(nodeData, null, treeViewControlMock);
+                plugin.Gui = guiMock;
 
+                // Call
+                info.ContextMenuStrip(nodeData, null, treeViewControl);
+            }
             // Assert
             mocks.VerifyAll(); // Expect no calls on arguments
         }
@@ -209,67 +211,70 @@
         {
             // Setup
             var guiMock = mocks.StrictMock<IGui>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var failureMechanism = new HeightStructuresFailureMechanism();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             var calculation = new HeightStructuresCalculation();
             var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
-            guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(menuBuilder);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder);
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            plugin.Gui = guiMock;
+                plugin.Gui = guiMock;
 
-            // Call
-            var menu = info.ContextMenuStrip(nodeData, assessmentSectionMock, treeViewControlMock);
+                // Call
+                var menu = info.ContextMenuStrip(nodeData, assessmentSectionMock, treeViewControl);
 
-            // Assert
-            Assert.AreEqual(6, menu.Items.Count);
+                // Assert
+                Assert.AreEqual(6, menu.Items.Count);
 
-            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateIndex,
-                                                          RingtoetsCommonFormsResources.Calculate,
-                                                          RingtoetsCommonFormsResources.GuiPlugin_AllDataAvailable_No_failure_mechanism_sections_imported,
-                                                          RingtoetsCommonFormsResources.CalculateIcon,
-                                                          false);
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateIndex,
+                                                              RingtoetsCommonFormsResources.Calculate,
+                                                              RingtoetsCommonFormsResources.GuiPlugin_AllDataAvailable_No_failure_mechanism_sections_imported,
+                                                              RingtoetsCommonFormsResources.CalculateIcon,
+                                                              false);
 
-            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearIndex,
-                                                          RingtoetsCommonFormsResources.Clear_output,
-                                                          RingtoetsCommonFormsResources.ClearOutput_No_output_to_clear,
-                                                          RingtoetsCommonFormsResources.ClearIcon,
-                                                          false);
-
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearIndex,
+                                                              RingtoetsCommonFormsResources.Clear_output,
+                                                              RingtoetsCommonFormsResources.ClearOutput_No_output_to_clear,
+                                                              RingtoetsCommonFormsResources.ClearIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
         [Test]
         public void ContextMenuStrip_NoFailureMechanismSections_ContextMenuItemPerformCalculationDisabledAndTooltipSet()
         {
             // Setup
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var failureMechanism = new HeightStructuresFailureMechanism();
             var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
             var calculation = new HeightStructuresCalculation();
 
             var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
             var guiMock = mocks.StrictMock<IGui>();
-            guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder());
 
-            mocks.ReplayAll();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
 
-            plugin.Gui = guiMock;
+                mocks.ReplayAll();
 
-            // Call
-            var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock);
+                plugin.Gui = guiMock;
 
-            // Assert
-            TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex,
-                                                          RingtoetsCommonFormsResources.Calculate,
-                                                          RingtoetsCommonFormsResources.GuiPlugin_AllDataAvailable_No_failure_mechanism_sections_imported,
-                                                          RingtoetsCommonFormsResources.CalculateIcon,
-                                                          false);
+                // Call
+                var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
+                // Assert
+                TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex,
+                                                              RingtoetsCommonFormsResources.Calculate,
+                                                              RingtoetsCommonFormsResources.GuiPlugin_AllDataAvailable_No_failure_mechanism_sections_imported,
+                                                              RingtoetsCommonFormsResources.CalculateIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
@@ -278,7 +283,6 @@
         {
             // Setup
             var guiMock = mocks.StrictMock<IGui>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
             failureMechanism.AddSection(new FailureMechanismSection("test", new[]
@@ -292,22 +296,24 @@
             var calculation = new HeightStructuresCalculation();
             var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
-            guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder());
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            plugin.Gui = guiMock;
+                plugin.Gui = guiMock;
 
-            // Call
-            var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock);
+                // Call
+                var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
-            // Assert
-            TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex,
-                                                          RingtoetsCommonFormsResources.Calculate,
-                                                          RingtoetsCommonFormsResources.GuiPlugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
-                                                          RingtoetsCommonFormsResources.CalculateIcon,
-                                                          false);
-
+                // Assert
+                TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex,
+                                                              RingtoetsCommonFormsResources.Calculate,
+                                                              RingtoetsCommonFormsResources.GuiPlugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
+                                                              RingtoetsCommonFormsResources.CalculateIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
@@ -316,7 +322,6 @@
         {
             // Setup
             var guiMock = mocks.StrictMock<IGui>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
             failureMechanism.AddSection(new FailureMechanismSection("test", new[]
@@ -330,23 +335,25 @@
             var calculation = new HeightStructuresCalculation();
             var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
-            guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder());
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            plugin.Gui = guiMock;
+                plugin.Gui = guiMock;
 
-            // Call
-            ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock);
+                // Call
+                ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
-            // Assert
-            ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateIndex];
+                // Assert
+                ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateIndex];
 
-            Assert.AreEqual(RingtoetsCommonFormsResources.Calculate, contextMenuItem.Text);
-            StringAssert.Contains(String.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
-            TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.CalculateIcon, contextMenuItem.Image);
-            Assert.IsFalse(contextMenuItem.Enabled);
-
+                Assert.AreEqual(RingtoetsCommonFormsResources.Calculate, contextMenuItem.Text);
+                StringAssert.Contains(String.Format(RingtoetsCommonFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
+                TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.CalculateIcon, contextMenuItem.Image);
+                Assert.IsFalse(contextMenuItem.Enabled);
+            }
             mocks.VerifyAll();
         }
 
@@ -355,7 +362,6 @@
         {
             // Setup
             var guiMock = mocks.StrictMock<IGui>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
             string validFilePath = Path.Combine(testDataPath, "complete.sqlite");
 
@@ -377,21 +383,23 @@
             var calculation = new HeightStructuresCalculation();
             var nodeData = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSectionMock);
 
-            guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder());
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            plugin.Gui = guiMock;
+                plugin.Gui = guiMock;
 
-            // Call
-            var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock);
+                // Call
+                var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
-            // Assert
-            TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex,
-                                                          RingtoetsCommonFormsResources.Calculate,
-                                                          RingtoetsCommonFormsResources.Calculate_ToolTip,
-                                                          RingtoetsCommonFormsResources.CalculateIcon);
-
+                // Assert
+                TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateIndex,
+                                                              RingtoetsCommonFormsResources.Calculate,
+                                                              RingtoetsCommonFormsResources.Calculate_ToolTip,
+                                                              RingtoetsCommonFormsResources.CalculateIcon);
+            }
             mocks.VerifyAll();
         }
 
@@ -402,7 +410,6 @@
             var gui = mocks.DynamicMock<IGui>();
             var mainWindow = mocks.DynamicMock<IMainWindow>();
             var observerMock = mocks.StrictMock<IObserver>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var calculateContextMenuItemIndex = 0;
 
             var section = new FailureMechanismSection("A", new[]
@@ -439,38 +446,40 @@
 
             var calculationContext = new HeightStructuresCalculationContext(calculation, failureMechanism, assessmentSection);
 
-            gui.Expect(g => g.Get(calculationContext, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder());
-            gui.Expect(g => g.MainWindow).Return(mainWindow);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                gui.Expect(g => g.Get(calculationContext, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
+                gui.Expect(g => g.MainWindow).Return(mainWindow);
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            plugin.Gui = gui;
+                plugin.Gui = gui;
 
-            calculation.Attach(observerMock);
+                calculation.Attach(observerMock);
 
-            var contextMenuAdapter = info.ContextMenuStrip(calculationContext, null, treeViewControlMock);
+                var contextMenuAdapter = info.ContextMenuStrip(calculationContext, null, treeViewControl);
 
-            DialogBoxHandler = (name, wnd) =>
-            {
-                // Expect an activity dialog which is automatically closed
-            };
+                DialogBoxHandler = (name, wnd) =>
+                {
+                    // Expect an activity dialog which is automatically closed
+                };
 
-            // When
-            Action action = () => { contextMenuAdapter.Items[calculateContextMenuItemIndex].PerformClick(); };
+                // When
+                Action action = () => { contextMenuAdapter.Items[calculateContextMenuItemIndex].PerformClick(); };
 
-            // Then
-            TestHelper.AssertLogMessages(action, messages =>
-            {
-                var msgs = messages.ToArray();
-                StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]);
-                StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]);
-                StringAssert.StartsWith(String.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]);
-                StringAssert.StartsWith(String.Format("De berekening voor hoogte kunstwerk '{0}' is niet gelukt.", calculation.Name), msgs[3]);
-                StringAssert.StartsWith(String.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[4]);
-            });
+                // Then
+                TestHelper.AssertLogMessages(action, messages =>
+                {
+                    var msgs = messages.ToArray();
+                    StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]);
+                    StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]);
+                    StringAssert.StartsWith(String.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[2]);
+                    StringAssert.StartsWith(String.Format("De berekening voor hoogte kunstwerk '{0}' is niet gelukt.", calculation.Name), msgs[3]);
+                    StringAssert.StartsWith(String.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[4]);
+                });
 
-            Assert.IsNull(calculation.Output);
-
+                Assert.IsNull(calculation.Output);
+            }
             mocks.VerifyAll();
         }
 
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r5e6eacaf76f765ba77febee673e9e94895e46feb -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 5e6eacaf76f765ba77febee673e9e94895e46feb)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -162,7 +162,6 @@
             var groupContext = new HeightStructuresCalculationGroupContext(group,
                                                                            failureMechanism,
                                                                            assessmentSectionMock);
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
 
             menuBuilderMock.Expect(mb => mb.AddOpenItem()).Return(menuBuilderMock);
@@ -181,13 +180,16 @@
             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(groupContext, treeViewControlMock)).Return(menuBuilderMock);
 
-            mocks.ReplayAll();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(groupContext, treeViewControl)).Return(menuBuilderMock);
 
-            // Call
-            info.ContextMenuStrip(groupContext, null, treeViewControlMock);
+                mocks.ReplayAll();
 
+                // Call
+                info.ContextMenuStrip(groupContext, null, treeViewControl);
+            }
             // Assert
             mocks.VerifyAll();
         }
@@ -202,39 +204,40 @@
             var groupContext = new HeightStructuresCalculationGroupContext(group,
                                                                            failureMechanism,
                                                                            assessmentSectionMock);
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
-
-            guiMock.Expect(g => g.Get(groupContext, treeViewControlMock)).Return(menuBuilder);
-
+            
             mocks.ReplayAll();
 
-            // Call
-            ContextMenuStrip menu = info.ContextMenuStrip(groupContext, null, treeViewControlMock);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(g => g.Get(groupContext, treeViewControl)).Return(menuBuilder);
 
-            // Assert
-            Assert.AreEqual(9, menu.Items.Count);
+                // Call
+                ContextMenuStrip menu = info.ContextMenuStrip(groupContext, null, treeViewControl);
 
-            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexRootGroup,
-                                                          RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup,
-                                                          RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip,
-                                                          RingtoetsFormsResources.AddFolderIcon);
-            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexRootGroup,
-                                                          RingtoetsFormsResources.CalculationGroup_Add_Calculation,
-                                                          RingtoetsFormsResources.CalculationGroup_Add_Calculation_Tooltip,
-                                                          RingtoetsFormsResources.FailureMechanismIcon);
+                // Assert
+                Assert.AreEqual(9, menu.Items.Count);
 
-            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup,
-                                                          RingtoetsFormsResources.Calculate_all,
-                                                          RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run,
-                                                          RingtoetsFormsResources.CalculateIcon,
-                                                          false);
-            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup,
-                                                          RingtoetsFormsResources.Clear_all_output,
-                                                          RingtoetsFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear,
-                                                          RingtoetsFormsResources.ClearIcon,
-                                                          false);
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexRootGroup,
+                                                              RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup,
+                                                              RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip,
+                                                              RingtoetsFormsResources.AddFolderIcon);
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexRootGroup,
+                                                              RingtoetsFormsResources.CalculationGroup_Add_Calculation,
+                                                              RingtoetsFormsResources.CalculationGroup_Add_Calculation_Tooltip,
+                                                              RingtoetsFormsResources.FailureMechanismIcon);
 
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexRootGroup,
+                                                              RingtoetsFormsResources.Calculate_all,
+                                                              RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run,
+                                                              RingtoetsFormsResources.CalculateIcon,
+                                                              false);
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup,
+                                                              RingtoetsFormsResources.Clear_all_output,
+                                                              RingtoetsFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear,
+                                                              RingtoetsFormsResources.ClearIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
@@ -252,7 +255,6 @@
             var parentGroupContext = new HeightStructuresCalculationGroupContext(parentGroup,
                                                                                  failureMechanism,
                                                                                  assessmentSectionMock);
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
 
             menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
@@ -272,13 +274,16 @@
             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(groupContext, treeViewControlMock)).Return(menuBuilderMock);
 
-            mocks.ReplayAll();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(groupContext, treeViewControl)).Return(menuBuilderMock);
 
-            // Call
-            info.ContextMenuStrip(groupContext, parentGroupContext, treeViewControlMock);
+                mocks.ReplayAll();
 
+                // Call
+                info.ContextMenuStrip(groupContext, parentGroupContext, treeViewControl);
+            }
             // Assert
             mocks.VerifyAll();
         }
@@ -297,39 +302,40 @@
             var parentGroupContext = new HeightStructuresCalculationGroupContext(parentGroup,
                                                                                  failureMechanism,
                                                                                  assessmentSectionMock);
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
-            guiMock.Expect(g => g.Get(groupContext, treeViewControlMock)).Return(menuBuilder);
-
             mocks.ReplayAll();
 
-            // Call
-            ContextMenuStrip menu = info.ContextMenuStrip(groupContext, parentGroupContext, treeViewControlMock);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(g => g.Get(groupContext, treeViewControl)).Return(menuBuilder);
 
-            // Assert
-            Assert.AreEqual(9, menu.Items.Count);
+                // Call
+                ContextMenuStrip menu = info.ContextMenuStrip(groupContext, parentGroupContext, treeViewControl);
 
-            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexNestedGroup,
-                                                          RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup,
-                                                          RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip,
-                                                          RingtoetsFormsResources.AddFolderIcon);
-            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexNestedGroup,
-                                                          RingtoetsFormsResources.CalculationGroup_Add_Calculation,
-                                                          RingtoetsFormsResources.CalculationGroup_Add_Calculation_Tooltip,
-                                                          RingtoetsFormsResources.FailureMechanismIcon);
+                // Assert
+                Assert.AreEqual(9, menu.Items.Count);
 
-            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexNestedGroup,
-                                                          RingtoetsFormsResources.Calculate_all,
-                                                          RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run,
-                                                          RingtoetsFormsResources.CalculateIcon,
-                                                          false);
-            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexNestedGroup,
-                                                          RingtoetsFormsResources.Clear_all_output,
-                                                          RingtoetsFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear,
-                                                          RingtoetsFormsResources.ClearIcon,
-                                                          false);
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexNestedGroup,
+                                                              RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup,
+                                                              RingtoetsFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip,
+                                                              RingtoetsFormsResources.AddFolderIcon);
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndexNestedGroup,
+                                                              RingtoetsFormsResources.CalculationGroup_Add_Calculation,
+                                                              RingtoetsFormsResources.CalculationGroup_Add_Calculation_Tooltip,
+                                                              RingtoetsFormsResources.FailureMechanismIcon);
 
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndexNestedGroup,
+                                                              RingtoetsFormsResources.Calculate_all,
+                                                              RingtoetsFormsResources.CalculationGroup_CalculateAll_No_calculations_to_run,
+                                                              RingtoetsFormsResources.CalculateIcon,
+                                                              false);
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexNestedGroup,
+                                                              RingtoetsFormsResources.Clear_all_output,
+                                                              RingtoetsFormsResources.CalculationGroup_ClearOutput_No_calculation_with_output_to_clear,
+                                                              RingtoetsFormsResources.ClearIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
@@ -355,25 +361,26 @@
             var applicationFeatureCommandHandlerStub = mocks.Stub<IApplicationFeatureCommands>();
             var exportImportHandlerStub = mocks.Stub<IExportImportCommandHandler>();
             var viewCommandsHandlerMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
-            var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControlMock);
-            guiMock.Expect(g => g.Get(nodeData, treeViewControlMock)).Return(menuBuilder);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControl);
+                guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder);
 
-            treeViewControlMock.Expect(tvc => tvc.CanExpandOrCollapseForData(nodeData)).Repeat.Twice().Return(false);
-            viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false);
+                viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false);
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            // Call
-            ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControlMock);
+                // Call
+                ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
-            // Assert
-            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup,
-                                                          RingtoetsFormsResources.Calculate_all,
-                                                          RingtoetsFormsResources.GuiPlugin_AllDataAvailable_No_failure_mechanism_sections_imported,
-                                                          RingtoetsFormsResources.CalculateAllIcon,
-                                                          false);
+                // Assert
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup,
+                                                              RingtoetsFormsResources.Calculate_all,
+                                                              RingtoetsFormsResources.GuiPlugin_AllDataAvailable_No_failure_mechanism_sections_imported,
+                                                              RingtoetsFormsResources.CalculateAllIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
@@ -406,26 +413,26 @@
             var applicationFeatureCommandHandlerStub = mocks.Stub<IApplicationFeatureCommands>();
             var exportImportHandlerStub = mocks.Stub<IExportImportCommandHandler>();
             var viewCommandsHandlerMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
-            var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControlMock);
-            guiMock.Expect(g => g.Get(nodeData, treeViewControlMock)).Return(menuBuilder);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControl);
+                guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder);
 
-            treeViewControlMock.Expect(tvc => tvc.CanExpandOrCollapseForData(nodeData)).Repeat.Twice().Return(false);
-            viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false);
+                viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false);
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            // Call
-            var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock);
+                // Call
+                var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
-            // Assert
-            TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuClearAllIndexRootGroup,
-                                                          RingtoetsFormsResources.Calculate_all,
-                                                          RingtoetsFormsResources.GuiPlugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
-                                                          RingtoetsFormsResources.CalculateAllIcon,
-                                                          false);
-
+                // Assert
+                TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuClearAllIndexRootGroup,
+                                                              RingtoetsFormsResources.Calculate_all,
+                                                              RingtoetsFormsResources.GuiPlugin_AllDataAvailable_No_hydraulic_boundary_database_imported,
+                                                              RingtoetsFormsResources.CalculateAllIcon,
+                                                              false);
+            }
             mocks.VerifyAll();
         }
 
@@ -458,27 +465,27 @@
             var applicationFeatureCommandHandlerStub = mocks.Stub<IApplicationFeatureCommands>();
             var exportImportHandlerStub = mocks.Stub<IExportImportCommandHandler>();
             var viewCommandsHandlerMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
-            var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControlMock);
-            guiMock.Expect(g => g.Get(nodeData, treeViewControlMock)).Return(menuBuilder);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControl);
+                guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder);
 
-            treeViewControlMock.Expect(tvc => tvc.CanExpandOrCollapseForData(nodeData)).Repeat.Twice().Return(false);
-            viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false);
+                viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false);
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            // Call
-            ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock);
+                // Call
+                ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
-            // Assert
-            ToolStripItem contextMenuItem = contextMenu.Items[contextMenuClearAllIndexRootGroup];
+                // Assert
+                ToolStripItem contextMenuItem = contextMenu.Items[contextMenuClearAllIndexRootGroup];
 
-            Assert.AreEqual(RingtoetsFormsResources.Calculate_all, contextMenuItem.Text);
-            StringAssert.Contains(string.Format(RingtoetsFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
-            TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.CalculateAllIcon, contextMenuItem.Image);
-            Assert.IsFalse(contextMenuItem.Enabled);
-
+                Assert.AreEqual(RingtoetsFormsResources.Calculate_all, contextMenuItem.Text);
+                StringAssert.Contains(string.Format(RingtoetsFormsResources.Hydraulic_boundary_database_connection_failed_0_, ""), contextMenuItem.ToolTipText);
+                TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.CalculateAllIcon, contextMenuItem.Image);
+                Assert.IsFalse(contextMenuItem.Enabled);
+            }
             mocks.VerifyAll();
         }
 
@@ -519,24 +526,25 @@
             var applicationFeatureCommandHandlerStub = mocks.Stub<IApplicationFeatureCommands>();
             var exportImportHandlerStub = mocks.Stub<IExportImportCommandHandler>();
             var viewCommandsHandlerMock = mocks.StrictMock<IViewCommands>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
-            var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControlMock);
-            guiMock.Expect(g => g.Get(nodeData, treeViewControlMock)).Return(menuBuilder);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandlerStub, exportImportHandlerStub, viewCommandsHandlerMock, nodeData, treeViewControl);
+                guiMock.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder);
 
-            treeViewControlMock.Expect(tvc => tvc.CanExpandOrCollapseForData(nodeData)).Repeat.Twice().Return(false);
-            viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false);
+                viewCommandsHandlerMock.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(false);
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            // Call
-            ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControlMock);
+                // Call
+                ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
-            // Assert
-            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup,
-                                                          RingtoetsFormsResources.Calculate_all,
-                                                          RingtoetsFormsResources.CalculationGroup_CalculateAll_ToolTip,
-                                                          RingtoetsFormsResources.CalculateIcon);
+                // Assert
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearAllIndexRootGroup,
+                                                              RingtoetsFormsResources.Calculate_all,
+                                                              RingtoetsFormsResources.CalculationGroup_CalculateAll_ToolTip,
+                                                              RingtoetsFormsResources.CalculateIcon);
+            }
             mocks.VerifyAll();
         }
 
@@ -545,7 +553,6 @@
         {
             // Setup
             var mainWindowStub = mocks.Stub<IMainWindow>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var menuBuilder = new CustomItemsOnlyContextMenuBuilder();
 
             var failureMechanism = new HeightStructuresFailureMechanism();
@@ -584,40 +591,42 @@
                                                                            failureMechanism,
                                                                            assessmentSection);
 
-            guiMock.Expect(g => g.Get(groupContext, treeViewControlMock)).Return(menuBuilder);
-            guiMock.Expect(g => g.MainWindow).Return(mainWindowStub);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(g => g.Get(groupContext, treeViewControl)).Return(menuBuilder);
+                guiMock.Expect(g => g.MainWindow).Return(mainWindowStub);
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            plugin.Gui = guiMock;
-            var contextMenu = info.ContextMenuStrip(groupContext, null, treeViewControlMock);
+                plugin.Gui = guiMock;
+                var contextMenu = info.ContextMenuStrip(groupContext, null, treeViewControl);
 
-            DialogBoxHandler = (name, wnd) =>
-            {
-                // Expect an activity dialog which is automatically closed
-            };
+                DialogBoxHandler = (name, wnd) =>
+                {
+                    // Expect an activity dialog which is automatically closed
+                };
 
-            // Call
-            TestHelper.AssertLogMessages(() => contextMenu.Items[contextMenuCalculateAllIndexRootGroup].PerformClick(), messages =>
-            {
-                var messageList = messages.ToList();
+                // Call
+                TestHelper.AssertLogMessages(() => contextMenu.Items[contextMenuCalculateAllIndexRootGroup].PerformClick(), messages =>
+                {
+                    var messageList = messages.ToList();
 
-                // Assert
-                Assert.AreEqual(12, messageList.Count);
-                StringAssert.StartsWith("Validatie van 'A' gestart om: ", messageList[0]);
-                StringAssert.StartsWith("Validatie van 'A' beëindigd om: ", messageList[1]);
-                StringAssert.StartsWith("Berekening van 'A' gestart om: ", messageList[2]);
-                Assert.AreEqual("De berekening voor hoogte kunstwerk 'A' is niet gelukt.", messageList[3]);
-                StringAssert.StartsWith("Berekening van 'A' beëindigd om: ", messageList[4]);
-                StringAssert.StartsWith("Validatie van 'B' gestart om: ", messageList[5]);
-                StringAssert.StartsWith("Validatie van 'B' beëindigd om: ", messageList[6]);
-                StringAssert.StartsWith("Berekening van 'B' gestart om: ", messageList[7]);
-                Assert.AreEqual("De berekening voor hoogte kunstwerk 'B' is niet gelukt.", messageList[8]);
-                StringAssert.StartsWith("Berekening van 'B' beëindigd om: ", messageList[9]);
-                Assert.AreEqual("Uitvoeren van 'A' is mislukt.", messageList[10]);
-                Assert.AreEqual("Uitvoeren van 'B' is mislukt.", messageList[11]);
-            });
-
+                    // Assert
+                    Assert.AreEqual(12, messageList.Count);
+                    StringAssert.StartsWith("Validatie van 'A' gestart om: ", messageList[0]);
+                    StringAssert.StartsWith("Validatie van 'A' beëindigd om: ", messageList[1]);
+                    StringAssert.StartsWith("Berekening van 'A' gestart om: ", messageList[2]);
+                    Assert.AreEqual("De berekening voor hoogte kunstwerk 'A' is niet gelukt.", messageList[3]);
+                    StringAssert.StartsWith("Berekening van 'A' beëindigd om: ", messageList[4]);
+                    StringAssert.StartsWith("Validatie van 'B' gestart om: ", messageList[5]);
+                    StringAssert.StartsWith("Validatie van 'B' beëindigd om: ", messageList[6]);
+                    StringAssert.StartsWith("Berekening van 'B' gestart om: ", messageList[7]);
+                    Assert.AreEqual("De berekening voor hoogte kunstwerk 'B' is niet gelukt.", messageList[8]);
+                    StringAssert.StartsWith("Berekening van 'B' beëindigd om: ", messageList[9]);
+                    Assert.AreEqual("Uitvoeren van 'A' is mislukt.", messageList[10]);
+                    Assert.AreEqual("Uitvoeren van 'B' is mislukt.", messageList[11]);
+                });
+            }
             mocks.VerifyAll();
         }
 
@@ -638,31 +647,32 @@
             };
 
             var observerMock = mocks.StrictMock<IObserver>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
-
             observerMock.Expect(o => o.UpdateObserver());
-            guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(menuBuilder);
 
-            mocks.ReplayAll();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder);
 
-            group.Children.Add(calculationGroup);
-            nodeData.Attach(observerMock);
+                mocks.ReplayAll();
 
-            ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock);
+                group.Children.Add(calculationGroup);
+                nodeData.Attach(observerMock);
 
-            // Precondition
-            Assert.AreEqual(1, group.Children.Count);
+                ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
-            // Call
-            contextMenu.Items[contextMenuAddCalculationGroupIndexRootGroup].PerformClick();
+                // Precondition
+                Assert.AreEqual(1, group.Children.Count);
 
-            // Assert
-            Assert.AreEqual(2, group.Children.Count);
-            var newlyAddedItem = group.Children.Last();
-            Assert.IsInstanceOf<CalculationGroup>(newlyAddedItem);
-            Assert.AreEqual("Nieuwe map (1)", newlyAddedItem.Name,
-                            "An item with the same name default name already exists, therefore '(1)' needs to be appended.");
+                // Call
+                contextMenu.Items[contextMenuAddCalculationGroupIndexRootGroup].PerformClick();
 
+                // Assert
+                Assert.AreEqual(2, group.Children.Count);
+                var newlyAddedItem = group.Children.Last();
+                Assert.IsInstanceOf<CalculationGroup>(newlyAddedItem);
+                Assert.AreEqual("Nieuwe map (1)", newlyAddedItem.Name,
+                                "An item with the same name default name already exists, therefore '(1)' needs to be appended.");
+            }
             mocks.VerifyAll();
         }
 
@@ -682,31 +692,32 @@
                 Name = "Nieuwe berekening"
             };
             var observerMock = mocks.StrictMock<IObserver>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
-
             observerMock.Expect(o => o.UpdateObserver());
-            guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControlMock)).Return(menuBuilder);
 
-            mocks.ReplayAll();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder);
 
-            group.Children.Add(calculation);
-            nodeData.Attach(observerMock);
+                mocks.ReplayAll();
 
-            var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControlMock);
+                group.Children.Add(calculation);
+                nodeData.Attach(observerMock);
 
-            // Precondition
-            Assert.AreEqual(1, group.Children.Count);
+                var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
-            // Call
-            contextMenu.Items[contextMenuAddCalculationIndexRootGroup].PerformClick();
+                // Precondition
+                Assert.AreEqual(1, group.Children.Count);
 
-            // Assert
-            Assert.AreEqual(2, group.Children.Count);
-            var newlyAddedItem = group.Children.Last();
-            Assert.IsInstanceOf<HeightStructuresCalculation>(newlyAddedItem);
-            Assert.AreEqual("Nieuwe berekening (1)", newlyAddedItem.Name,
-                            "An item with the same name default name already exists, therefore '(1)' needs to be appended.");
+                // Call
+                contextMenu.Items[contextMenuAddCalculationIndexRootGroup].PerformClick();
 
+                // Assert
+                Assert.AreEqual(2, group.Children.Count);
+                var newlyAddedItem = group.Children.Last();
+                Assert.IsInstanceOf<HeightStructuresCalculation>(newlyAddedItem);
+                Assert.AreEqual("Nieuwe berekening (1)", newlyAddedItem.Name,
+                                "An item with the same name default name already exists, therefore '(1)' needs to be appended.");
+            }
             mocks.VerifyAll();
         }
 
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresInputContextTreeNodeInfoTest.cs
===================================================================
diff -u -rea180de6e9f5ba1108b4ff3cf7bb7e57de72a37a -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresInputContextTreeNodeInfoTest.cs	(.../HeightStructuresInputContextTreeNodeInfoTest.cs)	(revision ea180de6e9f5ba1108b4ff3cf7bb7e57de72a37a)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresInputContextTreeNodeInfoTest.cs	(.../HeightStructuresInputContextTreeNodeInfoTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -123,23 +123,24 @@
         {
             // Setup
             var guiMock = mocksRepository.StrictMock<IGui>();
-            var treeViewControlMock = mocksRepository.StrictMock<TreeViewControl>();
             var menuBuilderMock = mocksRepository.StrictMock<IContextMenuBuilder>();
 
-            guiMock.Expect(g => g.Get(null, treeViewControlMock)).Return(menuBuilderMock);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                guiMock.Expect(g => g.Get(null, treeViewControl)).Return(menuBuilderMock);
 
-            menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.Build()).Return(null);
-            mocksRepository.ReplayAll();
+                menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock);
+                menuBuilderMock.Expect(mb => mb.Build()).Return(null);
+                mocksRepository.ReplayAll();
 
-            plugin.Gui = guiMock;
+                plugin.Gui = guiMock;
 
-            // Call
-            info.ContextMenuStrip(null, null, treeViewControlMock);
-
+                // Call
+                info.ContextMenuStrip(null, null, treeViewControl);
+            }
             // Assert
             mocksRepository.VerifyAll();
         }
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/ProbabilisticOutputTreeNodeInfoTest.cs
===================================================================
diff -u -r5150f97d1c5e019d39723b22ff200e48b2112e71 -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/ProbabilisticOutputTreeNodeInfoTest.cs	(.../ProbabilisticOutputTreeNodeInfoTest.cs)	(revision 5150f97d1c5e019d39723b22ff200e48b2112e71)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/ProbabilisticOutputTreeNodeInfoTest.cs	(.../ProbabilisticOutputTreeNodeInfoTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -97,21 +97,22 @@
             // Setup
             var guiMock = mocksRepository.StrictMock<IGui>();
             var menuBuilderMock = mocksRepository.StrictMock<IContextMenuBuilder>();
-            var treeViewControlMock = mocksRepository.StrictMock<TreeViewControl>();
 
-            menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.Build()).Return(null);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock);
+                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(null, treeViewControlMock)).Return(menuBuilderMock);
-            mocksRepository.ReplayAll();
+                guiMock.Expect(cmp => cmp.Get(null, treeViewControl)).Return(menuBuilderMock);
+                mocksRepository.ReplayAll();
 
-            plugin.Gui = guiMock;
+                plugin.Gui = guiMock;
 
-            // Call
-            info.ContextMenuStrip(null, null, treeViewControlMock);
-
+                // Call
+                info.ContextMenuStrip(null, null, treeViewControl);
+            }
             // Assert
             mocksRepository.VerifyAll();
         }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs
===================================================================
diff -u -rf01bfd8d4c0541a96d57071b397c39792a99da26 -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs	(.../AssessmentSectionTreeNodeInfoTest.cs)	(revision f01bfd8d4c0541a96d57071b397c39792a99da26)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs	(.../AssessmentSectionTreeNodeInfoTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -261,9 +261,7 @@
         {
             // Setup
             var gui = mocks.StrictMultiMock<IGui>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
-            gui.Expect(g => g.Get(null, treeViewControlMock)).Return(menuBuilderMock);
             gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
             gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
 
@@ -281,15 +279,19 @@
             menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.Build()).Return(null);
 
-            mocks.ReplayAll();
-
-            using (var plugin = new RingtoetsGuiPlugin())
+            using (var treeViewControl = new TreeViewControl())
             {
-                var info = GetInfo(plugin);
-                plugin.Gui = gui;
+                gui.Expect(g => g.Get(null, treeViewControl)).Return(menuBuilderMock);
+                mocks.ReplayAll();
 
-                // Call
-                info.ContextMenuStrip(null, null, treeViewControlMock);
+                using (var plugin = new RingtoetsGuiPlugin())
+                {
+                    var info = GetInfo(plugin);
+                    plugin.Gui = gui;
+
+                    // Call
+                    info.ContextMenuStrip(null, null, treeViewControl);
+                }
             }
             // Assert
             mocks.VerifyAll();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/CategoryTreeFolderTreeNodeInfoTest.cs
===================================================================
diff -u -rd65d6b037600ccd69f386d9164172dd2c133356e -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/CategoryTreeFolderTreeNodeInfoTest.cs	(.../CategoryTreeFolderTreeNodeInfoTest.cs)	(revision d65d6b037600ccd69f386d9164172dd2c133356e)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/CategoryTreeFolderTreeNodeInfoTest.cs	(.../CategoryTreeFolderTreeNodeInfoTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -172,25 +172,27 @@
             // Setup
             var gui = mocks.StrictMock<IGui>();
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
             menuBuilderMock.Expect(mb => mb.AddExpandAllItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.Build()).Return(null);
-
-            gui.Expect(cmp => cmp.Get(null, treeViewControlMock)).Return(menuBuilderMock);
             gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
             gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
-            mocks.ReplayAll();
-            
-            using (var plugin = new RingtoetsGuiPlugin())
+
+            using (var treeViewControl = new TreeViewControl())
             {
-                var info = GetInfo(plugin);
+                gui.Expect(cmp => cmp.Get(null, treeViewControl)).Return(menuBuilderMock);
+                mocks.ReplayAll();
 
-                plugin.Gui = gui;
+                using (var plugin = new RingtoetsGuiPlugin())
+                {
+                    var info = GetInfo(plugin);
 
-                // Call
-                info.ContextMenuStrip(null, null, treeViewControlMock);
+                    plugin.Gui = gui;
+
+                    // Call
+                    info.ContextMenuStrip(null, null, treeViewControl);
+                }
             }
             // Assert
             mocks.VerifyAll();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContributionContextTreeNodeInfoTest.cs
===================================================================
diff -u -r3abef5ccb0ba5386c65d4156b319970fc4337a29 -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContributionContextTreeNodeInfoTest.cs	(.../FailureMechanismContributionContextTreeNodeInfoTest.cs)	(revision 3abef5ccb0ba5386c65d4156b319970fc4337a29)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContributionContextTreeNodeInfoTest.cs	(.../FailureMechanismContributionContextTreeNodeInfoTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -115,7 +115,6 @@
 
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             var context = new FailureMechanismContributionContext(contribution, assessmentSection);
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
             menuBuilderMock.Expect(mb => mb.AddOpenItem()).Return(menuBuilderMock);
@@ -124,20 +123,23 @@
             menuBuilderMock.Expect(mb => mb.Build()).Return(null);
 
             var gui = mocks.StrictMock<IGui>();
-            gui.Expect(cmp => cmp.Get(context, treeViewControlMock)).Return(menuBuilderMock);
             gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
             gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
 
-            mocks.ReplayAll();
-
-            using (var plugin = new RingtoetsGuiPlugin())
+            using (var treeViewControl = new TreeViewControl())
             {
-                var info = GetInfo(plugin);
+                gui.Expect(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilderMock);
+                mocks.ReplayAll();
 
-                plugin.Gui = gui;
+                using (var plugin = new RingtoetsGuiPlugin())
+                {
+                    var info = GetInfo(plugin);
 
-                // Call
-                info.ContextMenuStrip(context, null, treeViewControlMock);
+                    plugin.Gui = gui;
+
+                    // Call
+                    info.ContextMenuStrip(context, null, treeViewControl);
+                }
             }
             // Assert
             mocks.VerifyAll();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismSectionsContextTreeNodeInfoTest.cs
===================================================================
diff -u -rd65d6b037600ccd69f386d9164172dd2c133356e -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismSectionsContextTreeNodeInfoTest.cs	(.../FailureMechanismSectionsContextTreeNodeInfoTest.cs)	(revision d65d6b037600ccd69f386d9164172dd2c133356e)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismSectionsContextTreeNodeInfoTest.cs	(.../FailureMechanismSectionsContextTreeNodeInfoTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -114,7 +114,6 @@
         public void ContextMenuStrip_Always_CallsContextMenuBuilderMethods()
         {
             // Setup
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
             menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock);
@@ -125,20 +124,23 @@
             var context = new FailureMechanismSectionsContext(failureMechanism, assessmentSection);
 
             var gui = mocks.StrictMock<IGui>();
-            gui.Expect(cmp => cmp.Get(context, treeViewControlMock)).Return(menuBuilderMock);
             gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
             gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
 
-            mocks.ReplayAll();
-
-            using (var plugin = new RingtoetsGuiPlugin())
+            using (var treeViewControl = new TreeViewControl())
             {
-                var info = GetInfo(plugin);
+                gui.Expect(cmp => cmp.Get(context, treeViewControl)).Return(menuBuilderMock);
+                mocks.ReplayAll();
 
-                plugin.Gui = gui;
+                using (var plugin = new RingtoetsGuiPlugin())
+                {
+                    var info = GetInfo(plugin);
 
-                // Call
-                info.ContextMenuStrip(context, null, treeViewControlMock);
+                    plugin.Gui = gui;
+
+                    // Call
+                    info.ContextMenuStrip(context, null, treeViewControl);
+                }
             }
             // Assert
             mocks.VerifyAll();
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();
         }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/ReferenceLineContextTreeNodeInfoTest.cs
===================================================================
diff -u -rd65d6b037600ccd69f386d9164172dd2c133356e -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/ReferenceLineContextTreeNodeInfoTest.cs	(.../ReferenceLineContextTreeNodeInfoTest.cs)	(revision d65d6b037600ccd69f386d9164172dd2c133356e)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/ReferenceLineContextTreeNodeInfoTest.cs	(.../ReferenceLineContextTreeNodeInfoTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -125,24 +125,26 @@
         {
             // Setup
             var gui = mocks.StrictMultiMock<IGui>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
-            gui.Expect(g => g.Get(null, treeViewControlMock)).Return(menuBuilderMock);
             gui.Stub(g => g.ProjectOpened += null).IgnoreArguments();
             gui.Stub(g => g.ProjectOpened -= null).IgnoreArguments();
             menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.Build()).Return(null);
 
-            mocks.ReplayAll();
-
-            using (var plugin = new RingtoetsGuiPlugin())
+            using (var treeViewControl = new TreeViewControl())
             {
-                var info = GetInfo(plugin);
+                gui.Expect(g => g.Get(null, treeViewControl)).Return(menuBuilderMock);
+                mocks.ReplayAll();
 
-                plugin.Gui = gui;
+                using (var plugin = new RingtoetsGuiPlugin())
+                {
+                    var info = GetInfo(plugin);
 
-                // Call
-                info.ContextMenuStrip(null, null, treeViewControlMock);
+                    plugin.Gui = gui;
+
+                    // Call
+                    info.ContextMenuStrip(null, null, treeViewControl);
+                }
             }
             // Assert
             mocks.VerifyAll();
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs
===================================================================
diff -u -rd08c15413bbb6009c6da8ee05833a4c3531b358c -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision d08c15413bbb6009c6da8ee05833a4c3531b358c)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs	(.../PipingGuiPlugin.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -561,7 +561,7 @@
             var builder = new RingtoetsContextMenuBuilder(Gui.Get(nodeData, treeViewControl));
             var isNestedGroup = parentData is PipingCalculationGroupContext;
 
-            var generateCalculationsItem = CreateGeneratePipingCalculationsItem(nodeData);
+            StrictContextMenuItem generateCalculationsItem = CreateGeneratePipingCalculationsItem(nodeData);
 
             if (!isNestedGroup)
             {
@@ -609,12 +609,11 @@
 
         private StrictContextMenuItem CreateGeneratePipingCalculationsItem(PipingCalculationGroupContext nodeData)
         {
-            var surfaceLineAvailable = nodeData.AvailablePipingSurfaceLines.Any() && nodeData.AvailableStochasticSoilModels.Any();
+            bool surfaceLineAvailable = nodeData.AvailablePipingSurfaceLines.Any() && nodeData.AvailableStochasticSoilModels.Any();
 
-            var pipingCalculationGroupGeneratePipingCalculationsToolTip =
-                surfaceLineAvailable ?
-                    PipingFormsResources.PipingCalculationGroup_Generate_PipingCalculations_ToolTip :
-                    PipingFormsResources.PipingCalculationGroup_Generate_PipingCalculations_NoSurfaceLinesOrSoilModels_ToolTip;
+            string pipingCalculationGroupGeneratePipingCalculationsToolTip = surfaceLineAvailable 
+                ? PipingFormsResources.PipingCalculationGroup_Generate_PipingCalculations_ToolTip 
+                : PipingFormsResources.PipingCalculationGroup_Generate_PipingCalculations_NoSurfaceLinesOrSoilModels_ToolTip;
 
             var generateCalculationsItem = new StrictContextMenuItem(
                 RingtoetsCommonFormsResources.CalculationGroup_Generate_Scenarios,
@@ -628,11 +627,11 @@
 
         private void ShowSurfaceLineSelectionDialog(PipingCalculationGroupContext nodeData)
         {
-            var view = new PipingSurfaceLineSelectionDialog(Gui.MainWindow, nodeData.AvailablePipingSurfaceLines);
-            view.ShowDialog();
-
-            GeneratePipingCalculations(nodeData.WrappedData, view.SelectedSurfaceLines, nodeData.AvailableStochasticSoilModels, nodeData.FailureMechanism.GeneralInput);
-
+            using (var view = new PipingSurfaceLineSelectionDialog(Gui.MainWindow, nodeData.AvailablePipingSurfaceLines))
+            {
+                view.ShowDialog();
+                GeneratePipingCalculations(nodeData.WrappedData, view.SelectedSurfaceLines, nodeData.AvailableStochasticSoilModels, nodeData.FailureMechanism.GeneralInput);
+            }
             nodeData.NotifyObservers();
         }
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/EmptyPipingOutputTreeNodeInfoTest.cs
===================================================================
diff -u -ra6b3a4921ffd42f54f6be60ebc2eef3c12cab10e -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/EmptyPipingOutputTreeNodeInfoTest.cs	(.../EmptyPipingOutputTreeNodeInfoTest.cs)	(revision a6b3a4921ffd42f54f6be60ebc2eef3c12cab10e)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/EmptyPipingOutputTreeNodeInfoTest.cs	(.../EmptyPipingOutputTreeNodeInfoTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -84,21 +84,22 @@
             // Setup
             var gui = mocks.StrictMock<IGui>();
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
-            var treeViewControlMock = mocks.StrictMock<TreeViewControl>();
 
             menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.Build()).Return(null);
 
-            gui.Expect(cmp => cmp.Get(null, treeViewControlMock)).Return(menuBuilderMock);
-            mocks.ReplayAll();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                gui.Expect(cmp => cmp.Get(null, treeViewControl)).Return(menuBuilderMock);
+                mocks.ReplayAll();
 
-            plugin.Gui = gui;
+                plugin.Gui = gui;
 
-            // Call
-            info.ContextMenuStrip(null, null, treeViewControlMock);
-
+                // Call
+                info.ContextMenuStrip(null, null, treeViewControl);
+            }
             // Assert
             mocks.VerifyAll();
         }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/FailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -r2209699cf65944d97bb2efee9da2d6754fe27745 -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/FailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../FailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 2209699cf65944d97bb2efee9da2d6754fe27745)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/FailureMechanismSectionResultContextTreeNodeInfoTest.cs	(.../FailureMechanismSectionResultContextTreeNodeInfoTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -102,21 +102,22 @@
         {
             // Setup
             var gui = mocks.StrictMultiMock<IGui>();
-            var treeViewControl = mocks.StrictMock<TreeViewControl>();
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
 
-            gui.Expect(g => g.Get(null, treeViewControl)).Return(menuBuilderMock);
-
             menuBuilderMock.Expect(mb => mb.AddOpenItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.Build()).Return(null);
+            
+            using (var treeViewControl = new TreeViewControl())
+            {
+                gui.Expect(g => g.Get(null, treeViewControl)).Return(menuBuilderMock);
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            plugin.Gui = gui;
+                plugin.Gui = gui;
 
-            // Call
-            info.ContextMenuStrip(null, null, treeViewControl);
-
+                // Call
+                info.ContextMenuStrip(null, null, treeViewControl);
+            }
             // Assert
             mocks.VerifyAll();
         }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rd08c15413bbb6009c6da8ee05833a4c3531b358c -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision d08c15413bbb6009c6da8ee05833a4c3531b358c)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -299,82 +299,81 @@
             var applicationFeatureCommandHandler = mocks.Stub<IApplicationFeatureCommands>();
             var exportImportHandler = mocks.Stub<IExportImportCommandHandler>();
             var viewCommandsHandler = mocks.StrictMock<IViewCommands>();
-            var treeViewControl = mocks.StrictMock<TreeViewControl>();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandler, exportImportHandler, viewCommandsHandler, nodeData, treeViewControl);
+                gui.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder);
+                viewCommandsHandler.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(true);
 
-            var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandler, exportImportHandler, viewCommandsHandler, nodeData, treeViewControl);
-            gui.Expect(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder);
-            viewCommandsHandler.Expect(vc => vc.CanOpenViewFor(nodeData)).Return(true);
-            treeViewControl.Expect(tvc => tvc.CanExpandOrCollapseForData(nodeData)).Repeat.Twice().Return(false);
+                mocks.ReplayAll();
 
-            mocks.ReplayAll();
+                plugin.Gui = gui;
 
-            plugin.Gui = gui;
+                // Call
+                ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
-            // Call
-            ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl);
+                // Assert
+                var mainCalculationGroupContextMenuItemOffset = 4;
+                Assert.AreEqual(18, menu.Items.Count);
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndex + mainCalculationGroupContextMenuItemOffset,
+                                                              RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup,
+                                                              "Voeg een nieuwe berekeningsmap toe aan deze berekeningsmap.",
+                                                              RingtoetsCommonFormsResources.AddFolderIcon);
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndex + mainCalculationGroupContextMenuItemOffset,
+                                                              RingtoetsCommonFormsResources.CalculationGroup_Add_Calculation,
+                                                              "Voeg een nieuwe berekening toe aan deze berekeningsmap.",
+                                                              PipingFormsResources.PipingIcon);
 
-            // Assert
-            var mainCalculationGroupContextMenuItemOffset = 4;
-            Assert.AreEqual(18, menu.Items.Count);
-            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndex + mainCalculationGroupContextMenuItemOffset,
-                                                          RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup,
-                                                          "Voeg een nieuwe berekeningsmap toe aan deze berekeningsmap.",
-                                                          RingtoetsCommonFormsResources.AddFolderIcon);
-            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationIndex + mainCalculationGroupContextMenuItemOffset,
-                                                          RingtoetsCommonFormsResources.CalculationGroup_Add_Calculation,
-                                                          "Voeg een nieuwe berekening toe aan deze berekeningsmap.",
-                                                          PipingFormsResources.PipingIcon);
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex + mainCalculationGroupContextMenuItemOffset,
+                                                              RingtoetsCommonFormsResources.Validate_all,
+                                                              "Valideer alle berekeningen binnen deze berekeningsmap.",
+                                                              RingtoetsCommonFormsResources.ValidateAllIcon);
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex + mainCalculationGroupContextMenuItemOffset,
+                                                              RingtoetsCommonFormsResources.Calculate_all,
+                                                              "Voer alle berekeningen binnen deze berekeningsmap uit.",
+                                                              RingtoetsCommonFormsResources.CalculateAllIcon);
+                TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearOutputIndex + mainCalculationGroupContextMenuItemOffset,
+                                                              "&Wis alle uitvoer...",
+                                                              "Wis de uitvoer van alle berekeningen binnen deze berekeningsmap.",
+                                                              RingtoetsCommonFormsResources.ClearIcon);
 
-            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndex + mainCalculationGroupContextMenuItemOffset,
-                                                          RingtoetsCommonFormsResources.Validate_all,
-                                                          "Valideer alle berekeningen binnen deze berekeningsmap.",
-                                                          RingtoetsCommonFormsResources.ValidateAllIcon);
-            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex + mainCalculationGroupContextMenuItemOffset,
-                                                          RingtoetsCommonFormsResources.Calculate_all,
-                                                          "Voer alle berekeningen binnen deze berekeningsmap uit.",
-                                                          RingtoetsCommonFormsResources.CalculateAllIcon);
-            TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuClearOutputIndex + mainCalculationGroupContextMenuItemOffset,
-                                                          "&Wis alle uitvoer...",
-                                                          "Wis de uitvoer van alle berekeningen binnen deze berekeningsmap.",
-                                                          RingtoetsCommonFormsResources.ClearIcon);
+                TestHelper.AssertContextMenuStripContainsItem(menu, 11,
+                                                              CoreCommonGuiResources.Import,
+                                                              CoreCommonGuiResources.Import_ToolTip,
+                                                              CoreCommonGuiResources.ImportIcon,
+                                                              false);
+                TestHelper.AssertContextMenuStripContainsItem(menu, 12,
+                                                              CoreCommonGuiResources.Export,
+                                                              CoreCommonGuiResources.Export_ToolTip,
+                                                              CoreCommonGuiResources.ExportIcon,
+                                                              false);
 
-            TestHelper.AssertContextMenuStripContainsItem(menu, 11,
-                                                          CoreCommonGuiResources.Import,
-                                                          CoreCommonGuiResources.Import_ToolTip,
-                                                          CoreCommonGuiResources.ImportIcon,
-                                                          false);
-            TestHelper.AssertContextMenuStripContainsItem(menu, 12,
-                                                          CoreCommonGuiResources.Export,
-                                                          CoreCommonGuiResources.Export_ToolTip,
-                                                          CoreCommonGuiResources.ExportIcon,
-                                                          false);
+                TestHelper.AssertContextMenuStripContainsItem(menu, 14,
+                                                              CoreCommonGuiResources.Expand_all,
+                                                              CoreCommonGuiResources.Expand_all_ToolTip,
+                                                              CoreCommonGuiResources.ExpandAllIcon,
+                                                              false);
+                TestHelper.AssertContextMenuStripContainsItem(menu, 15,
+                                                              CoreCommonGuiResources.Collapse_all,
+                                                              CoreCommonGuiResources.Collapse_all_ToolTip,
+                                                              CoreCommonGuiResources.CollapseAllIcon,
+                                                              false);
 
-            TestHelper.AssertContextMenuStripContainsItem(menu, 14,
-                                                          CoreCommonGuiResources.Expand_all,
-                                                          CoreCommonGuiResources.Expand_all_ToolTip,
-                                                          CoreCommonGuiResources.ExpandAllIcon,
-                                                          false);
-            TestHelper.AssertContextMenuStripContainsItem(menu, 15,
-                                                          CoreCommonGuiResources.Collapse_all,
-                                                          CoreCommonGuiResources.Collapse_all_ToolTip,
-                                                          CoreCommonGuiResources.CollapseAllIcon,
-                                                          false);
-
-            TestHelper.AssertContextMenuStripContainsItem(menu, 17,
-                                                          CoreCommonGuiResources.Properties,
-                                                          CoreCommonGuiResources.Properties_ToolTip,
-                                                          CoreCommonGuiResources.PropertiesHS,
-                                                          false);
-            CollectionAssert.AllItemsAreInstancesOfType(new[]
-            {
-                menu.Items[1],
-                menu.Items[3],
-                menu.Items[6],
-                menu.Items[10],
-                menu.Items[13],
-                menu.Items[16]
-            }, typeof(ToolStripSeparator));
-
+                TestHelper.AssertContextMenuStripContainsItem(menu, 17,
+                                                              CoreCommonGuiResources.Properties,
+                                                              CoreCommonGuiResources.Properties_ToolTip,
+                                                              CoreCommonGuiResources.PropertiesHS,
+                                                              false);
+                CollectionAssert.AllItemsAreInstancesOfType(new[]
+                {
+                    menu.Items[1],
+                    menu.Items[3],
+                    menu.Items[6],
+                    menu.Items[10],
+                    menu.Items[13],
+                    menu.Items[16]
+                }, typeof(ToolStripSeparator));
+            }
             mocks.VerifyAll();
         }
 
@@ -937,11 +936,12 @@
 
                 PipingSurfaceLineSelectionDialog selectionDialog = null;
                 DataGridView grid = null;
+                int rowCount = 0;
                 DialogBoxHandler = (name, wnd) =>
                 {
                     selectionDialog = (PipingSurfaceLineSelectionDialog)new FormTester(name).TheObject;
                     grid = (DataGridView)new ControlTester("SurfaceLineDataGrid", selectionDialog).TheObject;
-
+                    rowCount = grid.RowCount;
                     new ButtonTester("CustomCancelButton", selectionDialog).Click();
                 };
 
@@ -953,7 +953,7 @@
                 // Assert
                 Assert.NotNull(selectionDialog);
                 Assert.NotNull(grid);
-                Assert.AreEqual(2, grid.RowCount);
+                Assert.AreEqual(2, rowCount);
             }
             mocks.VerifyAll();
         }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rd08c15413bbb6009c6da8ee05833a4c3531b358c -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision d08c15413bbb6009c6da8ee05833a4c3531b358c)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -305,49 +305,49 @@
             var applicationFeatureCommandHandler = mocks.Stub<IApplicationFeatureCommands>();
             var exportImportHandler = mocks.Stub<IExportImportCommandHandler>();
             var viewCommandsHandler = mocks.Stub<IViewCommands>();
-            var treeViewControl = mocks.StrictMock<TreeViewControl>();
-            treeViewControl.Expect(tvc => tvc.CanExpandOrCollapseForData(failureMechanismContext)).Repeat.Twice().Return(false);
 
-            var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandler, exportImportHandler, viewCommandsHandler, failureMechanismContext, treeViewControl);
+            using (var treeViewControl = new TreeViewControl())
+            {
+                var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandler, exportImportHandler, viewCommandsHandler, failureMechanismContext, treeViewControl);
 
-            var gui = mocks.StrictMock<IGui>();
-            gui.Expect(cmp => cmp.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder);
+                var gui = mocks.StrictMock<IGui>();
+                gui.Expect(cmp => cmp.Get(failureMechanismContext, treeViewControl)).Return(menuBuilder);
 
-            mocks.ReplayAll();
+                mocks.ReplayAll();
 
-            plugin.Gui = gui;
+                plugin.Gui = gui;
 
-            // Call
-            ContextMenuStrip menu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl);
+                // Call
+                ContextMenuStrip menu = info.ContextMenuStrip(failureMechanismContext, null, treeViewControl);
 
-            // Assert
-            Assert.AreEqual(15, menu.Items.Count);
+                // Assert
+                Assert.AreEqual(15, menu.Items.Count);
 
-            TestHelper.AssertContextMenuStripContainsItem(menu, 0, CoreCommonGuiResources.Open, CoreCommonGuiResources.Open_ToolTip, CoreCommonGuiResources.OpenIcon, false);
+                TestHelper.AssertContextMenuStripContainsItem(menu, 0, CoreCommonGuiResources.Open, CoreCommonGuiResources.Open_ToolTip, CoreCommonGuiResources.OpenIcon, false);
 
-            TestHelper.AssertContextMenuStripContainsItem(menu, 2, RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant, RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant_Tooltip, RingtoetsCommonFormsResources.Checkbox_ticked);
+                TestHelper.AssertContextMenuStripContainsItem(menu, 2, RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant, RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant_Tooltip, RingtoetsCommonFormsResources.Checkbox_ticked);
 
-            TestHelper.AssertContextMenuStripContainsItem(menu, 4, RingtoetsCommonFormsResources.Validate_all, RingtoetsCommonFormsResources.FailureMechanism_Validate_all_ToolTip, RingtoetsCommonFormsResources.ValidateAllIcon);
-            TestHelper.AssertContextMenuStripContainsItem(menu, 5, RingtoetsCommonFormsResources.Calculate_all, RingtoetsCommonFormsResources.Calculate_all_ToolTip, RingtoetsCommonFormsResources.CalculateAllIcon);
-            TestHelper.AssertContextMenuStripContainsItem(menu, 6, RingtoetsCommonFormsResources.Clear_all_output, RingtoetsCommonFormsResources.Clear_all_output_ToolTip, RingtoetsCommonFormsResources.ClearIcon);
+                TestHelper.AssertContextMenuStripContainsItem(menu, 4, RingtoetsCommonFormsResources.Validate_all, RingtoetsCommonFormsResources.FailureMechanism_Validate_all_ToolTip, RingtoetsCommonFormsResources.ValidateAllIcon);
+                TestHelper.AssertContextMenuStripContainsItem(menu, 5, RingtoetsCommonFormsResources.Calculate_all, RingtoetsCommonFormsResources.Calculate_all_ToolTip, RingtoetsCommonFormsResources.CalculateAllIcon);
+                TestHelper.AssertContextMenuStripContainsItem(menu, 6, RingtoetsCommonFormsResources.Clear_all_output, RingtoetsCommonFormsResources.Clear_all_output_ToolTip, RingtoetsCommonFormsResources.ClearIcon);
 
-            TestHelper.AssertContextMenuStripContainsItem(menu, 8, CoreCommonGuiResources.Import, CoreCommonGuiResources.Import_ToolTip, CoreCommonGuiResources.ImportIcon, false);
-            TestHelper.AssertContextMenuStripContainsItem(menu, 9, CoreCommonGuiResources.Export, CoreCommonGuiResources.Export_ToolTip, CoreCommonGuiResources.ExportIcon, false);
+                TestHelper.AssertContextMenuStripContainsItem(menu, 8, CoreCommonGuiResources.Import, CoreCommonGuiResources.Import_ToolTip, CoreCommonGuiResources.ImportIcon, false);
+                TestHelper.AssertContextMenuStripContainsItem(menu, 9, CoreCommonGuiResources.Export, CoreCommonGuiResources.Export_ToolTip, CoreCommonGuiResources.ExportIcon, false);
 
-            TestHelper.AssertContextMenuStripContainsItem(menu, 11, CoreCommonGuiResources.Expand_all, CoreCommonGuiResources.Expand_all_ToolTip, CoreCommonGuiResources.ExpandAllIcon, false);
-            TestHelper.AssertContextMenuStripContainsItem(menu, 12, CoreCommonGuiResources.Collapse_all, CoreCommonGuiResources.Collapse_all_ToolTip, CoreCommonGuiResources.CollapseAllIcon, false);
+                TestHelper.AssertContextMenuStripContainsItem(menu, 11, CoreCommonGuiResources.Expand_all, CoreCommonGuiResources.Expand_all_ToolTip, CoreCommonGuiResources.ExpandAllIcon, false);
+                TestHelper.AssertContextMenuStripContainsItem(menu, 12, CoreCommonGuiResources.Collapse_all, CoreCommonGuiResources.Collapse_all_ToolTip, CoreCommonGuiResources.CollapseAllIcon, false);
 
-            TestHelper.AssertContextMenuStripContainsItem(menu, 14, CoreCommonGuiResources.Properties, CoreCommonGuiResources.Properties_ToolTip, CoreCommonGuiResources.PropertiesHS, false);
+                TestHelper.AssertContextMenuStripContainsItem(menu, 14, CoreCommonGuiResources.Properties, CoreCommonGuiResources.Properties_ToolTip, CoreCommonGuiResources.PropertiesHS, false);
 
-            CollectionAssert.AllItemsAreInstancesOfType(new[]
-            {
-                menu.Items[1],
-                menu.Items[3],
-                menu.Items[7],
-                menu.Items[10],
-                menu.Items[13]
-            }, typeof(ToolStripSeparator));
-
+                CollectionAssert.AllItemsAreInstancesOfType(new[]
+                {
+                    menu.Items[1],
+                    menu.Items[3],
+                    menu.Items[7],
+                    menu.Items[10],
+                    menu.Items[13]
+                }, typeof(ToolStripSeparator));
+            }
             mocks.VerifyAll();
         }
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingInputContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4810ae37235b576747c1ef5c37573aa143aab5e5 -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingInputContextTreeNodeInfoTest.cs	(.../PipingInputContextTreeNodeInfoTest.cs)	(revision 4810ae37235b576747c1ef5c37573aa143aab5e5)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingInputContextTreeNodeInfoTest.cs	(.../PipingInputContextTreeNodeInfoTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -103,11 +103,8 @@
         {
             // Setup
             var gui = mocks.StrictMultiMock<IGui>();
-            var treeViewControl = mocks.StrictMock<TreeViewControl>();
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
 
-            gui.Expect(g => g.Get(null, treeViewControl)).Return(menuBuilderMock);
-
             menuBuilderMock.Expect(mb => mb.AddOpenItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock);
@@ -116,13 +113,16 @@
             menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.Build()).Return(null);
 
-            mocks.ReplayAll();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                gui.Expect(g => g.Get(null, treeViewControl)).Return(menuBuilderMock);
+                mocks.ReplayAll();
 
-            plugin.Gui = gui;
+                plugin.Gui = gui;
 
-            // Call
-            info.ContextMenuStrip(null, null, treeViewControl);
-
+                // Call
+                info.ContextMenuStrip(null, null, treeViewControl);
+            }
             // Assert
             mocks.VerifyAll();
         }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingSemiProbabilisticOutputTreeNodeInfoTest.cs
===================================================================
diff -u -ra6b3a4921ffd42f54f6be60ebc2eef3c12cab10e -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingSemiProbabilisticOutputTreeNodeInfoTest.cs	(.../PipingSemiProbabilisticOutputTreeNodeInfoTest.cs)	(revision a6b3a4921ffd42f54f6be60ebc2eef3c12cab10e)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingSemiProbabilisticOutputTreeNodeInfoTest.cs	(.../PipingSemiProbabilisticOutputTreeNodeInfoTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -86,23 +86,24 @@
         {
             // Setup
             var gui = mocks.StrictMultiMock<IGui>();
-            var treeViewControl = mocks.StrictMock<TreeViewControl>();
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
 
-            gui.Expect(g => g.Get(null, treeViewControl)).Return(menuBuilderMock);
 
             menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.Build()).Return(null);
 
-            mocks.ReplayAll();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                gui.Expect(g => g.Get(null, treeViewControl)).Return(menuBuilderMock);
+                mocks.ReplayAll();
 
-            plugin.Gui = gui;
+                plugin.Gui = gui;
 
-            // Call
-            info.ContextMenuStrip(null, null, treeViewControl);
-
+                // Call
+                info.ContextMenuStrip(null, null, treeViewControl);
+            }
             // Assert
             mocks.VerifyAll();
         }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/RingtoetsPipingSurfaceLineCollectionTreeNodeInfoTest.cs
===================================================================
diff -u -rabb2667229e96d5b8158981c890a5c7046e9ca66 -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/RingtoetsPipingSurfaceLineCollectionTreeNodeInfoTest.cs	(.../RingtoetsPipingSurfaceLineCollectionTreeNodeInfoTest.cs)	(revision abb2667229e96d5b8158981c890a5c7046e9ca66)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/RingtoetsPipingSurfaceLineCollectionTreeNodeInfoTest.cs	(.../RingtoetsPipingSurfaceLineCollectionTreeNodeInfoTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -166,25 +166,25 @@
         {
             // Setup
             var gui = mocks.StrictMultiMock<IGui>();
-            var treeViewControl = mocks.StrictMock<TreeViewControl>();
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
 
-            gui.Expect(g => g.Get(null, treeViewControl)).Return(menuBuilderMock);
-
             menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddExpandAllItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.Build()).Return(null);
 
-            mocks.ReplayAll();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                gui.Expect(g => g.Get(null, treeViewControl)).Return(menuBuilderMock);
+                mocks.ReplayAll();
 
-            plugin.Gui = gui;
+                plugin.Gui = gui;
 
-            // Call
-            info.ContextMenuStrip(null, null, treeViewControl);
-
+                // Call
+                info.ContextMenuStrip(null, null, treeViewControl);
+            }
             // Assert
             mocks.VerifyAll();
         }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/RingtoetsPipingSurfaceLineTreeNodeInfoTest.cs
===================================================================
diff -u -r64d5609bb2912cd52dc74deffdd189222e240599 -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/RingtoetsPipingSurfaceLineTreeNodeInfoTest.cs	(.../RingtoetsPipingSurfaceLineTreeNodeInfoTest.cs)	(revision 64d5609bb2912cd52dc74deffdd189222e240599)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/RingtoetsPipingSurfaceLineTreeNodeInfoTest.cs	(.../RingtoetsPipingSurfaceLineTreeNodeInfoTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -88,21 +88,21 @@
         {
             // Setup
             var gui = mocks.StrictMultiMock<IGui>();
-            var treeViewControl = mocks.StrictMock<TreeViewControl>();
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
 
-            gui.Expect(g => g.Get(null, treeViewControl)).Return(menuBuilderMock);
-
             menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.Build()).Return(null);
 
-            mocks.ReplayAll();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                gui.Expect(g => g.Get(null, treeViewControl)).Return(menuBuilderMock);
+                mocks.ReplayAll();
 
-            plugin.Gui = gui;
+                plugin.Gui = gui;
 
-            // Call
-            info.ContextMenuStrip(null, null, treeViewControl);
-
+                // Call
+                info.ContextMenuStrip(null, null, treeViewControl);
+            }
             // Assert
             mocks.VerifyAll();
         }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/StochasticSoilModelContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb53320286e086524c6003dc6e47af798ee3935be -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/StochasticSoilModelContextTreeNodeInfoTest.cs	(.../StochasticSoilModelContextTreeNodeInfoTest.cs)	(revision b53320286e086524c6003dc6e47af798ee3935be)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/StochasticSoilModelContextTreeNodeInfoTest.cs	(.../StochasticSoilModelContextTreeNodeInfoTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -194,25 +194,25 @@
         {
             // Setup
             var gui = mocks.StrictMultiMock<IGui>();
-            var treeViewControl = mocks.StrictMock<TreeViewControl>();
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
 
-            gui.Expect(g => g.Get(null, treeViewControl)).Return(menuBuilderMock);
-
             menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddExpandAllItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.Build()).Return(null);
 
-            mocks.ReplayAll();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                gui.Expect(g => g.Get(null, treeViewControl)).Return(menuBuilderMock);
+                mocks.ReplayAll();
 
-            plugin.Gui = gui;
+                plugin.Gui = gui;
 
-            // Call
-            info.ContextMenuStrip(null, null, treeViewControl);
-
+                // Call
+                info.ContextMenuStrip(null, null, treeViewControl);
+            }
             // Assert
             mocks.VerifyAll();
         }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/StochasticSoilProfileTreeNodeInfoTest.cs
===================================================================
diff -u -rbf334f50530164badedba45a78f3aab857ae1bf6 -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/StochasticSoilProfileTreeNodeInfoTest.cs	(.../StochasticSoilProfileTreeNodeInfoTest.cs)	(revision bf334f50530164badedba45a78f3aab857ae1bf6)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/StochasticSoilProfileTreeNodeInfoTest.cs	(.../StochasticSoilProfileTreeNodeInfoTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -98,21 +98,21 @@
         {
             // Setup
             var gui = mocks.StrictMultiMock<IGui>();
-            var treeViewControl = mocks.StrictMock<TreeViewControl>();
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
 
-            gui.Expect(g => g.Get(null, treeViewControl)).Return(menuBuilderMock);
-
             menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.Build()).Return(null);
 
-            mocks.ReplayAll();
+            using (var treeViewControl = new TreeViewControl())
+            {
+                gui.Expect(g => g.Get(null, treeViewControl)).Return(menuBuilderMock);
+                mocks.ReplayAll();
 
-            plugin.Gui = gui;
+                plugin.Gui = gui;
 
-            // Call
-            info.ContextMenuStrip(null, null, treeViewControl);
-
+                // Call
+                info.ContextMenuStrip(null, null, treeViewControl);
+            }
             // Assert
             mocks.VerifyAll();
         }
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingSurfaceLineSelectionViewTest.cs
===================================================================
diff -u -r5782c43794d78fe92cd8864cd8f8b0b53957ec06 -r4e6c8ac0eb663ddfe4565745fb4829a8432019e2
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingSurfaceLineSelectionViewTest.cs	(.../PipingSurfaceLineSelectionViewTest.cs)	(revision 5782c43794d78fe92cd8864cd8f8b0b53957ec06)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingSurfaceLineSelectionViewTest.cs	(.../PipingSurfaceLineSelectionViewTest.cs)	(revision 4e6c8ac0eb663ddfe4565745fb4829a8432019e2)
@@ -53,16 +53,14 @@
             Assert.AreEqual(2, surfaceLineDataGrid.ColumnCount);
             Assert.IsFalse(surfaceLineDataGrid.RowHeadersVisible);
 
-            var selectedColumn = surfaceLineDataGrid.Columns[0] as DataGridViewCheckBoxColumn;
-            var surfaceLineNameColumn = surfaceLineDataGrid.Columns[1] as DataGridViewTextBoxColumn;
+            var selectedColumn = (DataGridViewCheckBoxColumn) surfaceLineDataGrid.Columns[0];
+            var surfaceLineNameColumn = (DataGridViewTextBoxColumn) surfaceLineDataGrid.Columns[1];
 
-            Assert.NotNull(selectedColumn);
             Assert.AreEqual("Selected", selectedColumn.DataPropertyName);
             Assert.AreEqual("Gebruiken", selectedColumn.HeaderText);
             Assert.AreEqual(60, selectedColumn.Width);
             Assert.IsFalse(selectedColumn.ReadOnly);
 
-            Assert.NotNull(surfaceLineNameColumn);
             Assert.AreEqual("Name", surfaceLineNameColumn.DataPropertyName);
             Assert.AreEqual("Profielschematisatie", surfaceLineNameColumn.HeaderText);
             Assert.AreEqual(DataGridViewAutoSizeColumnMode.Fill, surfaceLineNameColumn.AutoSizeMode);