Index: Core/Common/test/Core.Common.Gui.TestUtil/ContextMenu/CustomItemsOnlyContextMenuBuilder.cs
===================================================================
diff -u -r28743d8fed7b8b658764829b629fda81786aa808 -r968cbe97d1a910b9bbb0fb52b22ece65126ed675
--- Core/Common/test/Core.Common.Gui.TestUtil/ContextMenu/CustomItemsOnlyContextMenuBuilder.cs	(.../CustomItemsOnlyContextMenuBuilder.cs)	(revision 28743d8fed7b8b658764829b629fda81786aa808)
+++ Core/Common/test/Core.Common.Gui.TestUtil/ContextMenu/CustomItemsOnlyContextMenuBuilder.cs	(.../CustomItemsOnlyContextMenuBuilder.cs)	(revision 968cbe97d1a910b9bbb0fb52b22ece65126ed675)
@@ -35,7 +35,7 @@
         private readonly ContextMenuStrip contextMenu = new ContextMenuStrip();
 
         /// <summary>
-        /// Adds a <see cref="StrictContextMenuItem"/> to the <see cref="ContextMenuStrip"/>.
+        /// Adds a dummy <see cref="ToolStripItem"/> to the <see cref="ContextMenuStrip"/>.
         /// </summary>
         /// <returns>The <see cref="CustomItemsOnlyContextMenuBuilder"/>.</returns>
         public IContextMenuBuilder AddRenameItem()
@@ -45,7 +45,7 @@
         }
 
         /// <summary>
-        /// Adds a <see cref="StrictContextMenuItem"/> to the <see cref="ContextMenuStrip"/>.
+        /// Adds a dummy <see cref="ToolStripItem"/> to the <see cref="ContextMenuStrip"/>.
         /// </summary>
         /// <returns>The <see cref="CustomItemsOnlyContextMenuBuilder"/>.</returns>
         public IContextMenuBuilder AddDeleteItem()
@@ -55,7 +55,7 @@
         }
 
         /// <summary>
-        /// Adds a <see cref="StrictContextMenuItem"/> to the <see cref="ContextMenuStrip"/>.
+        /// Adds a dummy <see cref="ToolStripItem"/> to the <see cref="ContextMenuStrip"/>.
         /// </summary>
         /// <returns>The <see cref="CustomItemsOnlyContextMenuBuilder"/>.</returns>
         public IContextMenuBuilder AddDeleteChildrenItem()
@@ -65,16 +65,17 @@
         }
 
         /// <summary>
-        /// Does nothing.
+        /// Adds a dummy <see cref="ToolStripItem"/> to the <see cref="ContextMenuStrip"/>.
         /// </summary>
         /// <returns>The <see cref="CustomItemsOnlyContextMenuBuilder"/>.</returns>
         public IContextMenuBuilder AddExpandAllItem()
         {
+            contextMenu.Items.Add(StubItem());
             return this;
         }
 
         /// <summary>
-        /// Adds a <see cref="StrictContextMenuItem"/> to the <see cref="ContextMenuStrip"/>.
+        /// Adds a dummy <see cref="ToolStripItem"/> to the <see cref="ContextMenuStrip"/>.
         /// </summary>
         /// <returns>The <see cref="CustomItemsOnlyContextMenuBuilder"/>.</returns>
         public IContextMenuBuilder AddCollapseAllItem()
@@ -84,16 +85,17 @@
         }
 
         /// <summary>
-        /// Does nothing.
+        /// Adds a dummy <see cref="ToolStripItem"/> to the <see cref="ContextMenuStrip"/>.
         /// </summary>
         /// <returns>The <see cref="CustomItemsOnlyContextMenuBuilder"/>.</returns>
         public IContextMenuBuilder AddOpenItem()
         {
+            contextMenu.Items.Add(StubItem());
             return this;
         }
 
         /// <summary>
-        /// Adds a <see cref="StrictContextMenuItem"/> to the <see cref="ContextMenuStrip"/>.
+        /// Adds a dummy <see cref="ToolStripItem"/> to the <see cref="ContextMenuStrip"/>.
         /// </summary>
         /// <returns>The <see cref="CustomItemsOnlyContextMenuBuilder"/>.</returns>
         public IContextMenuBuilder AddExportItem()
@@ -103,7 +105,7 @@
         }
 
         /// <summary>
