Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs
===================================================================
diff -u -r3580e5dc953b53657221e6786845377eddb8868b -r8a90c409545ce1b48e018d3b5d6b5982dbef926f
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs	(.../FailureMechanismContributionViewIntegrationTest.cs)	(revision 3580e5dc953b53657221e6786845377eddb8868b)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs	(.../FailureMechanismContributionViewIntegrationTest.cs)	(revision 8a90c409545ce1b48e018d3b5d6b5982dbef926f)
@@ -33,7 +33,6 @@
 using Ringtoets.Common.Data.Probability;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.GrassCoverErosionInwards.Data;
-using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HydraRing.Data;
 using Ringtoets.Integration.Data;
@@ -98,13 +97,12 @@
                 Output = new ProbabilityAssessmentOutput(0, 0, 0, 0, 0)
             };
 
-            var grassCoverErosionOutwardsHydraulicBoundaryLocation = new GrassCoverErosionOutwardsHydraulicBoundaryLocation(hydraulicBoundaryLocation)
-            {
-                WaveHeight = waveHeight,
-                DesignWaterLevel = designWaterLevel
-            };
-            assessmentSection.GrassCoverErosionOutwards.GrassCoverErosionOutwardsHydraulicBoundaryLocations.Add(grassCoverErosionOutwardsHydraulicBoundaryLocation);
+            var grassCoverErosionOutwardsHydraulicBoundaryLocation = hydraulicBoundaryLocation;
+            grassCoverErosionOutwardsHydraulicBoundaryLocation.WaveHeight = waveHeight;
+            grassCoverErosionOutwardsHydraulicBoundaryLocation.DesignWaterLevel = designWaterLevel;
 
+            assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations.Add(grassCoverErosionOutwardsHydraulicBoundaryLocation);
+
             assessmentSection.PipingFailureMechanism.CalculationsGroup.Children.Add(emptyPipingCalculation);
             assessmentSection.PipingFailureMechanism.CalculationsGroup.Children.Add(pipingCalculation);
             assessmentSection.GrassCoverErosionInwards.CalculationsGroup.Children.Add(emptyGrassCoverErosionInwardsCalculation);
@@ -136,7 +134,7 @@
             grassCoverErosionInwardsCalculation.Attach(calculationObserver);
             heightStructuresCalculation.Attach(calculationObserver);
 
-            assessmentSection.GrassCoverErosionOutwards.GrassCoverErosionOutwardsHydraulicBoundaryLocations.Attach(grassCoverErosionOutwardsObserver);
+            assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations.Attach(grassCoverErosionOutwardsObserver);
 
             using (var form = new Form())
             using (var distributionView = new FailureMechanismContributionView
@@ -578,13 +576,17 @@
                 HydraulicBoundaryDatabase = hydraulicBoundaryDatabase
             };
 
-            var grassCoverErosionOutwardsHydraulicBoundaryLocation = new GrassCoverErosionOutwardsHydraulicBoundaryLocation(hydraulicBoundaryLocation)
+            var grassCoverErosionOutwardsHydraulicBoundaryLocation = new HydraulicBoundaryLocation(hydraulicBoundaryLocation.Id,
+                                                                                                   hydraulicBoundaryLocation.Name,
+                                                                                                   hydraulicBoundaryLocation.Location.X,
+                                                                                                   hydraulicBoundaryLocation.Location.Y)
             {
                 WaveHeight = waveHeight,
                 DesignWaterLevel = designWaterLevel
             };
-            assessmentSection.GrassCoverErosionOutwards.GrassCoverErosionOutwardsHydraulicBoundaryLocations.Add(grassCoverErosionOutwardsHydraulicBoundaryLocation);
 
+            assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations.Add(grassCoverErosionOutwardsHydraulicBoundaryLocation);
+
             var mockRepository = new MockRepository();
             IObserver observerMock = mockRepository.StrictMock<IObserver>();
             observerMock.Expect(o => o.UpdateObserver());
@@ -595,7 +597,7 @@
 
             assessmentSection.Attach(observerMock);
             hydraulicBoundaryDatabase.Attach(hydraulicBoundaryDatabaseObserverMock);
-            assessmentSection.GrassCoverErosionOutwards.GrassCoverErosionOutwardsHydraulicBoundaryLocations.Attach(grassCoverErosionOutwardsObserverMock);
+            assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations.Attach(grassCoverErosionOutwardsObserverMock);
 
             using (var form = new Form())
             using (var distributionView = new FailureMechanismContributionView
@@ -658,8 +660,8 @@
                 HydraulicBoundaryDatabase = hydraulicBoundaryDatabase
             };
 
-            var grassCoverErosionOutwardsHydraulicBoundaryLocation = new GrassCoverErosionOutwardsHydraulicBoundaryLocation(hydraulicBoundaryLocation);
-            assessmentSection.GrassCoverErosionOutwards.GrassCoverErosionOutwardsHydraulicBoundaryLocations.Add(grassCoverErosionOutwardsHydraulicBoundaryLocation);
+            var grassCoverErosionOutwardsHydraulicBoundaryLocation = hydraulicBoundaryLocation;
+            assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations.Add(grassCoverErosionOutwardsHydraulicBoundaryLocation);
 
             var mockRepository = new MockRepository();
             IObserver observerMock = mockRepository.StrictMock<IObserver>();
@@ -670,7 +672,7 @@
 
             assessmentSection.Attach(observerMock);
             hydraulicBoundaryDatabase.Attach(hydraulicBoundaryDatabaseObserverMock);
-            assessmentSection.GrassCoverErosionOutwards.GrassCoverErosionOutwardsHydraulicBoundaryLocations.Attach(grassCoverErosionOutwardsObserverMock);
+            assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations.Attach(grassCoverErosionOutwardsObserverMock);
 
             using (var form = new Form())
             using (var distributionView = new FailureMechanismContributionView
@@ -714,7 +716,7 @@
 
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
             assessmentSection.Attach(observerMock);
-            assessmentSection.GrassCoverErosionOutwards.GrassCoverErosionOutwardsHydraulicBoundaryLocations.Attach(grassCoverErosionOutwardsObserverMock);
+            assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations.Attach(grassCoverErosionOutwardsObserverMock);
 
             using (var form = new Form())
             using (var distributionView = new FailureMechanismContributionView