Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -r745463e0b6ff5324e8cefeee44111b7d6bde62e2 -r3969f9ae596a0a0ba7460f6f615d4cf89a7a73e3
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 745463e0b6ff5324e8cefeee44111b7d6bde62e2)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 3969f9ae596a0a0ba7460f6f615d4cf89a7a73e3)
@@ -25,7 +25,6 @@
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base;
-using Core.Common.Base.Data;
 using Core.Common.Controls.TreeView;
 using Core.Common.Gui;
 using Core.Common.Gui.ContextMenu;
@@ -56,7 +55,6 @@
 using Ringtoets.GrassCoverErosionOutwards.Plugin.Properties;
 using Ringtoets.GrassCoverErosionOutwards.Service;
 using Ringtoets.GrassCoverErosionOutwards.Service.MessageProviders;
-using Ringtoets.Revetment.Data;
 using Ringtoets.Revetment.IO.Configurations;
 using RingtoetsGrassCoverErosionOutwardsFormsResources = Ringtoets.GrassCoverErosionOutwards.Forms.Properties.Resources;
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
@@ -500,8 +498,8 @@
                 GrassCoverErosionOutwardsFailureMechanism failureMechanism = context.FailureMechanism;
                 return new object[]
                 {
-                    new GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContext(locations, failureMechanism, assessmentSection), 
-                    new GrassCoverErosionOutwardsWaveHeightCalculationsGroupContext(locations, failureMechanism, assessmentSection), 
+                    new GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContext(locations, failureMechanism, assessmentSection),
+                    new GrassCoverErosionOutwardsWaveHeightCalculationsGroupContext(locations, failureMechanism, assessmentSection),
                     new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup,
                                                                                        null,
                                                                                        failureMechanism,
@@ -731,7 +729,7 @@
 
         private void ShowHydraulicBoundaryLocationSelectionDialog(GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext nodeData)
         {
-            using (var dialog = new HydraulicBoundaryLocationSelectionDialog(Gui.MainWindow, nodeData.FailureMechanism.HydraulicBoundaryLocations))
+            using (var dialog = new HydraulicBoundaryLocationSelectionDialog(Gui.MainWindow, nodeData.AssessmentSection.HydraulicBoundaryDatabase.Locations))
             {
                 dialog.ShowDialog();
 
@@ -1032,14 +1030,6 @@
 
         #endregion
 
-        private static double GetFailureMechanismSpecificNorm(IAssessmentSection assessmentSection, GrassCoverErosionOutwardsFailureMechanism failureMechanism)
-        {
-            return RingtoetsCommonDataCalculationService.ProfileSpecificRequiredProbability(
-                assessmentSection.FailureMechanismContribution.Norm,
-                failureMechanism.Contribution,
-                failureMechanism.GeneralInput.N);
-        }
-
         #endregion
 
         #region Hydraulic boundary norms
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj
===================================================================
diff -u -reb0206bf27d75fbfeb403b365a4218a228f007e4 -r3969f9ae596a0a0ba7460f6f615d4cf89a7a73e3
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj	(.../Ringtoets.Integration.Plugin.Test.csproj)	(revision eb0206bf27d75fbfeb403b365a4218a228f007e4)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj	(.../Ringtoets.Integration.Plugin.Test.csproj)	(revision 3969f9ae596a0a0ba7460f6f615d4cf89a7a73e3)
@@ -249,6 +249,10 @@
       <Project>{41B829C1-630F-40B0-8BEE-B1C4C94EC8C4}</Project>
       <Name>Ringtoets.GrassCoverErosionOutwards.Forms</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\GrassCoverErosionOutwards\test\Ringtoets.GrassCoverErosionOutwards.Util.TestUtil\Ringtoets.GrassCoverErosionOutwards.Util.TestUtil.csproj">
+      <Project>{C700ED66-8565-48B2-9A4E-B0D33FB2B26D}</Project>
+      <Name>Ringtoets.GrassCoverErosionOutwards.Util.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\HeightStructures\src\Ringtoets.HeightStructures.Data\Ringtoets.HeightStructures.Data.csproj">
       <Project>{1c0017d8-35b5-4ca0-8fc7-a83f46dbdc99}</Project>
       <Name>Ringtoets.HeightStructures.Data</Name>
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveConditionsInputViewInfoTest.cs
===================================================================
diff -u -rb44468e1681ccff52663d633b434b58cbef2cb23 -r3969f9ae596a0a0ba7460f6f615d4cf89a7a73e3
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveConditionsInputViewInfoTest.cs	(.../WaveConditionsInputViewInfoTest.cs)	(revision b44468e1681ccff52663d633b434b58cbef2cb23)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveConditionsInputViewInfoTest.cs	(.../WaveConditionsInputViewInfoTest.cs)	(revision 3969f9ae596a0a0ba7460f6f615d4cf89a7a73e3)
@@ -36,6 +36,7 @@
 using Ringtoets.Common.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
+using Ringtoets.GrassCoverErosionOutwards.Util.TestUtil;
 using Ringtoets.Integration.Data;
 using Ringtoets.Revetment.Data;
 using Ringtoets.Revetment.Data.TestUtil;
@@ -512,31 +513,26 @@
 
         private static IEnumerable<TestCaseData> GetInputContextDatasWithExpectedAssessmentLevel()
         {
-            const double assessmentLevel1 = 1.1;
-            const double assessmentLevel2 = 2.2;
+            const double assessmentLevel = 2.2;
 
-            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation
-            {
-                DesignWaterLevelCalculation1 =
-                {
-                    Output = new TestHydraulicBoundaryLocationOutput(assessmentLevel1)
-                }
-            };
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
 
             var waveConditionsInput = new WaveConditionsInput
             {
                 HydraulicBoundaryLocation = hydraulicBoundaryLocation
             };
 
-            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
+            var assessmentSection = new AssessmentSectionStub();
+            var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
+            GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.AddHydraulicBoundaryLocations(
+                failureMechanism, assessmentSection,
+                new []
+                {
+                    hydraulicBoundaryLocation
+                });
 
-            assessmentSection.SetHydraulicBoundaryLocationCalculations(new[]
-            {
-                hydraulicBoundaryLocation
-            });
+            assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(assessmentLevel);
 
-            assessmentSection.WaterLevelCalculationsForLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(assessmentLevel2);
-
             yield return new TestCaseData(
                     new GrassCoverErosionOutwardsWaveConditionsInputContext(
                         waveConditionsInput,
@@ -549,7 +545,7 @@
                         },
                         assessmentSection,
                         new GrassCoverErosionOutwardsFailureMechanism()),
-                    assessmentLevel1)
+                    assessmentLevel)
                 .SetName("Grass outwards input context");
 
             yield return new TestCaseData(
@@ -564,7 +560,7 @@
                         },
                         assessmentSection,
                         new ForeshoreProfile[0]),
-                    assessmentLevel2)
+                    assessmentLevel)
                 .SetName("Stability stone cover input context");
 
             yield return new TestCaseData(
@@ -579,7 +575,7 @@
                         },
                         assessmentSection,
                         new ForeshoreProfile[0]),
-                    assessmentLevel2)
+                    assessmentLevel)
                 .SetName("Wave impact asphalt cover input context");
         }