-        /// Adds a <see cref="StrictContextMenuItem"/> to the <see cref="ContextMenuStrip"/>.
+        /// Adds a dummy <see cref="ToolStripItem"/> to the <see cref="ContextMenuStrip"/>.
         /// </summary>
         /// <returns>The <see cref="CustomItemsOnlyContextMenuBuilder"/>.</returns>
         public IContextMenuBuilder AddImportItem()
@@ -113,7 +115,7 @@
         }
 
         /// <summary>
-        /// Adds a <see cref="StrictContextMenuItem"/> to the <see cref="ContextMenuStrip"/>.
+        /// Adds a dummy <see cref="ToolStripItem"/> to the <see cref="ContextMenuStrip"/>.
         /// </summary>
         /// <returns>The <see cref="CustomItemsOnlyContextMenuBuilder"/>.</returns>
         public IContextMenuBuilder AddPropertiesItem()
@@ -133,7 +135,7 @@
         }
 
         /// <summary>
-        /// Adds a custom item to the <see cref="ContextMenuStrip"/>.
+        /// Adds a dummy <see cref="ToolStripItem"/> to the <see cref="ContextMenuStrip"/>.
         /// </summary>
         /// <param name="item">The custom <see cref="StrictContextMenuItem"/> to add to the <see cref="ContextMenuStrip"/>.</param>
         /// <returns>The <see cref="CustomItemsOnlyContextMenuBuilder"/>.</returns>
@@ -152,7 +154,7 @@
             return contextMenu;
         }
 
-        private static StrictContextMenuItem StubItem()
+        private static ToolStripItem StubItem()
         {
             return new StrictContextMenuItem(string.Empty, string.Empty, null, (sender, args) => { });
         }
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructureFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb6f4e414fc874653cc6ad84b80f330b28e69b823 -r968cbe97d1a910b9bbb0fb52b22ece65126ed675
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructureFailureMechanismContextTreeNodeInfoTest.cs	(.../ClosingStructureFailureMechanismContextTreeNodeInfoTest.cs)	(revision b6f4e414fc874653cc6ad84b80f330b28e69b823)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructureFailureMechanismContextTreeNodeInfoTest.cs	(.../ClosingStructureFailureMechanismContextTreeNodeInfoTest.cs)	(revision 968cbe97d1a910b9bbb0fb52b22ece65126ed675)
@@ -270,7 +270,7 @@
                 using (ContextMenuStrip menu = info.ContextMenuStrip(failureMechanismContext, assessmentSectionMock, treeView))
                 {
                     // Assert
-                    Assert.AreEqual(9, menu.Items.Count);
+                    Assert.AreEqual(10, menu.Items.Count);
 
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRelevancyIndexWhenRelevant,
                                                                   "I&s relevant",
@@ -323,7 +323,7 @@
                 using (ContextMenuStrip menu = info.ContextMenuStrip(failureMechanismContext, assessmentSectionMock, treeView))
                 {
                     // Assert
-                    Assert.AreEqual(3, menu.Items.Count);
+                    Assert.AreEqual(4, menu.Items.Count);
 
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRelevancyIndexWhenNotRelevant,
                                                                   "I&s relevant",
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb6f4e414fc874653cc6ad84b80f330b28e69b823 -r968cbe97d1a910b9bbb0fb52b22ece65126ed675
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationContextTreeNodeInfoTest.cs)	(revision b6f4e414fc874653cc6ad84b80f330b28e69b823)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 968cbe97d1a910b9bbb0fb52b22ece65126ed675)
@@ -237,7 +237,7 @@
                 using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, assessmentSectionMock, treeViewControl))
                 {
                     // Assert
-                    Assert.AreEqual(10, menu.Items.Count);
+                    Assert.AreEqual(11, menu.Items.Count);
 
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateIndex,
                                                                   "&Valideren",
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r28743d8fed7b8b658764829b629fda81786aa808 -r968cbe97d1a910b9bbb0fb52b22ece65126ed675
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 28743d8fed7b8b658764829b629fda81786aa808)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 968cbe97d1a910b9bbb0fb52b22ece65126ed675)
@@ -234,7 +234,7 @@
                 using (ContextMenuStrip menu = info.ContextMenuStrip(groupContext, null, treeViewControl))
                 {
                     // Assert
-                    Assert.AreEqual(12, menu.Items.Count);
+                    Assert.AreEqual(13, menu.Items.Count);
 
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexRootGroup,
                                                                   "&Map toevoegen",
@@ -244,7 +244,6 @@
                                                                   "Berekening &toevoegen",
                                                                   "Voeg een nieuwe berekening toe aan deze berekeningsmap.",
                                                                   RingtoetsCommonFormsResources.FailureMechanismIcon);
