Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtil.Test/TestDataGeneratorTest.cs
===================================================================
diff -u -r14ec2ab7889eccf1d88fd68036b96bfcade83eff -r2915e4d50ee071d7facbae4268dced9b01ed9e46
--- Ringtoets/Integration/test/Ringtoets.Integration.TestUtil.Test/TestDataGeneratorTest.cs	(.../TestDataGeneratorTest.cs)	(revision 14ec2ab7889eccf1d88fd68036b96bfcade83eff)
+++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtil.Test/TestDataGeneratorTest.cs	(.../TestDataGeneratorTest.cs)	(revision 2915e4d50ee071d7facbae4268dced9b01ed9e46)
@@ -27,7 +27,6 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.FailureMechanism;
-using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.DuneErosion.Data;
 using Ringtoets.GrassCoverErosionInwards.Data;
@@ -179,11 +178,13 @@
             Assert.IsTrue(assessmentSection.WaveHeightCalculationsForLowerLimitNorm.All(c => c.HasOutput == hasOutput));
             Assert.IsTrue(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm.All(c => c.HasOutput == hasOutput));
 
-            foreach (HydraulicBoundaryLocation location in assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations)
-            {
-                Assert.AreEqual(hasOutput, location.DesignWaterLevelCalculation1.HasOutput);
-                Assert.AreEqual(hasOutput, location.WaveHeightCalculation1.HasOutput);
-            }
+            GrassCoverErosionOutwardsFailureMechanism failureMechanism = assessmentSection.GrassCoverErosionOutwards;
+            Assert.IsTrue(failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.All(calc => calc.HasOutput == hasOutput));
+            Assert.IsTrue(failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm.All(calc => calc.HasOutput == hasOutput));
+            Assert.IsTrue(failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.All(calc => calc.HasOutput == hasOutput));
+            Assert.IsTrue(failureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm.All(calc => calc.HasOutput == hasOutput));
+            Assert.IsTrue(failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm.All(calc => calc.HasOutput == hasOutput));
+            Assert.IsTrue(failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm.All(calc => calc.HasOutput == hasOutput));
         }
 
         private static void AssertFailureMechanismsHaveAllPossibleCalculationConfigurations(IAssessmentSection assessmentSection)
Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/Ringtoets.Integration.TestUtil.csproj
===================================================================
diff -u -r14ec2ab7889eccf1d88fd68036b96bfcade83eff -r2915e4d50ee071d7facbae4268dced9b01ed9e46
--- Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/Ringtoets.Integration.TestUtil.csproj	(.../Ringtoets.Integration.TestUtil.csproj)	(revision 14ec2ab7889eccf1d88fd68036b96bfcade83eff)
+++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/Ringtoets.Integration.TestUtil.csproj	(.../Ringtoets.Integration.TestUtil.csproj)	(revision 2915e4d50ee071d7facbae4268dced9b01ed9e46)
@@ -74,10 +74,6 @@
       <Project>{D1068432-C172-4AA6-847B-D9DEB4C6DE26}</Project>
       <Name>Ringtoets.DuneErosion.Data</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\DuneErosion\src\Ringtoets.DuneErosion.Service\Ringtoets.DuneErosion.Service.csproj">
-      <Project>{FDEE3429-0BB1-4AD2-813A-06FAD425EA6F}</Project>
-      <Name>Ringtoets.DuneErosion.Service</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\DuneErosion\test\Ringtoets.DuneErosion.Data.TestUtil\Ringtoets.DuneErosion.Data.TestUtil.csproj">
       <Project>{7BE6B522-02E3-4143-8508-C021A211DE54}</Project>
       <Name>Ringtoets.DuneErosion.Data.TestUtil</Name>
@@ -94,6 +90,10 @@
       <Project>{e7225477-577f-4a17-b7ec-6721158e1543}</Project>
       <Name>Ringtoets.GrassCoverErosionOutwards.Data</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\GrassCoverErosionOutwards\src\Ringtoets.GrassCoverErosionOutwards.Service\Ringtoets.GrassCoverErosionOutwards.Service.csproj">
