Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationOutputEntityReadExtensionsTest.cs
===================================================================
diff -u -rb8df616ca911988b921b933bead5f1ef6862d076 -r81c23df3e9ae714f3708c7d655c39e83be210b9a
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationOutputEntityReadExtensionsTest.cs	(.../HydraulicLocationOutputEntityReadExtensionsTest.cs)	(revision b8df616ca911988b921b933bead5f1ef6862d076)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationOutputEntityReadExtensionsTest.cs	(.../HydraulicLocationOutputEntityReadExtensionsTest.cs)	(revision 81c23df3e9ae714f3708c7d655c39e83be210b9a)
@@ -111,7 +111,7 @@
         }
 
         [Test]
-        public void Read_EntityWithIllustrationPoints_ReturnsHydraulicBoundarLocationOutputWithGeneralResult()
+        public void Read_EntityWithIllustrationPoints_ReturnsHydraulicBoundaryLocationOutputWithGeneralResult()
         {
             // Setup
             var random = new Random(21);
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/ObserverHelper.cs
===================================================================
diff -u -rb2df47fc26d334a1d1b52777e3031dc2373c5c99 -r81c23df3e9ae714f3708c7d655c39e83be210b9a
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/ObserverHelper.cs	(.../ObserverHelper.cs)	(revision b2df47fc26d334a1d1b52777e3031dc2373c5c99)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/ObserverHelper.cs	(.../ObserverHelper.cs)	(revision 81c23df3e9ae714f3708c7d655c39e83be210b9a)
@@ -26,13 +26,12 @@
 namespace Ringtoets.Common.Forms.Helpers
 {
     /// <summary>
-    /// Helper class for handling with <see cref="Observer"/>
-    /// and <see cref="RecursiveObserver{TContainer,TObservable}"/>
+    /// Helper class for dealing with <see cref="Observer"/> and <see cref="RecursiveObserver{TContainer,TObservable}"/>.
     /// </summary>
     public static class ObserverHelper
     {
         /// <summary>
-        /// Creates a <see cref="RecursiveObserver{TContainer,TObservable}"/>.
+        /// Creates a <see cref="RecursiveObserver{TContainer,TObservable}"/> for an enumeration of hydraulic boundary location calculations.
         /// </summary>
         /// <param name="calculations">The calculations to observe.</param>
         /// <param name="updateObserverAction">The action to perform on notifications coming from one of the calculations.</param>
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/ObserverHelperTest.cs
===================================================================
diff -u -rb2df47fc26d334a1d1b52777e3031dc2373c5c99 -r81c23df3e9ae714f3708c7d655c39e83be210b9a
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/ObserverHelperTest.cs	(.../ObserverHelperTest.cs)	(revision b2df47fc26d334a1d1b52777e3031dc2373c5c99)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Helpers/ObserverHelperTest.cs	(.../ObserverHelperTest.cs)	(revision 81c23df3e9ae714f3708c7d655c39e83be210b9a)
@@ -66,7 +66,7 @@
             var calculations = new ObservableList<HydraulicBoundaryLocationCalculation>();
 
             // Call
-            RecursiveObserver<IObservableEnumerable<HydraulicBoundaryLocationCalculation>, HydraulicBoundaryLocationCalculation> observer = 
+            RecursiveObserver<IObservableEnumerable<HydraulicBoundaryLocationCalculation>, HydraulicBoundaryLocationCalculation> observer =
                 ObserverHelper.CreateHydraulicBoundaryLocationCalculationsObserver(calculations, () => {});
 
             // Assert
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.TestUtil/Ringtoets.GrassCoverErosionOutwards.Forms.TestUtil.csproj
===================================================================
diff -u -r241612718dfdba36a2292828f72acc3bcf96e927 -r81c23df3e9ae714f3708c7d655c39e83be210b9a
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.TestUtil/Ringtoets.GrassCoverErosionOutwards.Forms.TestUtil.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Forms.TestUtil.csproj)	(revision 241612718dfdba36a2292828f72acc3bcf96e927)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.TestUtil/Ringtoets.GrassCoverErosionOutwards.Forms.TestUtil.csproj	(.../Ringtoets.GrassCoverErosionOutwards.Forms.TestUtil.csproj)	(revision 81c23df3e9ae714f3708c7d655c39e83be210b9a)
@@ -37,10 +37,6 @@
       <Project>{D4200F43-3F72-4F42-AF0A-8CED416A38EC}</Project>
       <Name>Ringtoets.Common.Data</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\test\Ringtoets.Common.Forms.TestUtil\Ringtoets.Common.Forms.TestUtil.csproj">
-      <Project>{D24FA2F7-28A7-413B-AFD3-EE10E985630B}</Project>
-      <Name>Ringtoets.Common.Forms.TestUtil</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\test\Ringtoets.Common.Util.TestUtil\Ringtoets.Common.Util.TestUtil.csproj">
       <Project>{54DF6303-BF9A-4AE9-BE09-4AF50EF27412}</Project>
       <Name>Ringtoets.Common.Util.TestUtil</Name>
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs
===================================================================
diff -u -rf6e74516582b0e5c854526d50a90db1216417d9d -r81c23df3e9ae714f3708c7d655c39e83be210b9a
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs	(.../HeightStructuresFailureMechanismViewTest.cs)	(revision f6e74516582b0e5c854526d50a90db1216417d9d)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismViewTest.cs	(.../HeightStructuresFailureMechanismViewTest.cs)	(revision 81c23df3e9ae714f3708c7d655c39e83be210b9a)
@@ -218,7 +218,7 @@
         }
 
         [Test]
-        public void GivenViewWithHydraulicBoundarLocationsData_WhenHydraulicBoundaryLocationsUpdatedAndNotified_ThenMapDataUpdated()
+        public void GivenViewWithHydraulicBoundaryLocationsData_WhenHydraulicBoundaryLocationsUpdatedAndNotified_ThenMapDataUpdated()
         {
             // Given
             var assessmentSection = new AssessmentSectionStub();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs
===================================================================
diff -u -rf6e74516582b0e5c854526d50a90db1216417d9d -r81c23df3e9ae714f3708c7d655c39e83be210b9a
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs	(.../AssessmentSectionViewTest.cs)	(revision f6e74516582b0e5c854526d50a90db1216417d9d)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs	(.../AssessmentSectionViewTest.cs)	(revision 81c23df3e9ae714f3708c7d655c39e83be210b9a)
@@ -120,7 +120,7 @@
                 Assert.IsNotNull(mapData);
 
                 MapData hydraulicBoundaryLocationsMapData = mapData.Collection.ElementAt(hydraulicBoundaryLocationsIndex);
-                AssertHydraulicBoundarLocationsMapData(assessmentSection, hydraulicBoundaryLocationsMapData);
+                AssertHydraulicBoundaryLocationsMapData(assessmentSection, hydraulicBoundaryLocationsMapData);
 
                 MapData referenceLineMapData = mapData.Collection.ElementAt(referenceLineIndex);
                 AssertReferenceLineMapData(referenceLine, referenceLineMapData);
@@ -166,7 +166,7 @@
         }
 
         [Test]
-        public void GivenViewWithHydraulicBoundaryLocationsDatabase_WhenChangingHydraulicBoundaryLocationsDataAndObserversNotified_MapDataUpdated()
+        public void GivenViewWithHydraulicBoundaryLocationsDatabase_WhenChangingHydraulicBoundaryLocationsDataAndObserversNotified_ThenMapDataUpdated()
         {
             // Given
             var assessmentSection = new AssessmentSectionStub();
@@ -187,7 +187,7 @@
                 MapData hydraulicBoundaryLocationsMapData = map.Data.Collection.ElementAt(hydraulicBoundaryLocationsIndex);
 
                 // Precondition
-                AssertHydraulicBoundarLocationsMapData(assessmentSection, hydraulicBoundaryLocationsMapData);
+                AssertHydraulicBoundaryLocationsMapData(assessmentSection, hydraulicBoundaryLocationsMapData);
 
                 // When
                 assessmentSection.SetHydraulicBoundaryLocationCalculations(new[]
@@ -198,7 +198,7 @@
                 assessmentSection.HydraulicBoundaryDatabase.Locations.NotifyObservers();
 
                 // Then
-                AssertHydraulicBoundarLocationsMapData(assessmentSection, hydraulicBoundaryLocationsMapData);
+                AssertHydraulicBoundaryLocationsMapData(assessmentSection, hydraulicBoundaryLocationsMapData);
                 mocks.VerifyAll();
             }
         }
@@ -305,7 +305,7 @@
             Assert.IsTrue(referenceLineMapData.IsVisible);
         }
 
