Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs
===================================================================
diff -u -r24e90a2fa98b517b420bcd60e16ada43fb3fd6be -red32f16291395cfecffba5a76a98466f3c27b4b3
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs	(.../ClosingStructuresFailureMechanismView.cs)	(revision 24e90a2fa98b517b420bcd60e16ada43fb3fd6be)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismView.cs	(.../ClosingStructuresFailureMechanismView.cs)	(revision ed32f16291395cfecffba5a76a98466f3c27b4b3)
@@ -240,7 +240,6 @@
             SetReferenceLineMapData();
             SetSectionsMapData();
             SetHydraulicBoundaryLocationsMapData();
-
             SetForeshoreProfilesMapData();
             SetStructuresMapData();
             SetCalculationsMapData();
Index: Ringtoets/Common/src/Ringtoets.Common.Util/AggregatedHydraulicBoundaryLocation.cs
===================================================================
diff -u -r549482554a4a0e4b135073fb54a75dcd3ef927bc -red32f16291395cfecffba5a76a98466f3c27b4b3
--- Ringtoets/Common/src/Ringtoets.Common.Util/AggregatedHydraulicBoundaryLocation.cs	(.../AggregatedHydraulicBoundaryLocation.cs)	(revision 549482554a4a0e4b135073fb54a75dcd3ef927bc)
+++ Ringtoets/Common/src/Ringtoets.Common.Util/AggregatedHydraulicBoundaryLocation.cs	(.../AggregatedHydraulicBoundaryLocation.cs)	(revision ed32f16291395cfecffba5a76a98466f3c27b4b3)
@@ -37,21 +37,21 @@
         /// <param name="name">The name of the hydraulic boundary location.</param>
         /// <param name="location">The location of the hydraulic boundary location.</param>
         /// <param name="waterLevelCalculationForFactorizedSignalingNorm">The result of the
-        /// water level calculation for factorized signaling norm.</param>
+        /// water level calculation for the factorized signaling norm.</param>
         /// <param name="waterLevelCalculationForSignalingNorm">The result of the water level
-        /// calculation for signaling norm.</param>
+        /// calculation for the signaling norm.</param>
         /// <param name="waterLevelCalculationForLowerLimitNorm">The result of the water level
-        /// calculation for lower limit norm.</param>
+        /// calculation for the lower limit norm.</param>
         /// <param name="waterLevelCalculationForFactorizedLowerLimitNorm">The result of the
-        /// water level calculation for factorized lower limit norm.</param>
+        /// water level calculation for the factorized lower limit norm.</param>
         /// <param name="waveHeightCalculationForFactorizedSignalingNorm">The result of the
-        /// wave height calculation for factorized signaling norm.</param>
+        /// wave height calculation for the factorized signaling norm.</param>
         /// <param name="waveHeightCalculationForSignalingNorm">The result of the wave height
-        /// calculation for signaling norm.</param>
+        /// calculation for the signaling norm.</param>
         /// <param name="waveHeightCalculationForLowerLimitNorm">The result of the wave height
-        /// calculation for lower limit norm.</param>
+        /// calculation for the lower limit norm.</param>
         /// <param name="waveHeightCalculationForFactorizedLowerLimitNorm">The result of the