-                    ;
 
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateAllIndexRootGroup,
                                                                   "Alles &valideren",
@@ -335,7 +334,7 @@
                 using (ContextMenuStrip menu = info.ContextMenuStrip(groupContext, parentGroupContext, treeViewControl))
                 {
                     // Assert
-                    Assert.AreEqual(13, menu.Items.Count);
+                    Assert.AreEqual(14, menu.Items.Count);
 
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexNestedGroup,
                                                                   "&Map toevoegen",
Index: Ringtoets/Common/test/Ringtoets.Common.Utils.Test/AssignUnassignCalculationsTest.cs
===================================================================
diff -u -r1b1417a8dc33bc6b1e0b33c71d9318544c3daa73 -r968cbe97d1a910b9bbb0fb52b22ece65126ed675
--- Ringtoets/Common/test/Ringtoets.Common.Utils.Test/AssignUnassignCalculationsTest.cs	(.../AssignUnassignCalculationsTest.cs)	(revision 1b1417a8dc33bc6b1e0b33c71d9318544c3daa73)
+++ Ringtoets/Common/test/Ringtoets.Common.Utils.Test/AssignUnassignCalculationsTest.cs	(.../AssignUnassignCalculationsTest.cs)	(revision 968cbe97d1a910b9bbb0fb52b22ece65126ed675)
@@ -117,7 +117,7 @@
         }
 
         [Test]
-        public void Update_CalculationLocationChangedToMatchOtherSection_FirstSectionResultCalculationNullSecondSectionResultCalculationSet()
+        public void Update_CalculationLocationChangedToMatchOtherSectionAndOtherSectionWithoutCalculation_FirstSectionResultCalculationNullSecondSectionResultCalculationSet()
         {
             // Setup
             var mockRepository = new MockRepository();
@@ -159,7 +159,7 @@
         }
 
         [Test]
