Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r249a26006e363c5bb4cf26d2f033ee87c30e4bf4 -r6a408a0c806e8f01025d719542993ce75c3c3211
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 249a26006e363c5bb4cf26d2f033ee87c30e4bf4)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 6a408a0c806e8f01025d719542993ce75c3c3211)
@@ -2150,15 +2150,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Alle hydraulische randvoorwaarden berekenen..
-        /// </summary>
-        public static string HydraulicBoundaryDatabase_Calculate_All_ToolTip {
-            get {
-                return ResourceManager.GetString("HydraulicBoundaryDatabase_Calculate_All_ToolTip", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Coördinaten van de hydraulische randvoorwaardenlocatie..
         /// </summary>
         public static string HydraulicBoundaryDatabase_Location_Coordinates_Description {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r249a26006e363c5bb4cf26d2f033ee87c30e4bf4 -r6a408a0c806e8f01025d719542993ce75c3c3211
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 249a26006e363c5bb4cf26d2f033ee87c30e4bf4)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 6a408a0c806e8f01025d719542993ce75c3c3211)
@@ -169,9 +169,6 @@
   <data name="WaveHeight_Calculate_All_ToolTip" xml:space="preserve">
     <value>Alle golfhoogten berekenen.</value>
   </data>
-  <data name="HydraulicBoundaryDatabase_Calculate_All_ToolTip" xml:space="preserve">
-    <value>Alle hydraulische randvoorwaarden berekenen.</value>
-  </data>
   <data name="Clear_all_output_ToolTip" xml:space="preserve">
     <value>Wis de uitvoer van alle berekeningen binnen dit toetsspoor.</value>
   </data>
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r9fb6b330d45af8ac4ebdf127bb5907781cdb5155 -r6a408a0c806e8f01025d719542993ce75c3c3211
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision 9fb6b330d45af8ac4ebdf127bb5907781cdb5155)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision 6a408a0c806e8f01025d719542993ce75c3c3211)
@@ -49,6 +49,7 @@
 using Ringtoets.Common.Plugin.TestUtil;
 using Ringtoets.Common.Service.TestUtil;
 using Ringtoets.GrassCoverErosionOutwards.Data;
+using Ringtoets.GrassCoverErosionOutwards.Data.TestUtil;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Ringtoets.HydraRing.Calculation.Calculator.Factory;
 using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
@@ -370,8 +371,7 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase
             {
-                FilePath = validFilePath,
-                Version = "1.0"
+                FilePath = validFilePath
             });
 
             var nodeData = new GrassCoverErosionOutwardsFailureMechanismContext(failureMechanism, assessmentSection);
@@ -536,14 +536,11 @@
             };
 
             var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation("Test");
-            failureMechanism.SetHydraulicBoundaryLocationCalculations(new[]
-            {
-                hydraulicBoundaryLocation
-            });
-            assessmentSection.SetHydraulicBoundaryLocationCalculations(new[]
-            {
-                hydraulicBoundaryLocation
-            });
+            GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations(
+                failureMechanism, assessmentSection, new[]
+                {
+                    hydraulicBoundaryLocation
+                });
 
             GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(hydraulicBoundaryLocation);
             failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculation);
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs
===================================================================
diff -u -r9fb6b330d45af8ac4ebdf127bb5907781cdb5155 -r6a408a0c806e8f01025d719542993ce75c3c3211
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision 9fb6b330d45af8ac4ebdf127bb5907781cdb5155)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision 6a408a0c806e8f01025d719542993ce75c3c3211)
@@ -42,6 +42,7 @@
 using Ringtoets.Common.Plugin.TestUtil;
 using Ringtoets.Common.Service.TestUtil;
 using Ringtoets.GrassCoverErosionOutwards.Data;
+using Ringtoets.GrassCoverErosionOutwards.Data.TestUtil;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Ringtoets.HydraRing.Calculation.Calculator.Factory;
 using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
@@ -166,7 +167,6 @@
         {
             // Setup
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(new GrassCoverErosionOutwardsWaveConditionsCalculation());
 
             var assessmentSection = new AssessmentSectionStub
             {
@@ -260,14 +260,11 @@
             };
 
             var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation("Test");
-            failureMechanism.SetHydraulicBoundaryLocationCalculations(new[]
-            {
-                hydraulicBoundaryLocation
-            });
-            assessmentSection.SetHydraulicBoundaryLocationCalculations(new[]
-            {
-                hydraulicBoundaryLocation
-            });
+            GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations(
+                failureMechanism, assessmentSection, new[]
+                {
+                    hydraulicBoundaryLocation
+                });
 
             GrassCoverErosionOutwardsWaveConditionsCalculation calculation = CreateValidCalculation(hydraulicBoundaryLocation);
             failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculation);
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs
===================================================================
diff -u -r5b7ef79633668d91363a37f5451dfaa25df60e07 -r6a408a0c806e8f01025d719542993ce75c3c3211
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 5b7ef79633668d91363a37f5451dfaa25df60e07)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 6a408a0c806e8f01025d719542993ce75c3c3211)
@@ -274,6 +274,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Alle hydraulische randvoorwaarden berekenen..
+        /// </summary>
+        public static string HydraulicBoundaryDatabase_Calculate_All_ToolTip {
+            get {
+                return ResourceManager.GetString("HydraulicBoundaryDatabase_Calculate_All_ToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Na het importeren van een aangepaste ligging van de referentielijn zullen alle geïmporteerde en berekende gegevens van alle toetssporen worden gewist.
         ///
         ///Wilt u doorgaan?.
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx
===================================================================
diff -u -r5b7ef79633668d91363a37f5451dfaa25df60e07 -r6a408a0c806e8f01025d719542993ce75c3c3211
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx	(.../Resources.resx)	(revision 5b7ef79633668d91363a37f5451dfaa25df60e07)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx	(.../Resources.resx)	(revision 6a408a0c806e8f01025d719542993ce75c3c3211)
@@ -203,4 +203,7 @@
   <data name="AssessmentSectionMerger_PerformMerge_Merging_assessmentSections_failed" xml:space="preserve">
     <value>Samenvoegen van trajecten is mislukt.</value>
   </data>
+  <data name="HydraulicBoundaryDatabase_Calculate_All_ToolTip" xml:space="preserve">
+    <value>Alle hydraulische randvoorwaarden berekenen.</value>
+  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -rcefa939adb72acbca0897825a4248781aa7d8ea3 -r6a408a0c806e8f01025d719542993ce75c3c3211
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision cefa939adb72acbca0897825a4248781aa7d8ea3)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 6a408a0c806e8f01025d719542993ce75c3c3211)
@@ -1945,7 +1945,7 @@
 
             var calculateAllItem = new StrictContextMenuItem(
                 RingtoetsCommonFormsResources.Calculate_All,
-                RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_Calculate_All_ToolTip,
+                Resources.HydraulicBoundaryDatabase_Calculate_All_ToolTip,
                 RingtoetsCommonFormsResources.CalculateAllIcon,
                 (sender, args) =>
                 {