Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs
===================================================================
diff -u -r479b54f8d0ae25dd5585ee63d907199ae4c36108 -r98bb82fc9a5d16eab7a9d25b69f20806ef10a1f1
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs	(.../GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs)	(revision 479b54f8d0ae25dd5585ee63d907199ae4c36108)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs	(.../GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs)	(revision 98bb82fc9a5d16eab7a9d25b69f20806ef10a1f1)
@@ -236,7 +236,7 @@
             failureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm.First().Output = new TestHydraulicBoundaryLocationOutput();
 
             IEnumerable<HydraulicBoundaryLocationCalculation> expectedAffectedItems =
-                GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.GetAllHydraulicBoundaryLocationsCalculationsWithOutput(failureMechanism)
+                GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.GetAllHydraulicBoundaryLocationCalculationsWithOutput(failureMechanism)
                                                                              .ToArray();
 
             // Call
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.TestUtil.Test/GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelperTest.cs
===================================================================
diff -u -rcd6f013c9e443af060f847d4b6b018a40948e329 -r98bb82fc9a5d16eab7a9d25b69f20806ef10a1f1
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.TestUtil.Test/GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelperTest.cs	(.../GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelperTest.cs)	(revision cd6f013c9e443af060f847d4b6b018a40948e329)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.TestUtil.Test/GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelperTest.cs	(.../GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelperTest.cs)	(revision 98bb82fc9a5d16eab7a9d25b69f20806ef10a1f1)
@@ -71,32 +71,32 @@
         }
 
         [Test]
-        public void GetAllHydraulicBoundaryLocationsCalculationsWithOutput_FailureMechanismNull_ThrowsArgumentNullException()
+        public void GetAllHydraulicBoundaryLocationCalculationsWithOutput_FailureMechanismNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () => GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.GetAllHydraulicBoundaryLocationsCalculationsWithOutput(null);
+            TestDelegate call = () => GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.GetAllHydraulicBoundaryLocationCalculationsWithOutput(null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
             Assert.AreEqual("failureMechanism", exception.ParamName);
         }
 
         [Test]
-        public void GetAllHydraulicBoundaryLocationsCalculationsWithOutput_FailureMechanismWithoutHydraulicBoundaryLocationCalculations_ReturnsEmpty()
+        public void GetAllHydraulicBoundaryLocationCalculationsWithOutput_FailureMechanismWithoutHydraulicBoundaryLocationCalculations_ReturnsEmpty()
         {
             // Setup
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
 
             // Call
             IEnumerable<HydraulicBoundaryLocationCalculation> calculations =
-                GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.GetAllHydraulicBoundaryLocationsCalculationsWithOutput(failureMechanism);
+                GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.GetAllHydraulicBoundaryLocationCalculationsWithOutput(failureMechanism);
 
             // Assert
             CollectionAssert.IsEmpty(calculations);
         }
 
         [Test]