-        /// wave height calculation for factorized lower limit norm.</param>
+        /// wave height calculation for the factorized lower limit norm.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="name"/> or 
         /// <paramref name="location"/> is <c>null</c>.</exception>
         public AggregatedHydraulicBoundaryLocation(
@@ -104,42 +104,42 @@
         public Point2D Location { get; }
 
         /// <summary>
-        /// Gets the result of the water level calculation for factorized signaling norm.
+        /// Gets the result of the water level calculation for the factorized signaling norm.
         /// </summary>
         public RoundedDouble WaterLevelCalculationForFactorizedSignalingNorm { get; }
 
         /// <summary>
-        /// Gets the result of the water level calculation for signaling norm.
+        /// Gets the result of the water level calculation for the signaling norm.
         /// </summary>
         public RoundedDouble WaterLevelCalculationForSignalingNorm { get; }
 
         /// <summary>
-        /// Gets the result of the water level calculation for lower limit norm.
+        /// Gets the result of the water level calculation for the lower limit norm.
         /// </summary>
         public RoundedDouble WaterLevelCalculationForLowerLimitNorm { get; }
 
         /// <summary>
-        /// Gets the result of the water level calculation for factorized lower limit norm.
+        /// Gets the result of the water level calculation for the factorized lower limit norm.
         /// </summary>
         public RoundedDouble WaterLevelCalculationForFactorizedLowerLimitNorm { get; }
 
         /// <summary>
-        /// Gets the result of the wave height calculation for factorized signaling norm.
+        /// Gets the result of the wave height calculation for the factorized signaling norm.
         /// </summary>
         public RoundedDouble WaveHeightCalculationForFactorizedSignalingNorm { get; }
 
         /// <summary>
-        /// Gets the result of the wave height calculation for signaling norm.
+        /// Gets the result of the wave height calculation for the signaling norm.
         /// </summary>
         public RoundedDouble WaveHeightCalculationForSignalingNorm { get; }
 
         /// <summary>
-        /// Gets the result of the wave height calculation for lower limit norm.
+        /// Gets the result of the wave height calculation for the lower limit norm.
         /// </summary>
         public RoundedDouble WaveHeightCalculationForLowerLimitNorm { get; }
 
         /// <summary>
-        /// Gets the result of the wave height calculation for factorized lower limit norm.
+        /// Gets the result of the wave height calculation for the factorized lower limit norm.
         /// </summary>
         public RoundedDouble WaveHeightCalculationForFactorizedLowerLimitNorm { get; }
     }
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Util/GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocation.cs
===================================================================
diff -u -r752be44967f2f7c50520a6b6c18abe472ba62055 -red32f16291395cfecffba5a76a98466f3c27b4b3
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Util/GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocation.cs	(.../GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocation.cs)	(revision 752be44967f2f7c50520a6b6c18abe472ba62055)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Util/GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocation.cs	(.../GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocation.cs)	(revision ed32f16291395cfecffba5a76a98466f3c27b4b3)
@@ -32,7 +32,7 @@
     public class GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocation
     {
         /// <summary>
-        /// Creates a new instance of <see cref="GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocation"/>
+        /// Creates a new instance of <see cref="GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocation"/>.
         /// </summary>
         /// <param name="id">The id of the hydraulic boundary location.</param>
         /// <param name="name">The name of the hydraulic boundary location.</param>
@@ -44,19 +44,19 @@
         /// <param name="waterLevelCalculationForMechanismSpecificLowerLimitNorm">The result of the water level
         /// calculation for the mechanism specific lower limit norm.</param>
         /// <param name="waterLevelCalculationForLowerLimitNorm">The result of the water level calculation for
-        /// lower limit norm.</param>
-        /// <param name="waterLevelCalculationForFactorizedLowerLimitNorm">The result of the  water level
-        /// calculation for factorized lower limit norm.</param>
+        /// the lower limit norm.</param>
+        /// <param name="waterLevelCalculationForFactorizedLowerLimitNorm">The result of the water level
+        /// calculation for the factorized lower limit norm.</param>
         /// <param name="waveHeightCalculationForMechanismSpecificFactorizedSignalingNorm">The result of the
         /// wave height level calculation for the mechanism specific factorized signaling norm.</param>
         /// <param name="waveHeightCalculationForMechanismSpecificSignalingNorm">The result of the wave height
         /// calculation for the mechanism specific signaling norm.</param>
         /// <param name="waveHeightCalculationForMechanismSpecificLowerLimitNorm">The result of the wave height
         /// calculation for the mechanism specific lower limit norm.</param>
         /// <param name="waveHeightCalculationForLowerLimitNorm">The result of the wave height calculation for
-        /// lower limit norm.</param>
+        /// the lower limit norm.</param>
         /// <param name="waveHeightCalculationForFactorizedLowerLimitNorm">The result of the wave height
-        /// calculation for factorized lower limit norm.</param>
+        /// calculation for the factorized lower limit norm.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="name"/> or 
         /// <paramref name="location"/> is <c>null</c>.</exception>
         public GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocation(
@@ -131,12 +131,12 @@
         public RoundedDouble WaterLevelCalculationForMechanismSpecificLowerLimitNorm { get; }
 
         /// <summary>
-        /// Gets the result of the water level calculation for lower limit norm.
+        /// Gets the result of the water level calculation for the lower limit norm.
         /// </summary>
         public RoundedDouble WaterLevelCalculationForLowerLimitNorm { get; }
 
         /// <summary>
-        /// Gets the result of the water level calculation for factorized lower limit norm.
+        /// Gets the result of the water level calculation for the factorized lower limit norm.
         /// </summary>
         public RoundedDouble WaterLevelCalculationForFactorizedLowerLimitNorm { get; }
 
@@ -159,12 +159,12 @@
         public RoundedDouble WaveHeightCalculationForMechanismSpecificLowerLimitNorm { get; }
 
         /// <summary>
-        /// Gets the result of the wave height calculation for lower limit norm.
+        /// Gets the result of the wave height calculation for the lower limit norm.
         /// </summary>
         public RoundedDouble WaveHeightCalculationForLowerLimitNorm { get; }
 
         /// <summary>
-        /// Gets the result of the wave height calculation for factorized lower limit norm.
+        /// Gets the result of the wave height calculation for the factorized lower limit norm.
         /// </summary>
         public RoundedDouble WaveHeightCalculationForFactorizedLowerLimitNorm { get; }
     }
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Factories/GrassCoverErosionOutwardsMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -r3b44450249cdbaa33110ce4f9ab17a8f5ab39d68 -red32f16291395cfecffba5a76a98466f3c27b4b3
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Factories/GrassCoverErosionOutwardsMapDataFeaturesFactoryTest.cs	(.../GrassCoverErosionOutwardsMapDataFeaturesFactoryTest.cs)	(revision 3b44450249cdbaa33110ce4f9ab17a8f5ab39d68)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Factories/GrassCoverErosionOutwardsMapDataFeaturesFactoryTest.cs	(.../GrassCoverErosionOutwardsMapDataFeaturesFactoryTest.cs)	(revision ed32f16291395cfecffba5a76a98466f3c27b4b3)
@@ -142,7 +142,7 @@
                 new HydraulicBoundaryLocation(2, "test", 2, 2)
             };
 
