Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -rc77700f7e4ad3e6abebd13ec31c4d2e06f41d2a6 -rf7b5e37a3d47d5a8c5de988b601ad71159d7755e
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision c77700f7e4ad3e6abebd13ec31c4d2e06f41d2a6)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision f7b5e37a3d47d5a8c5de988b601ad71159d7755e)
@@ -46,6 +46,7 @@
 using Ringtoets.Common.Service.TestUtil;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
+using Ringtoets.GrassCoverErosionOutwards.Util.TestUtil;
 using Ringtoets.HydraRing.Calculation.Calculator.Factory;
 using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
 using Ringtoets.Revetment.Data;
@@ -310,38 +311,30 @@
         public void ChildNodeObjects_CalculationWithoutOutput_ReturnChildrenWithEmptyOutput()
         {
             // Setup
-            var location = new TestHydraulicBoundaryLocation();
-
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase
-            {
-                Locations =
-                {
-                    location
-                }
-            });
-
             mocks.ReplayAll();
 
+            var location = new TestHydraulicBoundaryLocation();
+            var assessmentSection = new AssessmentSectionStub();
+
             var parent = new CalculationGroup();
             var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
                 Output = null
             };
             var foreshoreProfile = new TestForeshoreProfile(new BreakWater(BreakWaterType.Caisson, 1));
 
-            var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism
-            {
-                HydraulicBoundaryLocations =
-                {
-                    location
-                }
-            };
+            var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
             failureMechanism.ForeshoreProfiles.AddRange(new[]
             {
                 foreshoreProfile
             }, "path");
 
+            GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.AddHydraulicBoundaryLocations(
+                failureMechanism, assessmentSection, new[]
+                {
+                    location
+                });
+
             var context = new GrassCoverErosionOutwardsWaveConditionsCalculationContext(calculation,
                                                                                         parent,
                                                                                         failureMechanism,
@@ -376,38 +369,30 @@
         public void ChildNodeObjects_CalculationWithOutput_ReturnChildrenWithOutput()
         {
             // Setup
-            var location = new TestHydraulicBoundaryLocation();
-
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase
-            {
-                Locations =
-                {
-                    location
-                }
-            });
-
             mocks.ReplayAll();
 
+            var location = new TestHydraulicBoundaryLocation();
+            var assessmentSection = new AssessmentSectionStub();
+            
             var parent = new CalculationGroup();
             var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
                 Output = new GrassCoverErosionOutwardsWaveConditionsOutput(Enumerable.Empty<WaveConditionsOutput>())
             };
             var foreshoreProfile = new TestForeshoreProfile(new BreakWater(BreakWaterType.Caisson, 1));
 
-            var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism
-            {
-                HydraulicBoundaryLocations =
-                {
-                    location
-                }
-            };
+            var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
             failureMechanism.ForeshoreProfiles.AddRange(new[]
             {
                 foreshoreProfile
             }, "path");
 
+            GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.AddHydraulicBoundaryLocations(
+                failureMechanism, assessmentSection, new[]
+                {
+                    location
+                });
+
             var context = new GrassCoverErosionOutwardsWaveConditionsCalculationContext(calculation,
                                                                                         parent,
                                                                                         failureMechanism,