Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsDataSynchronizationService.cs
===================================================================
diff -u -rebf9ee4894ed003e5756d9c56be1489d54e57695 -r8ae9472037bcd029f6ad9d78784cedad999a2c68
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsDataSynchronizationService.cs	(.../GrassCoverErosionOutwardsDataSynchronizationService.cs)	(revision ebf9ee4894ed003e5756d9c56be1489d54e57695)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsDataSynchronizationService.cs	(.../GrassCoverErosionOutwardsDataSynchronizationService.cs)	(revision 8ae9472037bcd029f6ad9d78784cedad999a2c68)
@@ -51,9 +51,9 @@
         }
 
         /// <summary>
-        /// Clears the output of the grass cover erosion outwards hydraulic boundary locations within the <see cref="HydraulicBoundaryDatabase"/>.
+        /// Clears the output of the grass cover erosion outwards hydraulic boundary locations within the <see cref="GrassCoverErosionOutwardsFailureMechanism"/>.
         /// </summary>
-        /// <param name="locations">The locations.</param>
+        /// <param name="locations">The locations for which the output needs to be cleared.</param>
         /// <returns><c>true</c> when one or multiple locations are affected by clearing the output. <c>false</c> otherwise.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="locations"/> is <c>null</c>.</exception>
         public static bool ClearHydraulicBoundaryLocationOutput(ObservableList<GrassCoverErosionOutwardsHydraulicBoundaryLocation> locations)
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs
===================================================================
diff -u -rebf9ee4894ed003e5756d9c56be1489d54e57695 -r8ae9472037bcd029f6ad9d78784cedad999a2c68
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs	(.../GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs)	(revision ebf9ee4894ed003e5756d9c56be1489d54e57695)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs	(.../GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs)	(revision 8ae9472037bcd029f6ad9d78784cedad999a2c68)
@@ -120,11 +120,9 @@
         public void ClearHydraulicBoundaryLocationOutput_LocationWithoutWaveHeightAndDesignWaterLevel_ReturnsFalse()
         {
             // Setup
-            var location = new GrassCoverErosionOutwardsHydraulicBoundaryLocation(new HydraulicBoundaryLocation(1, string.Empty, 0, 0));
-
             var locations = new ObservableList<GrassCoverErosionOutwardsHydraulicBoundaryLocation>
             {
-                location
+                new GrassCoverErosionOutwardsHydraulicBoundaryLocation(new HydraulicBoundaryLocation(1, string.Empty, 0, 0))
             };
 
             // Call
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs
===================================================================
diff -u -r404fc8eb6e1ff688c90e2d45f735793a538c5c85 -r8ae9472037bcd029f6ad9d78784cedad999a2c68
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs	(.../FailureMechanismContributionView.cs)	(revision 404fc8eb6e1ff688c90e2d45f735793a538c5c85)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs	(.../FailureMechanismContributionView.cs)	(revision 8ae9472037bcd029f6ad9d78784cedad999a2c68)
@@ -299,10 +299,10 @@
 
             if (assessmentSection.HydraulicBoundaryDatabase != null)
             {
-                var grassCoverErosionOutwardsFailureMechanism = (GrassCoverErosionOutwardsFailureMechanism)assessmentSection.GetFailureMechanisms()
-                                                                                                                                    .First(fm => fm.GetType() == typeof(GrassCoverErosionOutwardsFailureMechanism));
+                var grassCoverErosionOutwardsFailureMechanism = assessmentSection.GetFailureMechanisms().OfType<GrassCoverErosionOutwardsFailureMechanism>().First();
 
-                bool hydraulicBoundaryLocationAffected = RingtoetsDataSynchronizationService.ClearHydraulicBoundaryLocationOutput(assessmentSection.HydraulicBoundaryDatabase, grassCoverErosionOutwardsFailureMechanism);
+                bool hydraulicBoundaryLocationAffected = RingtoetsDataSynchronizationService.ClearHydraulicBoundaryLocationOutput(assessmentSection.HydraulicBoundaryDatabase,
+                                                                                                                                  grassCoverErosionOutwardsFailureMechanism);
                 if (hydraulicBoundaryLocationAffected)
                 {
                     grassCoverErosionOutwardsFailureMechanism.GrassCoverErosionOutwardsHydraulicBoundaryLocations.NotifyObservers();
Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/RingtoetsDataSynchronizationService.cs
===================================================================
diff -u -r404fc8eb6e1ff688c90e2d45f735793a538c5c85 -r8ae9472037bcd029f6ad9d78784cedad999a2c68
--- Ringtoets/Integration/src/Ringtoets.Integration.Service/RingtoetsDataSynchronizationService.cs	(.../RingtoetsDataSynchronizationService.cs)	(revision 404fc8eb6e1ff688c90e2d45f735793a538c5c85)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Service/RingtoetsDataSynchronizationService.cs	(.../RingtoetsDataSynchronizationService.cs)	(revision 8ae9472037bcd029f6ad9d78784cedad999a2c68)
@@ -120,12 +120,14 @@
         }
 
         /// <summary>
-        /// Clears the output of the hydraulic boundary locations within the <see cref="HydraulicBoundaryDatabase"/>.
+        /// Clears the output of the hydraulic boundary locations within the <paramref name="hydraulicBoundaryDatabase"/>
+        /// and <paramref name="failureMechanism"/>.
         /// </summary>
         /// <param name="hydraulicBoundaryDatabase">The <see cref="HydraulicBoundaryDatabase"/> wich contains the locations.</param>
         /// <param name="failureMechanism">The <see cref="GrassCoverErosionOutwardsFailureMechanism"/> which contains the locations.</param>
         /// <returns><c>true</c> when one or multiple locations are affected by clearing the output. <c>false</c> otherwise.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryDatabase"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryDatabase"/> 
+        /// or <paramref name="failureMechanism"/> is <c>null</c>.</exception>
         public static bool ClearHydraulicBoundaryLocationOutput(HydraulicBoundaryDatabase hydraulicBoundaryDatabase, GrassCoverErosionOutwardsFailureMechanism failureMechanism)
         {
             if (hydraulicBoundaryDatabase == null)
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs
===================================================================
diff -u -r404fc8eb6e1ff688c90e2d45f735793a538c5c85 -r8ae9472037bcd029f6ad9d78784cedad999a2c68
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs	(.../FailureMechanismContributionViewIntegrationTest.cs)	(revision 404fc8eb6e1ff688c90e2d45f735793a538c5c85)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/FailureMechanismContributionViewIntegrationTest.cs	(.../FailureMechanismContributionViewIntegrationTest.cs)	(revision 8ae9472037bcd029f6ad9d78784cedad999a2c68)
@@ -62,8 +62,13 @@
                 WaveHeight = waveHeight,
                 DesignWaterLevel = designWaterLevel
             };
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
-            hydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation);
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            {
+                Locations =
+                {
+                    hydraulicBoundaryLocation
+                }
+            };
 
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
             {
Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs
===================================================================
diff -u -r404fc8eb6e1ff688c90e2d45f735793a538c5c85 -r8ae9472037bcd029f6ad9d78784cedad999a2c68
--- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs	(.../RingtoetsDataSynchronizationServiceTest.cs)	(revision 404fc8eb6e1ff688c90e2d45f735793a538c5c85)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs	(.../RingtoetsDataSynchronizationServiceTest.cs)	(revision 8ae9472037bcd029f6ad9d78784cedad999a2c68)
@@ -407,7 +407,7 @@
         }
 
         [Test]
-        public void ClearHydraulicBoundaryLocationOutput_AssessmentSectionNull_ThrowsArgumentNullException()
+        public void ClearHydraulicBoundaryLocationOutput_FailureMechanismNull_ThrowsArgumentNullException()
         {
             // Setup
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
@@ -489,23 +489,31 @@
         public void ClearHydraulicBoundaryLocationOutput_LocationWithoutDataAndGrassCoverErosionOutwardsLocationWithData_ClearDataAndReturnTrue(double designWaterLevel, double waveHeight)
         {
             // Setup
-            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
+            HydraulicBoundaryLocation hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test", 0, 0);
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
-                HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase()
+                Locations =
+                {
+                    hydraulicBoundaryLocation
+                }
             };
-            HydraulicBoundaryLocation hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test", 0, 0);
-            assessmentSection.HydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation);
 
             var grassCoverErosionOutwardsHydraulicBoundaryLocation = new GrassCoverErosionOutwardsHydraulicBoundaryLocation(hydraulicBoundaryLocation)
             {
                 DesignWaterLevel = (RoundedDouble) designWaterLevel,
                 WaveHeight = (RoundedDouble) waveHeight
             };
 
-            assessmentSection.GrassCoverErosionOutwards.GrassCoverErosionOutwardsHydraulicBoundaryLocations.Add(grassCoverErosionOutwardsHydraulicBoundaryLocation);
+            var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism
+            {
+                GrassCoverErosionOutwardsHydraulicBoundaryLocations =
+                {
+                    grassCoverErosionOutwardsHydraulicBoundaryLocation
+                }
+            };
 
             // Call
-            bool affected = RingtoetsDataSynchronizationService.ClearHydraulicBoundaryLocationOutput(assessmentSection.HydraulicBoundaryDatabase, assessmentSection.GrassCoverErosionOutwards);
+            bool affected = RingtoetsDataSynchronizationService.ClearHydraulicBoundaryLocationOutput(hydraulicBoundaryDatabase, failureMechanism);
 
             // Assert
             Assert.IsNaN(grassCoverErosionOutwardsHydraulicBoundaryLocation.DesignWaterLevel);
@@ -518,18 +526,27 @@
         [Test]
         public void ClearHydraulicBoundaryLocationOutput_LocationWithoutDataAndGrassCoverErosionOutwardsLocationWithoutData_ReturnFalse()
         {
-             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
+            // Setup
+            HydraulicBoundaryLocation hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test", 0, 0);
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
-                HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase()
+                Locations =
+                {
+                    hydraulicBoundaryLocation
+                }
             };
-            HydraulicBoundaryLocation hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test", 0, 0);
-            assessmentSection.HydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation);
 
             var grassCoverErosionOutwardsHydraulicBoundaryLocation = new GrassCoverErosionOutwardsHydraulicBoundaryLocation(hydraulicBoundaryLocation);
