Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r8f9a6a79ed708dadaecdecd9ba03c7b790c43317 -r6625b110ccf09a362fbd16520bb4eceeaf0ebf96
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs	(.../DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs)	(revision 8f9a6a79ed708dadaecdecd9ba03c7b790c43317)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs	(.../DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextTreeNodeInfoTest.cs)	(revision 6625b110ccf09a362fbd16520bb4eceeaf0ebf96)
@@ -266,7 +266,7 @@
 
                         TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex,
                                                                       "Alles be&rekenen",
-                                                                      "Er is geen hydraulische belastingendatabase geïmporteerd.",
+                                                                      "Geen van de locaties is geschikt voor een hydraulische belastingenberekening.",
                                                                       RiskeerCommonFormsResources.CalculateAllIcon,
                                                                       false);
                     }
@@ -454,52 +454,6 @@
         }
 
         [Test]
-        public void ContextMenuStrip_HydraulicBoundaryDatabaseNotLinked_ContextMenuItemCalculateAllDisabledAndTooltipSet()
-        {
-            // Setup
-            var duneLocation = new TestDuneLocation("Test");
-            var failureMechanism = new DuneErosionFailureMechanism();
-            var assessmentSection = new AssessmentSectionStub();
-
-            failureMechanism.SetDuneLocations(new[]
-            {
-                duneLocation
-            });
-
-            var groupContext = new DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContext(new ObservableList<DuneLocationCalculationsForTargetProbability>(),
-                                                                                                         failureMechanism,
-                                                                                                         assessmentSection);
-
-            var mocks = new MockRepository();
-
-            using (var treeViewControl = new TreeViewControl())
-            {
-                var gui = mocks.Stub<IGui>();
-                gui.Stub(cmp => cmp.Get(groupContext, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
-                gui.Stub(g => g.ViewHost).Return(mocks.Stub<IViewHost>());
-                mocks.ReplayAll();
-
-                using (var plugin = new DuneErosionPlugin())
-                {
-                    TreeNodeInfo info = GetInfo(plugin);
-                    plugin.Gui = gui;
-
-                    // Call
-                    using (ContextMenuStrip contextMenu = info.ContextMenuStrip(groupContext, null, treeViewControl))
-                    {
-                        // Assert
-                        ToolStripItem contextMenuItem = contextMenu.Items[contextMenuCalculateAllIndex];
-
-                        StringAssert.Contains("Er is geen hydraulische belastingendatabase geïmporteerd.", contextMenuItem.ToolTipText);
-                        Assert.IsFalse(contextMenuItem.Enabled);
-                    }
-                }
-            }
-
-            mocks.VerifyAll();
-        }
-
-        [Test]
         public void ContextMenuStrip_NoDuneLocationsPresent_ContextMenuItemCalculateAllDisabledAndTooltipSet()
         {
             // Setup
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs
===================================================================
diff -u -r8f9a6a79ed708dadaecdecd9ba03c7b790c43317 -r6625b110ccf09a362fbd16520bb4eceeaf0ebf96
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs	(.../DuneLocationCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs)	(revision 8f9a6a79ed708dadaecdecd9ba03c7b790c43317)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs	(.../DuneLocationCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs)	(revision 6625b110ccf09a362fbd16520bb4eceeaf0ebf96)
@@ -286,9 +286,8 @@
 
                     TestHelper.AssertContextMenuStripContainsItem(menu, contextMenuCalculateAllIndex,
                                                                   "Alles be&rekenen",
-                                                                  "Er is geen hydraulische belastingendatabase geïmporteerd.",
-                                                                  RiskeerCommonFormsResources.CalculateAllIcon,
-                                                                  false);
+                                                                  "Alle hydraulische belastingen berekenen.",
+                                                                  RiskeerCommonFormsResources.CalculateAllIcon);
                 }
             }
 
@@ -297,41 +296,6 @@
         }
 
         [Test]