-        public void GetAllHydraulicBoundaryLocationsCalculationsWithOutput_FailureMechanismWithHydraulicBoundaryCalculations_ReturnsCalculationsWithOutput()
+        public void GetAllHydraulicBoundaryLocationCalculationsWithOutput_FailureMechanismWithHydraulicBoundaryCalculations_ReturnsCalculationsWithOutput()
         {
             // Setup
             var hydraulicBoundaryLocations = new[]
@@ -117,7 +117,7 @@
 
             // Call
             IEnumerable<HydraulicBoundaryLocationCalculation> calculations =
-                GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.GetAllHydraulicBoundaryLocationsCalculationsWithOutput(failureMechanism);
+                GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.GetAllHydraulicBoundaryLocationCalculationsWithOutput(failureMechanism);
 
             // Assert
             var expectedCalculations = new[]
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.TestUtil/GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.cs
===================================================================
diff -u -r479b54f8d0ae25dd5585ee63d907199ae4c36108 -r98bb82fc9a5d16eab7a9d25b69f20806ef10a1f1
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.TestUtil/GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.cs	(.../GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.cs)	(revision 479b54f8d0ae25dd5585ee63d907199ae4c36108)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.TestUtil/GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.cs	(.../GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.cs)	(revision 98bb82fc9a5d16eab7a9d25b69f20806ef10a1f1)
@@ -71,7 +71,7 @@
         /// <param name="failureMechanism">The failure mechanism to retrieve the calculations from.</param>
         /// <returns>A collection of all the hydraulic boundary location calculations that contain an output.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanism"/> is <c>null</c>.</exception>
-        public static IEnumerable<HydraulicBoundaryLocationCalculation> GetAllHydraulicBoundaryLocationsCalculationsWithOutput(GrassCoverErosionOutwardsFailureMechanism failureMechanism)
+        public static IEnumerable<HydraulicBoundaryLocationCalculation> GetAllHydraulicBoundaryLocationCalculationsWithOutput(GrassCoverErosionOutwardsFailureMechanism failureMechanism)
         {
             if (failureMechanism == null)
             {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/RingtoetsDataSynchronizationService.cs
===================================================================
diff -u -r1bd68d22bc0484d9d18afb2a776b8f5943712803 -r98bb82fc9a5d16eab7a9d25b69f20806ef10a1f1
--- Ringtoets/Integration/src/Ringtoets.Integration.Service/RingtoetsDataSynchronizationService.cs	(.../RingtoetsDataSynchronizationService.cs)	(revision 1bd68d22bc0484d9d18afb2a776b8f5943712803)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Service/RingtoetsDataSynchronizationService.cs	(.../RingtoetsDataSynchronizationService.cs)	(revision 98bb82fc9a5d16eab7a9d25b69f20806ef10a1f1)
@@ -295,27 +295,19 @@
             }
 
             var changedObservables = new List<IObservable>();
+
             foreach (IFailureMechanism failureMechanism in failureMechanisms)
             {
                 var grassCoverErosionOutwardsFailureMechanism = failureMechanism as GrassCoverErosionOutwardsFailureMechanism;
-                var duneErosionFailureMechanism = failureMechanism as DuneErosionFailureMechanism;
-
                 if (grassCoverErosionOutwardsFailureMechanism != null)
                 {
-                    IEnumerable<IObservable> affectedHydraulicBoundaryLocations =
-                        GrassCoverErosionOutwardsDataSynchronizationService.ClearHydraulicBoundaryLocationCalculationOutputs(grassCoverErosionOutwardsFailureMechanism);
-                    changedObservables.AddRange(affectedHydraulicBoundaryLocations);
+                    changedObservables.AddRange(GrassCoverErosionOutwardsDataSynchronizationService.ClearHydraulicBoundaryLocationCalculationOutputs(grassCoverErosionOutwardsFailureMechanism));
                 }
 
+                var duneErosionFailureMechanism = failureMechanism as DuneErosionFailureMechanism;
                 if (duneErosionFailureMechanism != null)
                 {
-                    IEnumerable<IObservable> affectedDuneLocations =
-                        DuneErosionDataSynchronizationService.ClearDuneLocationOutput(duneErosionFailureMechanism.DuneLocations);
-
-                    if (affectedDuneLocations.Any())
-                    {
-                        changedObservables.AddRange(affectedDuneLocations);
-                    }
+                    changedObservables.AddRange(DuneErosionDataSynchronizationService.ClearDuneLocationOutput(duneErosionFailureMechanism.DuneLocations));
                 }
             }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/AssessmentSectionCompositionChangeHandlerTest.cs
===================================================================
diff -u -r6bef052bbf6326ca12a38909200a11a69c34cebd -r98bb82fc9a5d16eab7a9d25b69f20806ef10a1f1
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/AssessmentSectionCompositionChangeHandlerTest.cs	(.../AssessmentSectionCompositionChangeHandlerTest.cs)	(revision 6bef052bbf6326ca12a38909200a11a69c34cebd)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/AssessmentSectionCompositionChangeHandlerTest.cs	(.../AssessmentSectionCompositionChangeHandlerTest.cs)	(revision 98bb82fc9a5d16eab7a9d25b69f20806ef10a1f1)
@@ -201,8 +201,8 @@
                                                                      .ToArray();
 
             GrassCoverErosionOutwardsFailureMechanism failureMechanism = assessmentSection.GrassCoverErosionOutwards;
-            HydraulicBoundaryLocationCalculation[] hblWithOutput =
-                GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.GetAllHydraulicBoundaryLocationsCalculationsWithOutput(failureMechanism)
+            HydraulicBoundaryLocationCalculation[] hydraulicBoundaryLocationCalculationsWithOutput =
+                GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.GetAllHydraulicBoundaryLocationCalculationsWithOutput(failureMechanism)
                                                                              .ToArray();
 
             var handler = new AssessmentSectionCompositionChangeHandler(viewCommands);
@@ -215,7 +215,7 @@
                         "All calculations that had output still have them.");
 
             Assert.True(duneLocationWithOutput.All(loc => loc.Calculation.Output != null));
-            Assert.True(hblWithOutput.All(loc => loc.HasOutput));
+            Assert.True(hydraulicBoundaryLocationCalculationsWithOutput.All(calc => calc.HasOutput));
 
             CollectionAssert.IsEmpty(affectedObjects);
             mocks.VerifyAll();
@@ -312,8 +312,8 @@
                                                                                    .ToList();
 
             GrassCoverErosionOutwardsFailureMechanism grassCoverErosionOutwardsFailureMechanism = assessmentSection.GrassCoverErosionOutwards;
-            IEnumerable<HydraulicBoundaryLocationCalculation> hydraulicBoundaryLocationsWithOutput =
-                GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.GetAllHydraulicBoundaryLocationsCalculationsWithOutput(grassCoverErosionOutwardsFailureMechanism)
+            IEnumerable<HydraulicBoundaryLocationCalculation> hydraulicBoundaryLocationCalculationsWithOutput =
+                GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.GetAllHydraulicBoundaryLocationCalculationsWithOutput(grassCoverErosionOutwardsFailureMechanism)
                                                                              .ToArray();
 
             IEnumerable<IObservable> expectedAffectedObjects = duneErosionFailureMechanism.DuneLocations.Where(dl => dl.Calculation.Output != null)
@@ -337,7 +337,7 @@
 
             CollectionAssert.IsSubsetOf(expectedAffectedObjects, affectedObjects);
             AssertOutputNotCleared(expectedUnaffectedObjects, assessmentSection.GetFailureMechanisms());
-            Assert.IsTrue(hydraulicBoundaryLocationsWithOutput.All(c => c.HasOutput));
+            Assert.IsTrue(hydraulicBoundaryLocationCalculationsWithOutput.All(c => c.HasOutput));
             foreach (DuneLocation duneLocation in assessmentSection.DuneErosion.DuneLocations)
             {
                 Assert.IsNull(duneLocation.Calculation.Output);
@@ -414,8 +414,8 @@
             AssessmentSection assessmentSection = TestDataGenerator.GetAssessmentSectionWithAllCalculationConfigurationsWithoutCalculationOutput(oldComposition);
 
             GrassCoverErosionOutwardsFailureMechanism failureMechanism = assessmentSection.GrassCoverErosionOutwards;
-            HydraulicBoundaryLocationCalculation[] hblWithOutput =
-                GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.GetAllHydraulicBoundaryLocationsCalculationsWithOutput(failureMechanism)
+            HydraulicBoundaryLocationCalculation[] hydraulicBoundaryLocationCalculationsWithOutput =
+                GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.GetAllHydraulicBoundaryLocationCalculationsWithOutput(failureMechanism)
                                                                              .ToArray();
 
             DuneErosionFailureMechanism duneErosionFailureMechanism = assessmentSection.DuneErosion;
@@ -440,7 +440,7 @@
             Assert.True(assessmentSection.GetFailureMechanisms().SelectMany(fm => fm.Calculations).All(c => !c.HasOutput));
             CollectionAssert.IsSubsetOf(expectedAffectedObjects, affectedObjects);
 
-            Assert.IsTrue(hblWithOutput.All(calc => calc.HasOutput));
+            Assert.IsTrue(hydraulicBoundaryLocationCalculationsWithOutput.All(calc => calc.HasOutput));
             foreach (DuneLocation duneLocation in assessmentSection.DuneErosion.DuneLocations)
             {
                 Assert.IsNull(duneLocation.Calculation.Output);
@@ -620,7 +620,7 @@
 
         private static IEnumerable<IObservable> GetAllAffectedGrassCoverErosionOutwardsCalculations(GrassCoverErosionOutwardsFailureMechanism failureMechanism)
         {
-            return GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.GetAllHydraulicBoundaryLocationsCalculationsWithOutput(failureMechanism);
+            return GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.GetAllHydraulicBoundaryLocationCalculationsWithOutput(failureMechanism);
         }
 
         #endregion
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs
===================================================================
diff -u -raa09279c23d20a532712b4e0a8abe942a879149f -r98bb82fc9a5d16eab7a9d25b69f20806ef10a1f1
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs	(.../FailureMechanismContributionNormChangeHandlerTest.cs)	(revision aa09279c23d20a532712b4e0a8abe942a879149f)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/FailureMechanismContributionNormChangeHandlerTest.cs	(.../FailureMechanismContributionNormChangeHandlerTest.cs)	(revision 98bb82fc9a5d16eab7a9d25b69f20806ef10a1f1)
@@ -337,7 +337,7 @@
 
         private static IEnumerable<IObservable> GetAllAffectedGrassCoverErosionOutwardsHydraulicBoundaryLocationCalculations(GrassCoverErosionOutwardsFailureMechanism failureMechanism)
         {
-            return GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.GetAllHydraulicBoundaryLocationsCalculationsWithOutput(failureMechanism);
+            return GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.GetAllHydraulicBoundaryLocationCalculationsWithOutput(failureMechanism);
         }
 
         private static void AssertHydraulicBoundaryLocationOutput(AssessmentSection assessmentSection, bool hasOutput)
Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs
===================================================================
diff -u -r1bd68d22bc0484d9d18afb2a776b8f5943712803 -r98bb82fc9a5d16eab7a9d25b69f20806ef10a1f1
--- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs	(.../RingtoetsDataSynchronizationServiceTest.cs)	(revision 1bd68d22bc0484d9d18afb2a776b8f5943712803)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs	(.../RingtoetsDataSynchronizationServiceTest.cs)	(revision 98bb82fc9a5d16eab7a9d25b69f20806ef10a1f1)
@@ -1646,22 +1646,14 @@
                 GrassCoverErosionOutwardsFailureMechanism = grassCoverErosionOutwardsFailureMechanism;
                 DuneLocation = duneLocation;
 
-                var expectedAffectedObjects = new List<IObservable>();
-                expectedAffectedObjects.AddRange(GetAffectedGrassCoverErosionOutwardsFailureMechanismItems(grassCoverErosionOutwardsFailureMechanism));
-
-                ExpectedAffectedObjects = expectedAffectedObjects;
+                ExpectedAffectedObjects = GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.GetAllHydraulicBoundaryLocationCalculationsWithOutput(grassCoverErosionOutwardsFailureMechanism);
             }
 
             public GrassCoverErosionOutwardsFailureMechanism GrassCoverErosionOutwardsFailureMechanism { get; }
 
             public DuneLocation DuneLocation { get; }
 
             public IEnumerable<IObservable> ExpectedAffectedObjects { get; }
-
-            private static IEnumerable<IObservable> GetAffectedGrassCoverErosionOutwardsFailureMechanismItems(GrassCoverErosionOutwardsFailureMechanism grassCoverErosionOutwardsFailureMechanism)
-            {
-                return GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.GetAllHydraulicBoundaryLocationsCalculationsWithOutput(grassCoverErosionOutwardsFailureMechanism);
-            }
         }
 
         private static IEnumerable<TestCaseData> GetClearHydraulicLocationDependentData()
@@ -1671,7 +1663,7 @@
             yield return new TestCaseData(new ClearHydraulicLocationDependentTestCase(
                                               grassCoverErosionOutwardsFailureMechanism,
                                               CreateDuneLocation(false)))
-                .SetName("GrassAndDuneLocationNoOutput");
+                .SetName("GrassAndDuneLocationWithoutOutput");
 
             grassCoverErosionOutwardsFailureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
             ConfigureGrassCoverErosionOutwardsFailureMechanism(grassCoverErosionOutwardsFailureMechanism, true);
Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/Ringtoets.Integration.TestUtil.csproj
===================================================================
diff -u -r2915e4d50ee071d7facbae4268dced9b01ed9e46 -r98bb82fc9a5d16eab7a9d25b69f20806ef10a1f1
--- Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/Ringtoets.Integration.TestUtil.csproj	(.../Ringtoets.Integration.TestUtil.csproj)	(revision 2915e4d50ee071d7facbae4268dced9b01ed9e46)
+++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/Ringtoets.Integration.TestUtil.csproj	(.../Ringtoets.Integration.TestUtil.csproj)	(revision 98bb82fc9a5d16eab7a9d25b69f20806ef10a1f1)
@@ -90,10 +90,6 @@
       <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>