-            assessmentSection.GrassCoverErosionOutwards.GrassCoverErosionOutwardsHydraulicBoundaryLocations.Add(grassCoverErosionOutwardsHydraulicBoundaryLocation);
+            var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism
+            {
+                GrassCoverErosionOutwardsHydraulicBoundaryLocations =
+                {
+                    grassCoverErosionOutwardsHydraulicBoundaryLocation
+                }
+            };
 
             // Call
-            bool affected = RingtoetsDataSynchronizationService.ClearHydraulicBoundaryLocationOutput(assessmentSection.HydraulicBoundaryDatabase, assessmentSection.GrassCoverErosionOutwards);
+            bool affected = RingtoetsDataSynchronizationService.ClearHydraulicBoundaryLocationOutput(hydraulicBoundaryDatabase, failureMechanism);
 
             // Assert
             Assert.IsFalse(affected);
@@ -541,27 +558,35 @@
         public void ClearHydraulicBoundaryLocationOutput_LocationWithDataAndGrassCoverErosionOutwardsLocationWithData_ClearDataAndReturnTrue(double designWaterLevel, double waveHeight)
         {
             // Setup
-            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
-            {
-                HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase()
-            };
             HydraulicBoundaryLocation hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test", 0, 0)
             {
                 DesignWaterLevel = (RoundedDouble)designWaterLevel,
                 WaveHeight = (RoundedDouble)waveHeight
             };
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            {
+                Locations =
+                {
+                    hydraulicBoundaryLocation
+                }
+            };
 
             var grassCoverErosionOutwardsHydraulicBoundaryLocation = new GrassCoverErosionOutwardsHydraulicBoundaryLocation(hydraulicBoundaryLocation)
             {
                 DesignWaterLevel = (RoundedDouble)designWaterLevel,
                 WaveHeight = (RoundedDouble)waveHeight
             };
 
-            assessmentSection.HydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation);
-            assessmentSection.GrassCoverErosionOutwards.GrassCoverErosionOutwardsHydraulicBoundaryLocations.Add(grassCoverErosionOutwardsHydraulicBoundaryLocation);
+            var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism
+            {
+                GrassCoverErosionOutwardsHydraulicBoundaryLocations =
+                {
+                    grassCoverErosionOutwardsHydraulicBoundaryLocation
+                }
+            };
 
             // Call
-            bool affected = RingtoetsDataSynchronizationService.ClearHydraulicBoundaryLocationOutput(assessmentSection.HydraulicBoundaryDatabase, assessmentSection.GrassCoverErosionOutwards);
+            bool affected = RingtoetsDataSynchronizationService.ClearHydraulicBoundaryLocationOutput(hydraulicBoundaryDatabase, failureMechanism);
 
             // Assert
             Assert.IsNaN(hydraulicBoundaryLocation.DesignWaterLevel);