-        public void ContextMenuStrip_HydraulicBoundaryDatabaseLinkedToInvalidFile_ContextMenuItemCalculateAllDisabledAndTooltipSet()
-        {
-            // Setup
-            using (var treeViewControl = new TreeViewControl())
-            {
-                IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(null, mocks, "invalidFilePath");
-
-                var context = new DuneLocationCalculationsForUserDefinedTargetProbabilityContext(new DuneLocationCalculationsForTargetProbability(0.1),
-                                                                                                 new DuneErosionFailureMechanism(),
-                                                                                                 assessmentSection);
-
-                var builder = new CustomItemsOnlyContextMenuBuilder();
-                var gui = mocks.Stub<IGui>();
-                gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(builder);
-                gui.Stub(g => g.ViewHost).Return(mocks.Stub<IViewHost>());
-
-                mocks.ReplayAll();
-
-                plugin.Gui = gui;
-
-                // Call
-                using (ContextMenuStrip menu = info.ContextMenuStrip(context, null, treeViewControl))
-                {
-                    // Assert
-                    ToolStripItem contextMenuItem = menu.Items[contextMenuCalculateAllIndex];
-
-                    Assert.AreEqual("Alles be&rekenen", contextMenuItem.Text);
-                    StringAssert.Contains("Herstellen van de verbinding met de hydraulische belastingendatabase is mislukt.", contextMenuItem.ToolTipText);
-                    TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.CalculateAllIcon, contextMenuItem.Image);
-                    Assert.IsFalse(contextMenuItem.Enabled);
-                }
-            }
-        }
-
-        [Test]
         public void ContextMenuStrip_AllRequiredInputSet_ContextMenuItemCalculateAllEnabled()
         {
             // Setup
@@ -385,7 +349,7 @@
             using (var treeViewControl = new TreeViewControl())
             {
                 var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1300001, string.Empty, 0, 0);
-                
+
                 var duneLocationCalculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(0.01)
                 {
                     DuneLocationCalculations =
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/HydraulicLoadsState/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r8f9a6a79ed708dadaecdecd9ba03c7b790c43317 -r6625b110ccf09a362fbd16520bb4eceeaf0ebf96
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/HydraulicLoadsState/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs	(.../DuneErosionFailureMechanismContextTreeNodeInfoTest.cs)	(revision 8f9a6a79ed708dadaecdecd9ba03c7b790c43317)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/HydraulicLoadsState/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs	(.../DuneErosionFailureMechanismContextTreeNodeInfoTest.cs)	(revision 6625b110ccf09a362fbd16520bb4eceeaf0ebf96)
@@ -178,43 +178,6 @@
         }
 
         [Test]
-        public void ContextMenuStrip_HydraulicBoundaryDatabaseNotLinked_ContextMenuItemCalculateAllDisabledAndTooltipSet()
-        {
-            // Setup
-            var duneLocation = new TestDuneLocation("Test");
-            var failureMechanism = new DuneErosionFailureMechanism();
-            var assessmentSection = new AssessmentSectionStub();
-
-            failureMechanism.SetDuneLocations(new[]
-            {
-                duneLocation
-            });
-
-            var context = new DuneErosionFailureMechanismContext(failureMechanism, assessmentSection);
-
-            using (var treeViewControl = new TreeViewControl())
-            {
-                var gui = mocksRepository.Stub<IGui>();
-                gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
-                gui.Stub(g => g.ViewHost).Return(mocksRepository.Stub<IViewHost>());
-                mocksRepository.ReplayAll();
-
-                plugin.Gui = gui;
-
-                // Call
-                using (ContextMenuStrip contextMenu = info.ContextMenuStrip(context, null, treeViewControl))
-                {
-                    // Assert
-                    TestHelper.AssertContextMenuStripContainsItem(contextMenu, contextMenuCalculateAllIndex,
-                                                                  "Alles be&rekenen",
-                                                                  "Er is geen hydraulische belastingendatabase geïmporteerd.",
-                                                                  RiskeerCommonFormsResources.CalculateAllIcon,
-                                                                  false);
-                }
-            }
-        }
-
-        [Test]
         public void ContextMenuStrip_NoDuneLocationsPresent_ContextMenuItemCalculateAllDisabledAndTooltipSet()
         {
             // Setup