-        public void Update_CalculationCalculationChangedToMatchOtherSection_FirstSectionResultCalculationNullSecondSectionResultCalculationUnchanged()
+        public void Update_CalculationLocationChangedToMatchOtherSectionAndOtherSectionHasCalculation_FirstSectionResultCalculationNullSecondSectionResultCalculationUnchanged()
         {
             // Setup
             var mockRepository = new MockRepository();
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r1b1417a8dc33bc6b1e0b33c71d9318544c3daa73 -r968cbe97d1a910b9bbb0fb52b22ece65126ed675
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs)	(revision 1b1417a8dc33bc6b1e0b33c71d9318544c3daa73)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs)	(revision 968cbe97d1a910b9bbb0fb52b22ece65126ed675)
@@ -242,7 +242,7 @@
                 using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, assessmentSectionMock, treeViewControl))
                 {
                     // Assert
-                    Assert.AreEqual(10, menu.Items.Count);
+                    Assert.AreEqual(11, menu.Items.Count);
 
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateIndex,
                                                                   RingtoetsCommonFormsResources.Validate,
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r7b3f00698f1c53c6464df710234f7b4b716e9bd3 -r968cbe97d1a910b9bbb0fb52b22ece65126ed675
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 7b3f00698f1c53c6464df710234f7b4b716e9bd3)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 968cbe97d1a910b9bbb0fb52b22ece65126ed675)
@@ -238,7 +238,7 @@
                 using (ContextMenuStrip menu = info.ContextMenuStrip(groupContext, null, treeViewControl))
                 {
                     // Assert
-                    Assert.AreEqual(14, menu.Items.Count);
+                    Assert.AreEqual(15, menu.Items.Count);
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexRootGroup,
                                                                   RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup,
                                                                   RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup_Tooltip,
@@ -336,7 +336,7 @@
                 using (ContextMenuStrip menu = info.ContextMenuStrip(groupContext, parentGroupContext, treeViewControl))
                 {
                     // Assert
-                    Assert.AreEqual(13, menu.Items.Count);
+                    Assert.AreEqual(14, menu.Items.Count);
 
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexNestedGroup,
                                                                   RingtoetsCommonFormsResources.CalculationGroup_Add_CalculationGroup,
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb6f4e414fc874653cc6ad84b80f330b28e69b823 -r968cbe97d1a910b9bbb0fb52b22ece65126ed675
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision b6f4e414fc874653cc6ad84b80f330b28e69b823)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision 968cbe97d1a910b9bbb0fb52b22ece65126ed675)
@@ -265,7 +265,7 @@
                 using (ContextMenuStrip menu = info.ContextMenuStrip(failureMechanismContext, assessmentSectionMock, treeView))
                 {
                     // Assert
-                    Assert.AreEqual(9, menu.Items.Count);
+                    Assert.AreEqual(10, menu.Items.Count);
 
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRelevancyIndexWhenRelevant,
                                                                   RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant,
@@ -320,7 +320,7 @@
                 using (ContextMenuStrip menu = info.ContextMenuStrip(failureMechanismContext, assessmentSectionMock, treeView))
                 {
                     // Assert
-                    Assert.AreEqual(3, menu.Items.Count);
+                    Assert.AreEqual(4, menu.Items.Count);
 
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRelevancyIndexWhenNotRelevant,
                                                                   RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant,
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r0fe6f60021cee37e16f68fa89feb3bd36759a98a -r968cbe97d1a910b9bbb0fb52b22ece65126ed675
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs)	(revision 0fe6f60021cee37e16f68fa89feb3bd36759a98a)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs)	(revision 968cbe97d1a910b9bbb0fb52b22ece65126ed675)
@@ -55,7 +55,7 @@
     [TestFixture]
     public class GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest
     {
-        private const int contextMenuRunDesignWaterLevelCalculationsIndex = 1;
+        private const int contextMenuRunDesignWaterLevelCalculationsIndex = 2;
         private MockRepository mockRepository;
 
         private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r968cbe97d1a910b9bbb0fb52b22ece65126ed675
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision 968cbe97d1a910b9bbb0fb52b22ece65126ed675)
@@ -53,7 +53,7 @@
     [TestFixture]
     public class GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest
     {
-        private const int contextMenuRunWaveHeightCalculationsIndex = 1;
+        private const int contextMenuRunWaveHeightCalculationsIndex = 2;
         private MockRepository mockRepository;
         private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
 
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r3dc04fc5fb21350c7b4da44fdba336aead86560e -r968cbe97d1a910b9bbb0fb52b22ece65126ed675
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 3dc04fc5fb21350c7b4da44fdba336aead86560e)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 968cbe97d1a910b9bbb0fb52b22ece65126ed675)
@@ -233,7 +233,7 @@
                 using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, assessmentSectionStub, treeViewControl))
                 {
                     // Assert
-                    Assert.AreEqual(10, menu.Items.Count);
+                    Assert.AreEqual(11, menu.Items.Count);
 
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateIndex,
                                                                   RingtoetsCommonFormsResources.Validate,
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r4d12ae0f611b8375558e189e3bddc6e0204a9404 -r968cbe97d1a910b9bbb0fb52b22ece65126ed675
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 4d12ae0f611b8375558e189e3bddc6e0204a9404)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 968cbe97d1a910b9bbb0fb52b22ece65126ed675)
@@ -232,7 +232,7 @@
                 using (ContextMenuStrip menu = info.ContextMenuStrip(groupContext, null, treeViewControl))
                 {
                     // Assert
-                    Assert.AreEqual(14, menu.Items.Count);
+                    Assert.AreEqual(15, menu.Items.Count);
 
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextGenerateCalculationsIndexRootGroup,
                                                                   "Genereer &berekeningen...",
@@ -292,7 +292,7 @@
                 using (ContextMenuStrip menu = info.ContextMenuStrip(groupContext, null, treeViewControl))
                 {
                     // Assert
-                    Assert.AreEqual(14, menu.Items.Count);
+                    Assert.AreEqual(15, menu.Items.Count);
 
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextGenerateCalculationsIndexRootGroup,
                                                                   "Genereer &berekeningen...",
@@ -373,7 +373,7 @@
                 using (ContextMenuStrip menu = info.ContextMenuStrip(groupContext, parentGroupContext, treeViewControl))
                 {
                     // Assert
-                    Assert.AreEqual(13, menu.Items.Count);
+                    Assert.AreEqual(14, menu.Items.Count);
 
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexNestedGroup,
                                                                   "&Map toevoegen",
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r3dc04fc5fb21350c7b4da44fdba336aead86560e -r968cbe97d1a910b9bbb0fb52b22ece65126ed675
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 3dc04fc5fb21350c7b4da44fdba336aead86560e)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 968cbe97d1a910b9bbb0fb52b22ece65126ed675)
@@ -268,7 +268,7 @@
                 using (ContextMenuStrip menu = info.ContextMenuStrip(failureMechanismContext, assessmentSectionMock, treeView))
                 {
                     // Assert
-                    Assert.AreEqual(9, menu.Items.Count);
+                    Assert.AreEqual(10, menu.Items.Count);
 
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRelevancyIndexWhenRelevant,
                                                                   RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant,
@@ -322,7 +322,7 @@
                 using (ContextMenuStrip menu = info.ContextMenuStrip(failureMechanismContext, assessmentSectionMock, treeView))
                 {
                     // Assert
-                    Assert.AreEqual(3, menu.Items.Count);
+                    Assert.AreEqual(4, menu.Items.Count);
 
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRelevancyIndexWhenNotRelevant,
                                                                   RingtoetsCommonFormsResources.FailureMechanismContextMenuStrip_Is_relevant,
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r6ddf92411860d3f692da3018e1662e633003e0a9 -r968cbe97d1a910b9bbb0fb52b22ece65126ed675
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs	(.../DesignWaterLevelLocationsContextTreeNodeInfoTest.cs)	(revision 6ddf92411860d3f692da3018e1662e633003e0a9)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs	(.../DesignWaterLevelLocationsContextTreeNodeInfoTest.cs)	(revision 968cbe97d1a910b9bbb0fb52b22ece65126ed675)
@@ -50,7 +50,7 @@
     [TestFixture]
     public class DesignWaterLevelLocationsContextTreeNodeInfoTest : NUnitFormTest
     {
-        private const int contextMenuRunAssessmentLevelCalculationsIndex = 1;
+        private const int contextMenuRunAssessmentLevelCalculationsIndex = 2;
         private MockRepository mockRepository;
         private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r6ddf92411860d3f692da3018e1662e633003e0a9 -r968cbe97d1a910b9bbb0fb52b22ece65126ed675
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs	(.../WaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision 6ddf92411860d3f692da3018e1662e633003e0a9)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs	(.../WaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision 968cbe97d1a910b9bbb0fb52b22ece65126ed675)
@@ -50,7 +50,7 @@
     [TestFixture]
     public class WaveHeightLocationsContextTreeNodeInfoTest : NUnitFormTest
     {
-        private const int contextMenuRunWaveHeightCalculationsIndex = 1;
+        private const int contextMenuRunWaveHeightCalculationsIndex = 2;
         private MockRepository mockRepository;
 
         private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc899b9042ee83f3ac6d6213515d7edacfbe8c414 -r968cbe97d1a910b9bbb0fb52b22ece65126ed675
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision c899b9042ee83f3ac6d6213515d7edacfbe8c414)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 968cbe97d1a910b9bbb0fb52b22ece65126ed675)
@@ -70,7 +70,7 @@
         private const int contextMenuCalculateAllIndexNestedGroup = 4;
         private const int contextMenuClearOutputNestedGroupIndex = 5;
 
-        private const int customOnlyContextMenuAddGenerateCalculationsIndex = 1;
+        private const int customOnlyContextMenuAddGenerateCalculationsIndex = 2;
 
         private MockRepository mocks;
         private PipingPlugin plugin;
@@ -412,7 +412,7 @@
                 using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl))
                 {
                     // Assert
-                    TestHelper.AssertContextMenuStripContainsItem(menu, 1,
+                    TestHelper.AssertContextMenuStripContainsItem(menu, 2,
                                                                   RingtoetsCommonFormsResources.CalculationGroup_Generate_Scenarios,
                                                                   PipingFormsResources.PipingCalculationGroup_Generate_PipingCalculations_NoSurfaceLinesOrSoilModels_ToolTip,
                                                                   RingtoetsCommonFormsResources.GenerateScenariosIcon,
@@ -455,7 +455,7 @@
                 using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl))
                 {
                     // Assert
-                    TestHelper.AssertContextMenuStripContainsItem(menu, 1,
+                    TestHelper.AssertContextMenuStripContainsItem(menu, 2,
                                                                   RingtoetsCommonFormsResources.CalculationGroup_Generate_Scenarios,
                                                                   PipingFormsResources.PipingCalculationGroup_Generate_PipingCalculations_NoSurfaceLinesOrSoilModels_ToolTip,
                                                                   RingtoetsCommonFormsResources.GenerateScenariosIcon,
@@ -501,7 +501,7 @@
                 using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, null, treeViewControl))
                 {
                     // Assert
-                    TestHelper.AssertContextMenuStripContainsItem(menu, 1,
+                    TestHelper.AssertContextMenuStripContainsItem(menu, 2,
                                                                   RingtoetsCommonFormsResources.CalculationGroup_Generate_Scenarios,
                                                                   PipingFormsResources.PipingCalculationGroup_Generate_PipingCalculations_ToolTip,
                                                                   RingtoetsCommonFormsResources.GenerateScenariosIcon);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rd689ea05c1014eb4d51b927e11eb6c48255f0a47 -r968cbe97d1a910b9bbb0fb52b22ece65126ed675
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision d689ea05c1014eb4d51b927e11eb6c48255f0a47)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision 968cbe97d1a910b9bbb0fb52b22ece65126ed675)
@@ -55,11 +55,11 @@
     [TestFixture]
     public class PipingFailureMechanismContextTreeNodeInfoTest : NUnitFormTest
     {
-        private const int contextMenuRelevancyIndexWhenRelevant = 1;
+        private const int contextMenuRelevancyIndexWhenRelevant = 2;
         private const int contextMenuRelevancyIndexWhenNotRelevant = 0;
-        private const int contextMenuValidateAllIndex = 3;
-        private const int contextMenuCalculateAllIndex = 4;
-        private const int contextMenuClearIndex = 5;
+        private const int contextMenuValidateAllIndex = 4;
+        private const int contextMenuCalculateAllIndex = 5;
+        private const int contextMenuClearIndex = 6;
         private MockRepository mocks;
         private PipingPlugin plugin;
         private TreeNodeInfo info;
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r51627a4d3b99a6354bf5a01eb5ecaf8e1ab04611 -r968cbe97d1a910b9bbb0fb52b22ece65126ed675
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 51627a4d3b99a6354bf5a01eb5ecaf8e1ab04611)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 968cbe97d1a910b9bbb0fb52b22ece65126ed675)
@@ -236,7 +236,7 @@
                 using (ContextMenuStrip menu = info.ContextMenuStrip(nodeData, assessmentSectionMock, treeViewControl))
                 {
                     // Assert
-                    Assert.AreEqual(10, menu.Items.Count);
+                    Assert.AreEqual(11, menu.Items.Count);
 
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuValidateIndex,
                                                                   "&Valideren",
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r51627a4d3b99a6354bf5a01eb5ecaf8e1ab04611 -r968cbe97d1a910b9bbb0fb52b22ece65126ed675
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 51627a4d3b99a6354bf5a01eb5ecaf8e1ab04611)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 968cbe97d1a910b9bbb0fb52b22ece65126ed675)
@@ -224,7 +224,7 @@
                 using (ContextMenuStrip menu = info.ContextMenuStrip(groupContext, null, treeViewControl))
                 {
                     // Assert
-                    Assert.AreEqual(14, menu.Items.Count);
+                    Assert.AreEqual(15, menu.Items.Count);
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexRootGroup,
                                                                   "&Map toevoegen",
                                                                   "Voeg een nieuwe berekeningsmap toe aan deze berekeningsmap.",
@@ -699,7 +699,7 @@
                 using (ContextMenuStrip menu = info.ContextMenuStrip(groupContext, parentGroupContext, treeViewControl))
                 {
                     // Assert
-                    Assert.AreEqual(13, menu.Items.Count);
+                    Assert.AreEqual(14, menu.Items.Count);
 
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuAddCalculationGroupIndexNestedGroup,
                                                                   "&Map toevoegen",
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r51627a4d3b99a6354bf5a01eb5ecaf8e1ab04611 -r968cbe97d1a910b9bbb0fb52b22ece65126ed675
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 51627a4d3b99a6354bf5a01eb5ecaf8e1ab04611)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 968cbe97d1a910b9bbb0fb52b22ece65126ed675)
@@ -272,7 +272,7 @@
                 using (ContextMenuStrip menu = info.ContextMenuStrip(failureMechanismContext, assessmentSectionMock, treeView))
                 {
                     // Assert
-                    Assert.AreEqual(9, menu.Items.Count);
+                    Assert.AreEqual(10, menu.Items.Count);
 
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRelevancyIndexWhenRelevant,
                                                                   "I&s relevant",
@@ -331,7 +331,7 @@
                 using (ContextMenuStrip menu = info.ContextMenuStrip(failureMechanismContext, assessmentSectionMock, treeView))
                 {
                     // Assert
-                    Assert.AreEqual(3, menu.Items.Count);
+                    Assert.AreEqual(4, menu.Items.Count);
 
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuRelevancyIndexWhenNotRelevant,
                                                                   "I&s relevant",