Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs
===================================================================
diff -u -r8555639e4bd5abc568b3da0d8bd4f7c206bab337 -rab08e0e3f960e79fb76f0706a536775a3f0f20dd
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 8555639e4bd5abc568b3da0d8bd4f7c206bab337)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision ab08e0e3f960e79fb76f0706a536775a3f0f20dd)
@@ -94,7 +94,7 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Alle berekende resultaten voor alle hydraulische randvoorwaardenlocaties van grasbekleding erosie binnentalud en duinen zijn verwijderd..
+        ///   Looks up a localized string similar to Alle berekende hydraulische randvoorwaarden van de relevante toetssporen zijn verwijderd..
         /// </summary>
         public static string AssessmentSectionCompositionChangeHandler_Waveheight_and_design_water_level_results_cleared {
             get {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx
===================================================================
diff -u -r8555639e4bd5abc568b3da0d8bd4f7c206bab337 -rab08e0e3f960e79fb76f0706a536775a3f0f20dd
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx	(.../Resources.resx)	(revision 8555639e4bd5abc568b3da0d8bd4f7c206bab337)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx	(.../Resources.resx)	(revision ab08e0e3f960e79fb76f0706a536775a3f0f20dd)
@@ -167,6 +167,6 @@
     <value>Achtergrondlaag</value>
   </data>
   <data name="AssessmentSectionCompositionChangeHandler_Waveheight_and_design_water_level_results_cleared" xml:space="preserve">
-    <value>Alle berekende resultaten voor alle hydraulische randvoorwaardenlocaties van grasbekleding erosie binnentalud en duinen zijn verwijderd.</value>
+    <value>Alle berekende hydraulische randvoorwaarden van de relevante toetssporen zijn verwijderd.</value>
   </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/AssessmentSectionCompositionChangeHandlerTest.cs
===================================================================
diff -u -raa9e1e2f746655e4fb44ba50ed10ed6021763033 -rab08e0e3f960e79fb76f0706a536775a3f0f20dd
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/AssessmentSectionCompositionChangeHandlerTest.cs	(.../AssessmentSectionCompositionChangeHandlerTest.cs)	(revision aa9e1e2f746655e4fb44ba50ed10ed6021763033)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/AssessmentSectionCompositionChangeHandlerTest.cs	(.../AssessmentSectionCompositionChangeHandlerTest.cs)	(revision ab08e0e3f960e79fb76f0706a536775a3f0f20dd)
@@ -196,7 +196,7 @@
             string[] expectedMessage =
             {
                 "De resultaten van 32 berekeningen zijn verwijderd.",
-                "Alle berekende resultaten voor alle hydraulische randvoorwaardenlocaties van grasbekleding erosie binnentalud en duinen zijn verwijderd."
+                "Alle berekende hydraulische randvoorwaarden van de relevante toetssporen zijn verwijderd."
             };
             TestHelper.AssertLogMessagesAreGenerated(call, expectedMessage, 2);
 
@@ -256,7 +256,7 @@
             Action call = () => affectedObjects = handler.ChangeComposition(assessmentSection, newComposition);
 
             // Assert
-            TestHelper.AssertLogMessageIsGenerated(call, "Alle berekende resultaten voor alle hydraulische randvoorwaardenlocaties van grasbekleding erosie binnentalud en duinen zijn verwijderd.", 1);
+            TestHelper.AssertLogMessageIsGenerated(call, "Alle berekende hydraulische randvoorwaarden van de relevante toetssporen zijn verwijderd.", 1);
 
             Assert.AreEqual(newComposition, assessmentSection.Composition);
             Assert.True(assessmentSection.GetFailureMechanisms().SelectMany(fm => fm.Calculations).All(c => !c.HasOutput));
Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs
===================================================================
diff -u -raa9e1e2f746655e4fb44ba50ed10ed6021763033 -rab08e0e3f960e79fb76f0706a536775a3f0f20dd
--- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs	(.../RingtoetsDataSynchronizationServiceTest.cs)	(revision aa9e1e2f746655e4fb44ba50ed10ed6021763033)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs	(.../RingtoetsDataSynchronizationServiceTest.cs)	(revision ab08e0e3f960e79fb76f0706a536775a3f0f20dd)
@@ -233,30 +233,42 @@
         public void ClearHydraulicBoundaryLocationOutput_HydraulicBoundaryDatabaseWithoutLocations_DoNothing()
         {
             // Setup
-            var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
-            {
-                HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase()
-            };
+            var mockRepository = new MockRepository();
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
+            assessmentSection.HydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+            assessmentSection.Stub(section => section.GetFailureMechanisms()).Return(new IFailureMechanism[0]);
+            mockRepository.ReplayAll();
 
             // Call
             IEnumerable<IObservable> affectedObjects = RingtoetsDataSynchronizationService.ClearHydraulicBoundaryLocationOutput(
                 assessmentSection.HydraulicBoundaryDatabase, assessmentSection);
 
             // Assert
             CollectionAssert.IsEmpty(affectedObjects);
+
+            mockRepository.VerifyAll();
         }
 
         [Test]
         public void ClearHydraulicBoundaryLocationOutput_GrassCoverErosionOutwardsAndDunesWithoutLocations_DoNothing()
         {
             // Setup
-            IAssessmentSection assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
+            var mockRepository = new MockRepository();
+            IAssessmentSection assessmentSection = mockRepository.Stub<IAssessmentSection>();
+            assessmentSection.Stub(section => section.GetFailureMechanisms()).Return(new IFailureMechanism[]
+            {
+                new GrassCoverErosionOutwardsFailureMechanism(), 
+                new DuneErosionFailureMechanism()
+            });
+            mockRepository.ReplayAll();
 
             // Call
             IEnumerable<IObservable> affectedObjects = RingtoetsDataSynchronizationService.ClearHydraulicBoundaryLocationOutputOfFailureMechanisms(assessmentSection);
 
             // Assert
             CollectionAssert.IsEmpty(affectedObjects);
+
+            mockRepository.VerifyAll();
         }
 
         [Test]
@@ -267,7 +279,7 @@
                                                                                                                                                         IEnumerable<IObservable> expectedAffectedItems)
         {
             // Setup
-            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase()
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 Locations =
                 {