+      <Project>{18E9F7C8-3170-4E9D-8D9F-1378225EED90}</Project>
+      <Name>Ringtoets.GrassCoverErosionOutwards.Service</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>
@@ -102,10 +102,6 @@
       <Project>{83d6b73e-91d5-46b0-9218-955da1f75f7c}</Project>
       <Name>Ringtoets.MacroStabilityInwards.Data</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\MacroStabilityInwards\src\Ringtoets.MacroStabilityInwards.IO\Ringtoets.MacroStabilityInwards.IO.csproj">
-      <Project>{0943dda8-8fab-4d0b-8e9c-8a1a9b3273b4}</Project>
-      <Name>Ringtoets.MacroStabilityInwards.IO</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\MacroStabilityInwards\src\Ringtoets.MacroStabilityInwards.Plugin\Ringtoets.MacroStabilityInwards.Plugin.csproj">
       <Project>{B6B27968-6B39-48DF-B2E5-CBABF362808C}</Project>
       <Name>Ringtoets.MacroStabilityInwards.Plugin</Name>
@@ -122,10 +118,6 @@
       <Project>{ce994cc9-6f6a-48ac-b4be-02c30a21f4db}</Project>
       <Name>Ringtoets.Piping.Data</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Piping\src\Ringtoets.Piping.IO\Ringtoets.Piping.IO.csproj">
-      <Project>{35B87B7A-7F50-4139-B563-589EE522B1ED}</Project>
-      <Name>Ringtoets.Piping.IO</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Piping\src\Ringtoets.Piping.Plugin\Ringtoets.Piping.Plugin.csproj">
       <Project>{1d3d58b6-ef7e-401e-92a0-104067d222ee}</Project>
       <Name>Ringtoets.Piping.Plugin</Name>
Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs
===================================================================
diff -u -r76ae563a2db79178d0a21533f320f17d738f4048 -r2915e4d50ee071d7facbae4268dced9b01ed9e46
--- Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs	(.../TestDataGenerator.cs)	(revision 76ae563a2db79178d0a21533f320f17d738f4048)
+++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs	(.../TestDataGenerator.cs)	(revision 2915e4d50ee071d7facbae4268dced9b01ed9e46)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Base.Geometry;
 using Ringtoets.ClosingStructures.Data;
@@ -33,10 +34,10 @@
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.DuneErosion.Data;
 using Ringtoets.DuneErosion.Data.TestUtil;
-using Ringtoets.DuneErosion.Service;
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionInwards.Data.TestUtil;
 using Ringtoets.GrassCoverErosionOutwards.Data;
+using Ringtoets.GrassCoverErosionOutwards.Service;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.Integration.Data;
 using Ringtoets.Integration.Service;
@@ -125,7 +126,7 @@
         {
             AssessmentSection assessmentSection = GetAssessmentSectionWithAllCalculationConfigurations(composition);
             RingtoetsDataSynchronizationService.ClearHydraulicBoundaryLocationOutput(assessmentSection.HydraulicBoundaryDatabase, assessmentSection);
-            DuneErosionDataSynchronizationService.ClearDuneCalculationOutputs(assessmentSection.DuneErosion);
+            GrassCoverErosionOutwardsDataSynchronizationService.ClearHydraulicBoundaryLocationCalculationOutputs(assessmentSection.GrassCoverErosionOutwards);
 
             return assessmentSection;
         }
@@ -866,15 +867,18 @@
                                                                HydraulicBoundaryLocation hydraulicBoundaryLocation,
                                                                Random random)
         {
-            hydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble());
-            hydraulicBoundaryLocation.WaveHeightCalculation1.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble());
-
-            failureMechanism.HydraulicBoundaryLocations.Add(hydraulicBoundaryLocation);
-            failureMechanism.SetHydraulicBoundaryLocationCalculations(new[]
+            failureMechanism.SetHydraulicBoundaryLocationCalculations(new []
             {
                 hydraulicBoundaryLocation
             });
 
+            failureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.First().Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble());
+            failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm.First().Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble());
+            failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble());
+            failureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm.First().Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble());
+            failureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm.First().Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble());
+            failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble());
+
             var profile1 = new ForeshoreProfile(new Point2D(0, 0),
                                                 new[]
                                                 {