Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -r84afb606e58d67c6342c4f11bf66b042e49f52d6 -r807598022746fc4a110fa6af9038c0896f5a6c0f
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs	(.../WaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision 84afb606e58d67c6342c4f11bf66b042e49f52d6)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs	(.../WaveHeightLocationsContextTreeNodeInfoTest.cs)	(revision 807598022746fc4a110fa6af9038c0896f5a6c0f)
@@ -43,6 +43,7 @@
 
 namespace Ringtoets.Integration.Forms.Test.TreeNodeInfos
 {
+    [TestFixture]
     public class WaveHeightLocationsContextTreeNodeInfoTest : NUnitFormTest
     {
         private MockRepository mockRepository;
@@ -122,6 +123,8 @@
 
             var nodeData = new WaveHeightLocationsContext(assessmentSectionMock);
 
+            menuBuilderMock.Expect(mb => mb.AddOpenItem()).Return(menuBuilderMock);
+            menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock);
@@ -176,9 +179,10 @@
                     var contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
                     // Assert
-                    const string expectedItemText = "&Berekenen";
+                    const string expectedItemText = "Alles be&rekenen";
                     const string expectedItemTooltip = "Er is geen hydraulische randvoorwaardendatabase beschikbaar om de golfhoogtes te berekenen.";
-                    TestHelper.AssertContextMenuStripContainsItem(contextMenu, 0, expectedItemText, expectedItemTooltip, Resources.FailureMechanismIcon, false);
+                    TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuRunWaveHeightCalculationsIndex,
+                                                                  expectedItemText, expectedItemTooltip, Resources.CalculateAllIcon, false);
                 }
             }
 
@@ -217,10 +221,11 @@
                     ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, null, treeViewControl);
 
                     // Assert
-                    const string expectedItemText = "&Berekenen";
-                    const string expectedItemTooltip = "Bereken de golfhoogtes.";
+                    const string expectedItemText = "Alles be&rekenen";
+                    const string expectedItemTooltip = "Alle golfhoogtes berekenen.";
 
-                    TestHelper.AssertContextMenuStripContainsItem(contextMenu, 0, expectedItemText, expectedItemTooltip, Resources.FailureMechanismIcon);
+                    TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuRunWaveHeightCalculationsIndex,
+                                                                  expectedItemText, expectedItemTooltip, Resources.CalculateAllIcon);
                 }
             }
 
@@ -278,8 +283,6 @@
             // Given
             var guiMock = mockRepository.DynamicMock<IGui>();
 
-            var contextMenuRunWaveHeightCalculationsIndex = 0;
-
             RoundedDouble waveHeight = (RoundedDouble) 4.2;
             var hydraulicBoundaryLocation1 = new HydraulicBoundaryLocation(100001, "", 1.1, 2.2);
             var hydraulicBoundaryLocation2 = new HydraulicBoundaryLocation(100002, "", 3.3, 4.4)
@@ -335,6 +338,8 @@
             mockRepository.VerifyAll();
         }
 
+        private const int contextMenuRunWaveHeightCalculationsIndex = 1;
+
         private static TreeNodeInfo GetInfo(RingtoetsPlugin plugin)
         {
             return plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(WaveHeightLocationsContext));