-        private static void AssertHydraulicBoundarLocationsMapData(IAssessmentSection assessmentSection, MapData hydraulicBoundaryLocationsMapData)
+        private static void AssertHydraulicBoundaryLocationsMapData(IAssessmentSection assessmentSection, MapData hydraulicBoundaryLocationsMapData)
         {
             MapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(assessmentSection, hydraulicBoundaryLocationsMapData);
             Assert.IsTrue(hydraulicBoundaryLocationsMapData.IsVisible);
Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs
===================================================================
diff -u -re699be5b9029b6d27100eb8934e80f7a817c3d9e -r81c23df3e9ae714f3708c7d655c39e83be210b9a
--- Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs	(.../TestDataGenerator.cs)	(revision e699be5b9029b6d27100eb8934e80f7a817c3d9e)
+++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs	(.../TestDataGenerator.cs)	(revision 81c23df3e9ae714f3708c7d655c39e83be210b9a)
@@ -681,7 +681,7 @@
             };
 
             var subCalculation = new StabilityStoneCoverWaveConditionsCalculation();
-            var subCalculationWithOutputAndHydraulicBoundarLocationAndForeshoreProfile = new StabilityStoneCoverWaveConditionsCalculation
+            var subCalculationWithOutputAndHydraulicBoundaryLocationAndForeshoreProfile = new StabilityStoneCoverWaveConditionsCalculation
             {
                 InputParameters =
                 {
@@ -726,7 +726,7 @@
                 Children =
                 {
                     subCalculation,
-                    subCalculationWithOutputAndHydraulicBoundarLocationAndForeshoreProfile,
+                    subCalculationWithOutputAndHydraulicBoundaryLocationAndForeshoreProfile,
                     subCalculationWithOutputAndHydraulicBoundaryLocation,
                     subCalculationWithHydraulicBoundaryLocation,
                     subCalculationWithHydraulicBoundaryLocationAndForeshoreProfile
@@ -807,7 +807,7 @@
             };
 
             var subCalculation = new WaveImpactAsphaltCoverWaveConditionsCalculation();
-            var subCalculationWithOutputAndHydraulicBoundarLocationAndForeshoreProfile = new WaveImpactAsphaltCoverWaveConditionsCalculation
+            var subCalculationWithOutputAndHydraulicBoundaryLocationAndForeshoreProfile = new WaveImpactAsphaltCoverWaveConditionsCalculation
             {
                 InputParameters =
                 {
@@ -850,7 +850,7 @@
                 Children =
                 {
                     subCalculation,
-                    subCalculationWithOutputAndHydraulicBoundarLocationAndForeshoreProfile,
+                    subCalculationWithOutputAndHydraulicBoundaryLocationAndForeshoreProfile,
                     subCalculationWithOutputAndHydraulicBoundaryLocation,
                     subCalculationWithHydraulicBoundaryLocation,
                     subCalculationWithHydraulicBoundaryLocationAndForeshoreProfile
@@ -944,7 +944,7 @@
             };
 
             var subCalculation = new GrassCoverErosionOutwardsWaveConditionsCalculation();
-            var subCalculationWithOutputAndHydraulicBoundarLocationAndForeshoreProfile = new GrassCoverErosionOutwardsWaveConditionsCalculation
+            var subCalculationWithOutputAndHydraulicBoundaryLocationAndForeshoreProfile = new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
                 InputParameters =
                 {
@@ -987,7 +987,7 @@
                 Children =
                 {
                     subCalculation,
-                    subCalculationWithOutputAndHydraulicBoundarLocationAndForeshoreProfile,
+                    subCalculationWithOutputAndHydraulicBoundaryLocationAndForeshoreProfile,
                     subCalculationWithOutputAndHydraulicBoundaryLocation,
                     subCalculationWithHydraulicBoundaryLocation,
                     subCalculationWithHydraulicBoundaryLocationAndForeshoreProfile