-            GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.AddHydraulicBoundaryLocations(
+            GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations(
                 failureMechanism, assessmentSection, locations, withOutput);
 
             // Call
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs
===================================================================
diff -u -rd168cfa3e426f88b3ae1318268afacc7675c6fa6 -red32f16291395cfecffba5a76a98466f3c27b4b3
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismViewTest.cs)	(revision d168cfa3e426f88b3ae1318268afacc7675c6fa6)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismViewTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismViewTest.cs)	(revision ed32f16291395cfecffba5a76a98466f3c27b4b3)
@@ -211,7 +211,7 @@
 
             failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationA);
             failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationB);
-            GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.AddHydraulicBoundaryLocations(failureMechanism, assessmentSection, new[]
+            GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations(failureMechanism, assessmentSection, new[]
             {
                 new HydraulicBoundaryLocation(1, "test", 1.0, 2.0)
             });
@@ -245,7 +245,7 @@
             var assessmentSection = new AssessmentSectionStub();
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
 
-            GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.AddHydraulicBoundaryLocations(failureMechanism, assessmentSection, new[]
+            GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations(failureMechanism, assessmentSection, new[]
             {
                 new HydraulicBoundaryLocation(1, "test", 1.0, 2.0)
             });
@@ -265,7 +265,7 @@
                 GrassCoverErosionOutwardsMapDataTestHelper.AssertHydraulicBoundaryLocationsMapData(failureMechanism, assessmentSection, hydraulicBoundaryLocationsMapData);
 
                 // When
-                GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.AddHydraulicBoundaryLocations(failureMechanism, assessmentSection, new[]
+                GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations(failureMechanism, assessmentSection, new[]
                 {
                     new HydraulicBoundaryLocation(1, "test", 1.0, 2.0),
                     new HydraulicBoundaryLocation(2, "test2", 3.0, 4.0)
@@ -287,7 +287,7 @@
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test1", 1.0, 2.0);
             var assessmentSection = new AssessmentSectionStub();
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.AddHydraulicBoundaryLocations(failureMechanism, assessmentSection, new[]
+            GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations(failureMechanism, assessmentSection, new[]
             {
                 hydraulicBoundaryLocation
             });
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsHydraulicBoundaryLocationsExporterTest.cs
===================================================================
diff -u -r6f33b44599df032ecae3342b0aacd606a9e87c1f -red32f16291395cfecffba5a76a98466f3c27b4b3
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsHydraulicBoundaryLocationsExporterTest.cs	(.../GrassCoverErosionOutwardsHydraulicBoundaryLocationsExporterTest.cs)	(revision 6f33b44599df032ecae3342b0aacd606a9e87c1f)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsHydraulicBoundaryLocationsExporterTest.cs	(.../GrassCoverErosionOutwardsHydraulicBoundaryLocationsExporterTest.cs)	(revision ed32f16291395cfecffba5a76a98466f3c27b4b3)
@@ -115,7 +115,7 @@
             // Setup
             var assessmentSection = new AssessmentSectionStub();
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.AddHydraulicBoundaryLocations(failureMechanism, assessmentSection, new[]
+            GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations(failureMechanism, assessmentSection, new[]
             {
                 new HydraulicBoundaryLocation(123, "aName", 1.1, 2.2)
             });
@@ -152,7 +152,7 @@
             // Setup
             var assessmentSection = new AssessmentSectionStub();
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.AddHydraulicBoundaryLocations(failureMechanism, assessmentSection, new[]
+            GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations(failureMechanism, assessmentSection, new[]
             {
                 new HydraulicBoundaryLocation(123, "aName", 1.1, 2.2)
             });
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.Test/GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationFactoryTest.cs
===================================================================
diff -u -r3b44450249cdbaa33110ce4f9ab17a8f5ab39d68 -red32f16291395cfecffba5a76a98466f3c27b4b3
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.Test/GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationFactoryTest.cs	(.../GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationFactoryTest.cs)	(revision 3b44450249cdbaa33110ce4f9ab17a8f5ab39d68)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.Test/GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationFactoryTest.cs	(.../GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationFactoryTest.cs)	(revision ed32f16291395cfecffba5a76a98466f3c27b4b3)
@@ -71,9 +71,9 @@
         {
             // Setup
             var assessmentSection = new AssessmentSectionStub();
-
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.AddHydraulicBoundaryLocations(
+
+            GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations(
                 failureMechanism, assessmentSection, new[]
                 {
                     new HydraulicBoundaryLocation(1, "location1", 1, 1),
@@ -125,8 +125,14 @@
             // Setup
             var assessmentSection = new AssessmentSectionStub();
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            failureMechanism.SetHydraulicBoundaryLocationCalculations(assessmentSection.HydraulicBoundaryDatabase.Locations);
 
+            GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations(
+                failureMechanism, assessmentSection, new[]
+                {
+                    new HydraulicBoundaryLocation(1, "location1", 1, 1),
+                    new HydraulicBoundaryLocation(2, "location1", 2, 2)
+                });
+
             // Call
             GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocation[] aggregatedLocations =
                 GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationFactory.CreateAggregatedHydraulicBoundaryLocations(
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.Test/GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationTest.cs
===================================================================
diff -u -r752be44967f2f7c50520a6b6c18abe472ba62055 -red32f16291395cfecffba5a76a98466f3c27b4b3
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.Test/GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationTest.cs	(.../GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationTest.cs)	(revision 752be44967f2f7c50520a6b6c18abe472ba62055)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.Test/GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationTest.cs	(.../GrassCoverErosionOutwardsAggregatedHydraulicBoundaryLocationTest.cs)	(revision ed32f16291395cfecffba5a76a98466f3c27b4b3)
@@ -92,6 +92,7 @@
             Assert.AreEqual(id, aggregatedLocation.Id);
             Assert.AreEqual(name, aggregatedLocation.Name);
             Assert.AreSame(location, aggregatedLocation.Location);
+
             Assert.AreEqual(waterLevelCalculationForMechanismSpecificFactorizedSignalingNorm, aggregatedLocation.WaterLevelCalculationForMechanismSpecificFactorizedSignalingNorm);
             Assert.AreEqual(waterLevelCalculationForMechanismSpecificSignalingNorm, aggregatedLocation.WaterLevelCalculationForMechanismSpecificSignalingNorm);
             Assert.AreEqual(waterLevelCalculationForMechanismSpecificLowerLimitNorm, aggregatedLocation.WaterLevelCalculationForMechanismSpecificLowerLimitNorm);
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.TestUtil.Test/GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelperTest.cs
===================================================================
diff -u -r6f33b44599df032ecae3342b0aacd606a9e87c1f -red32f16291395cfecffba5a76a98466f3c27b4b3
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.TestUtil.Test/GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelperTest.cs	(.../GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelperTest.cs)	(revision 6f33b44599df032ecae3342b0aacd606a9e87c1f)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.TestUtil.Test/GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelperTest.cs	(.../GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelperTest.cs)	(revision ed32f16291395cfecffba5a76a98466f3c27b4b3)
@@ -35,7 +35,7 @@
         [Test]
         [TestCase(true)]
         [TestCase(false)]
-        public void AddHydraulicBoundaryLocations_Always_AddsLocationsAndCalculations(bool setCalculationOutput)
+        public void SetHydraulicBoundaryLocations_Always_SetsLocationsAndCalculations(bool setCalculationOutput)
         {
             // Setup
             var assessmentSection = new AssessmentSectionStub();
@@ -47,11 +47,11 @@
             };
 
             // Call
-            GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.AddHydraulicBoundaryLocations(failureMechanism, assessmentSection, locations, setCalculationOutput);
+            GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations(failureMechanism, assessmentSection, locations, setCalculationOutput);
 
             // Assert
             CollectionAssert.AreEqual(locations, assessmentSection.HydraulicBoundaryDatabase.Locations);
-            
+
             AssertHydraulicBoundaryCalculations(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, locations, setCalculationOutput);
             AssertHydraulicBoundaryCalculations(assessmentSection.WaterLevelCalculationsForSignalingNorm, locations, setCalculationOutput);
             AssertHydraulicBoundaryCalculations(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, locations, setCalculationOutput);
@@ -77,7 +77,7 @@
 
             Assert.AreEqual(expectedHydraulicBoundaryLocations.Length, calculationsArray.Length);
 
-            for (int i = 0; i < expectedHydraulicBoundaryLocations.Length; i++)
+            for (var i = 0; i < expectedHydraulicBoundaryLocations.Length; i++)
             {
                 Assert.AreSame(expectedHydraulicBoundaryLocations[i], calculationsArray[i].HydraulicBoundaryLocation);
                 Assert.AreEqual(expectedHasOutput, calculationsArray[i].HasOutput);
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.TestUtil/GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.cs
===================================================================
diff -u -r6f33b44599df032ecae3342b0aacd606a9e87c1f -red32f16291395cfecffba5a76a98466f3c27b4b3
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.TestUtil/GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.cs	(.../GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.cs)	(revision 6f33b44599df032ecae3342b0aacd606a9e87c1f)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Util.TestUtil/GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.cs	(.../GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.cs)	(revision ed32f16291395cfecffba5a76a98466f3c27b4b3)
@@ -28,29 +28,27 @@
 namespace Ringtoets.GrassCoverErosionOutwards.Util.TestUtil
 {
     /// <summary>
-    /// Test helper for handling with hydraulic boundary locations and calculations in
+    /// Test helper for dealing with hydraulic boundary locations and calculations in
     /// <see cref="GrassCoverErosionOutwardsFailureMechanism"/>.
     /// </summary>
     public static class GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper
     {
-        private static Random random;
+        private static readonly Random random = new Random(39);
 
         /// <summary>
-        /// Adds the given <paramref name="hydraulicBoundaryLocations"/> to
+        /// Sets the given <paramref name="hydraulicBoundaryLocations"/> to
         /// the <paramref name="assessmentSection"/> and <paramref name="failureMechanism"/>.
         /// </summary>
-        /// <param name="failureMechanism">The failure mechanism to add the locations to.</param>
-        /// <param name="assessmentSection">The assessment section to add the locations to.</param>
-        /// <param name="hydraulicBoundaryLocations">The locations to add.</param>
+        /// <param name="failureMechanism">The failure mechanism to set the locations to.</param>
+        /// <param name="assessmentSection">The assessment section to set the locations to.</param>
+        /// <param name="hydraulicBoundaryLocations">The locations to set.</param>
         /// <param name="setCalculationOutput">Whether to set dummy output for the automatically generated
         /// hydraulic boundary location calculations.</param>
-        public static void AddHydraulicBoundaryLocations(GrassCoverErosionOutwardsFailureMechanism failureMechanism,
+        public static void SetHydraulicBoundaryLocations(GrassCoverErosionOutwardsFailureMechanism failureMechanism,
                                                          AssessmentSectionStub assessmentSection,
                                                          IEnumerable<HydraulicBoundaryLocation> hydraulicBoundaryLocations,
                                                          bool setCalculationOutput = false)
         {
-            random = new Random(39);
-
             assessmentSection.SetHydraulicBoundaryLocationCalculations(hydraulicBoundaryLocations, setCalculationOutput);
             failureMechanism.SetHydraulicBoundaryLocationCalculations(hydraulicBoundaryLocations);
 
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismViewInfoTest.cs
===================================================================
diff -u -r6f33b44599df032ecae3342b0aacd606a9e87c1f -red32f16291395cfecffba5a76a98466f3c27b4b3
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismViewInfoTest.cs	(.../HeightStructuresFailureMechanismViewInfoTest.cs)	(revision 6f33b44599df032ecae3342b0aacd606a9e87c1f)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ViewInfos/HeightStructuresFailureMechanismViewInfoTest.cs	(.../HeightStructuresFailureMechanismViewInfoTest.cs)	(revision ed32f16291395cfecffba5a76a98466f3c27b4b3)
@@ -203,6 +203,10 @@
 
             // Assert
             Assert.IsInstanceOf<HeightStructuresFailureMechanismView>(view);
+
+            var failureMechanismView = (HeightStructuresFailureMechanismView) view;
+            Assert.AreSame(failureMechanism, failureMechanismView.FailureMechanism);
+            Assert.AreSame(assessmentSection, failureMechanismView.AssessmentSection);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/ViewInfos/StabilityPointStructuresFailureMechanismViewInfoTest.cs
===================================================================
diff -u -r6f33b44599df032ecae3342b0aacd606a9e87c1f -red32f16291395cfecffba5a76a98466f3c27b4b3
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/ViewInfos/StabilityPointStructuresFailureMechanismViewInfoTest.cs	(.../StabilityPointStructuresFailureMechanismViewInfoTest.cs)	(revision 6f33b44599df032ecae3342b0aacd606a9e87c1f)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/ViewInfos/StabilityPointStructuresFailureMechanismViewInfoTest.cs	(.../StabilityPointStructuresFailureMechanismViewInfoTest.cs)	(revision ed32f16291395cfecffba5a76a98466f3c27b4b3)
@@ -203,6 +203,10 @@
 
             // Assert
             Assert.IsInstanceOf<StabilityPointStructuresFailureMechanismView>(view);
+
+            var failureMechanismView = (StabilityPointStructuresFailureMechanismView) view;
+            Assert.AreSame(failureMechanism, failureMechanismView.FailureMechanism);
+            Assert.AreSame(assessmentSection, failureMechanismView.AssessmentSection);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ViewInfos/StabilityStoneCoverFailureMechanismViewInfoTest.cs
===================================================================
diff -u -r6f33b44599df032ecae3342b0aacd606a9e87c1f -red32f16291395cfecffba5a76a98466f3c27b4b3
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ViewInfos/StabilityStoneCoverFailureMechanismViewInfoTest.cs	(.../StabilityStoneCoverFailureMechanismViewInfoTest.cs)	(revision 6f33b44599df032ecae3342b0aacd606a9e87c1f)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ViewInfos/StabilityStoneCoverFailureMechanismViewInfoTest.cs	(.../StabilityStoneCoverFailureMechanismViewInfoTest.cs)	(revision ed32f16291395cfecffba5a76a98466f3c27b4b3)
@@ -203,6 +203,10 @@
 
             // Assert
             Assert.IsInstanceOf<StabilityStoneCoverFailureMechanismView>(view);
+
+            var failureMechanismView = (StabilityStoneCoverFailureMechanismView) view;
+            Assert.AreSame(failureMechanism, failureMechanismView.FailureMechanism);
+            Assert.AreSame(assessmentSection, failureMechanismView.AssessmentSection);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverFailureMechanismViewInfoTest.cs
===================================================================
diff -u -r6f33b44599df032ecae3342b0aacd606a9e87c1f -red32f16291395cfecffba5a76a98466f3c27b4b3
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverFailureMechanismViewInfoTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismViewInfoTest.cs)	(revision 6f33b44599df032ecae3342b0aacd606a9e87c1f)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ViewInfos/WaveImpactAsphaltCoverFailureMechanismViewInfoTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismViewInfoTest.cs)	(revision ed32f16291395cfecffba5a76a98466f3c27b4b3)
@@ -205,6 +205,10 @@
 
             // Assert
             Assert.IsInstanceOf<WaveImpactAsphaltCoverFailureMechanismView>(view);
+
+            var failureMechanismView = (WaveImpactAsphaltCoverFailureMechanismView) view;
+            Assert.AreSame(failureMechanism, failureMechanismView.FailureMechanism);
+            Assert.AreSame(assessmentSection, failureMechanismView.AssessmentSection);
         }
     }
 }
\ No newline at end of file