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);