Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsHydraulicBoundaryLocationContext.cs
===================================================================
diff -u -r7594f72cabeb4802ffab5715e2edb2712fc1f0df -rf70b1b56aded32ecb0e2ff593eb089f4059125db
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsHydraulicBoundaryLocationContext.cs	(.../GrassCoverErosionOutwardsHydraulicBoundaryLocationContext.cs)	(revision 7594f72cabeb4802ffab5715e2edb2712fc1f0df)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsHydraulicBoundaryLocationContext.cs	(.../GrassCoverErosionOutwardsHydraulicBoundaryLocationContext.cs)	(revision f70b1b56aded32ecb0e2ff593eb089f4059125db)
@@ -29,7 +29,7 @@
 {
     /// <summary>
     /// Presentation object for all data required to configure an instance of a <see cref="GrassCoverErosionOutwardsFailureMechanism"/> 
-    /// specific <see cref="Common.Data.Hydraulics.HydraulicBoundaryLocation"/>.
+    /// specific <see cref="HydraulicBoundaryLocation"/>.
     /// </summary>
     public abstract class GrassCoverErosionOutwardsHydraulicBoundaryLocationContext
         : ObservableWrappedObjectContextBase<HydraulicBoundaryLocation>
@@ -42,13 +42,15 @@
         /// <param name="hydraulicBoundaryLocations">The <see cref="ObservableList{T}"/> 
         /// containing all the hydraulic boundary locations.</param>
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
-        protected GrassCoverErosionOutwardsHydraulicBoundaryLocationContext(HydraulicBoundaryLocation wrappedData, ObservableList<HydraulicBoundaryLocation> hydraulicBoundaryLocations)
+        protected GrassCoverErosionOutwardsHydraulicBoundaryLocationContext(HydraulicBoundaryLocation wrappedData,
+                                                                            ObservableList<HydraulicBoundaryLocation> hydraulicBoundaryLocations)
             : base(wrappedData)
         {
             if (hydraulicBoundaryLocations == null)
             {
                 throw new ArgumentNullException(nameof(hydraulicBoundaryLocations));
             }
+
             HydraulicBoundaryLocations = hydraulicBoundaryLocations;
         }
 
@@ -59,12 +61,14 @@
 
         public override bool Equals(WrappedObjectContextBase<HydraulicBoundaryLocation> other)
         {
-            return base.Equals(other) && ReferenceEquals(((GrassCoverErosionOutwardsHydraulicBoundaryLocationContext) other).HydraulicBoundaryLocations, HydraulicBoundaryLocations);
+            return base.Equals(other)
+                   && ReferenceEquals(((GrassCoverErosionOutwardsHydraulicBoundaryLocationContext) other).HydraulicBoundaryLocations, HydraulicBoundaryLocations);
         }
 
         public override int GetHashCode()
         {
-            return base.GetHashCode() ^ WrappedData.GetHashCode();
+            return base.GetHashCode()
+                   ^ HydraulicBoundaryLocations.GetHashCode();
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationContextProperties.cs
===================================================================
diff -u -rfaea7b000850729e2b0c6c2a06fe3a7e94541abd -rf70b1b56aded32ecb0e2ff593eb089f4059125db
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationContextProperties.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationContextProperties.cs)	(revision faea7b000850729e2b0c6c2a06fe3a7e94541abd)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationContextProperties.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationContextProperties.cs)	(revision f70b1b56aded32ecb0e2ff593eb089f4059125db)
@@ -21,7 +21,6 @@
 
 using System.ComponentModel;
 using Core.Common.Base.Data;
-using Core.Common.Base.Geometry;
 using Core.Common.Gui.Attributes;
 using Core.Common.Utils;
 using Core.Common.Utils.Attributes;
@@ -53,7 +52,7 @@
                 StochastsIndex = 12,
                 DurationsIndex = 13,
                 IllustrationPointsIndex = 14
-            }) { }
+            }) {}
 
         [PropertyOrder(4)]
         [TypeConverter(typeof(NoValueRoundedDoubleConverter))]
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsHydraulicBoundaryLocationContextTest.cs
===================================================================
diff -u -r7594f72cabeb4802ffab5715e2edb2712fc1f0df -rf70b1b56aded32ecb0e2ff593eb089f4059125db
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsHydraulicBoundaryLocationContextTest.cs	(.../GrassCoverErosionOutwardsHydraulicBoundaryLocationContextTest.cs)	(revision 7594f72cabeb4802ffab5715e2edb2712fc1f0df)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsHydraulicBoundaryLocationContextTest.cs	(.../GrassCoverErosionOutwardsHydraulicBoundaryLocationContextTest.cs)	(revision f70b1b56aded32ecb0e2ff593eb089f4059125db)
@@ -24,6 +24,7 @@
 using Core.Common.Controls.PresentationObjects;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Hydraulics;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Forms.Test.PresentationObjects
@@ -32,26 +33,12 @@
     public class GrassCoverErosionOutwardsHydraulicBoundaryLocationContextTest
     {
         [Test]
-        public void Constructor_NullHydraulicBoundaryLocation_ThrowsArgumentNullException()
+        public void Constructor_NullHydraulicBoundaryLocations_ThrowsArgumentNullException()
         {
             // Setup
-            var locations = new ObservableList<HydraulicBoundaryLocation>();
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
 
             // Call
-            TestDelegate test = () => new TestGrassCoverErosionOutwardsLocationContext(null, locations);
-
-            // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
-            Assert.AreEqual("wrappedData", paramName);
-        }
-
-        [Test]
-        public void Constructor_NullHydraulicBoundaryDatabase_ThrowsArgumentNullException()
-        {
-            // Setup
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 2.0, 3.0);
-
-            // Call
             TestDelegate test = () => new TestGrassCoverErosionOutwardsLocationContext(hydraulicBoundaryLocation, null);
 
             // Assert
@@ -63,7 +50,7 @@
         public void Constructor_ValidParameters_ExpectedValues()
         {
             // Setup
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 2.0, 3.0);
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
             var locations = new ObservableList<HydraulicBoundaryLocation>
             {
                 hydraulicBoundaryLocation
@@ -83,7 +70,7 @@
         {
             // Setup
             var hydraulicBoundaryLocationList = new ObservableList<HydraulicBoundaryLocation>();
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "Name", 2.0, 3.0);
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
 
             var context = new TestGrassCoverErosionOutwardsLocationContext(hydraulicBoundaryLocation, hydraulicBoundaryLocationList);
 
@@ -99,7 +86,7 @@
         {
             // Setup
             var hydraulicBoundaryLocationList = new ObservableList<HydraulicBoundaryLocation>();
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "Name", 2.0, 3.0);
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
 
             var context = new TestGrassCoverErosionOutwardsLocationContext(hydraulicBoundaryLocation, hydraulicBoundaryLocationList);
 
@@ -116,7 +103,7 @@
             // Setup
             var hydraulicBoundaryLocationList1 = new ObservableList<HydraulicBoundaryLocation>();
             var hydraulicBoundaryLocationList2 = new ObservableList<HydraulicBoundaryLocation>();
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "Name", 2.0, 3.0);
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
             var context1 = new TestGrassCoverErosionOutwardsLocationContext(hydraulicBoundaryLocation, hydraulicBoundaryLocationList1);
             var context2 = new TestGrassCoverErosionOutwardsLocationContext(hydraulicBoundaryLocation, hydraulicBoundaryLocationList2);
 
@@ -134,8 +121,8 @@
         {
             // Setup
             var hydraulicBoundaryLocationList = new ObservableList<HydraulicBoundaryLocation>();
-            var hydraulicBoundaryLocation1 = new HydraulicBoundaryLocation(1, "First name", 2.0, 3.0);
-            var hydraulicBoundaryLocation2 = new HydraulicBoundaryLocation(2, "Second name", 4.0, 5.0);
+            var hydraulicBoundaryLocation1 = new TestHydraulicBoundaryLocation("First name");
+            var hydraulicBoundaryLocation2 = new TestHydraulicBoundaryLocation("Second name");
             var context1 = new TestGrassCoverErosionOutwardsLocationContext(hydraulicBoundaryLocation1, hydraulicBoundaryLocationList);
             var context2 = new TestGrassCoverErosionOutwardsLocationContext(hydraulicBoundaryLocation2, hydraulicBoundaryLocationList);
 
@@ -153,7 +140,7 @@
         {
             // Setup
             var hydraulicBoundaryLocationList = new ObservableList<HydraulicBoundaryLocation>();
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "Name", 2.0, 3.0);
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
             var context1 = new TestGrassCoverErosionOutwardsLocationContext(hydraulicBoundaryLocation, hydraulicBoundaryLocationList);
             var context2 = new TestGrassCoverErosionOutwardsLocationContext(hydraulicBoundaryLocation, hydraulicBoundaryLocationList);
 
@@ -171,7 +158,7 @@
         {
             // Setup
             var hydraulicBoundaryLocationList = new ObservableList<HydraulicBoundaryLocation>();
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "Name", 2.0, 3.0);
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
             var context1 = new TestGrassCoverErosionOutwardsLocationContext(hydraulicBoundaryLocation, hydraulicBoundaryLocationList);
             var context2 = new TestGrassCoverErosionOutwardsLocationContext(hydraulicBoundaryLocation, hydraulicBoundaryLocationList);
 
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationContextPropertiesTest.cs
===================================================================
diff -u -r7594f72cabeb4802ffab5715e2edb2712fc1f0df -rf70b1b56aded32ecb0e2ff593eb089f4059125db
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationContextPropertiesTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationContextPropertiesTest.cs)	(revision 7594f72cabeb4802ffab5715e2edb2712fc1f0df)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationContextPropertiesTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationContextPropertiesTest.cs)	(revision f70b1b56aded32ecb0e2ff593eb089f4059125db)
@@ -293,7 +293,16 @@
             observer.Expect(o => o.UpdateObserver());
             mocks.ReplayAll();
 
-            HydraulicBoundaryLocation hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+            HydraulicBoundaryLocation hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation
+            {
+                DesignWaterLevelCalculation =
+                {
+                    InputParameters =
+                    {
+                        ShouldIllustrationPointsBeCalculated = false
+                    }
+                }
+            };
 
             var locations = new ObservableList<HydraulicBoundaryLocation>
             {
@@ -307,9 +316,6 @@
                 Data = new GrassCoverErosionOutwardsDesignWaterLevelLocationContext(hydraulicBoundaryLocation, locations)
             };
 
-            // Precondition
-            Assert.IsFalse(hydraulicBoundaryLocation.DesignWaterLevelCalculation.InputParameters.ShouldIllustrationPointsBeCalculated);
-
             // Call
             properties.ShouldIllustrationPointsBeCalculated = true;
 
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationContextPropertiesTest.cs
===================================================================
diff -u -r7594f72cabeb4802ffab5715e2edb2712fc1f0df -rf70b1b56aded32ecb0e2ff593eb089f4059125db
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationContextPropertiesTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationContextPropertiesTest.cs)	(revision 7594f72cabeb4802ffab5715e2edb2712fc1f0df)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightLocationContextPropertiesTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationContextPropertiesTest.cs)	(revision f70b1b56aded32ecb0e2ff593eb089f4059125db)
@@ -292,7 +292,17 @@
             observer.Expect(o => o.UpdateObserver());
             mocks.ReplayAll();
 
-            HydraulicBoundaryLocation hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+            HydraulicBoundaryLocation hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation
+            {
+                WaveHeightCalculation =
+                {
+                    InputParameters =
+                    {
+                        ShouldIllustrationPointsBeCalculated = false
+                    }
+                }
+            };
+
             var locations = new ObservableList<HydraulicBoundaryLocation>
             {
                 hydraulicBoundaryLocation
@@ -305,9 +315,6 @@
                 Data = new GrassCoverErosionOutwardsWaveHeightLocationContext(hydraulicBoundaryLocation, locations)
             };
 
-            // Precondition
-            Assert.IsFalse(hydraulicBoundaryLocation.WaveHeightCalculation.InputParameters.ShouldIllustrationPointsBeCalculated);
-
             // Call
             properties.ShouldIllustrationPointsBeCalculated = true;
 
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/HydraulicBoundaryLocationContext.cs
===================================================================
diff -u -r7594f72cabeb4802ffab5715e2edb2712fc1f0df -rf70b1b56aded32ecb0e2ff593eb089f4059125db
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/HydraulicBoundaryLocationContext.cs	(.../HydraulicBoundaryLocationContext.cs)	(revision 7594f72cabeb4802ffab5715e2edb2712fc1f0df)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/HydraulicBoundaryLocationContext.cs	(.../HydraulicBoundaryLocationContext.cs)	(revision f70b1b56aded32ecb0e2ff593eb089f4059125db)
@@ -56,12 +56,14 @@
 
         public override bool Equals(WrappedObjectContextBase<HydraulicBoundaryLocation> other)
         {
-            return base.Equals(other) && ReferenceEquals(((HydraulicBoundaryLocationContext) other).HydraulicBoundaryDatabase, HydraulicBoundaryDatabase);
+            return base.Equals(other)
+                   && ReferenceEquals(((HydraulicBoundaryLocationContext) other).HydraulicBoundaryDatabase, HydraulicBoundaryDatabase);
         }
 
         public override int GetHashCode()
         {
-            return base.GetHashCode() ^ WrappedData.GetHashCode();
+            return base.GetHashCode()
+                   ^ HydraulicBoundaryDatabase.GetHashCode();
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationContextPropertiesTest.cs
===================================================================
diff -u -r7594f72cabeb4802ffab5715e2edb2712fc1f0df -rf70b1b56aded32ecb0e2ff593eb089f4059125db
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationContextPropertiesTest.cs	(.../DesignWaterLevelLocationContextPropertiesTest.cs)	(revision 7594f72cabeb4802ffab5715e2edb2712fc1f0df)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationContextPropertiesTest.cs	(.../DesignWaterLevelLocationContextPropertiesTest.cs)	(revision f70b1b56aded32ecb0e2ff593eb089f4059125db)
@@ -302,7 +302,17 @@
             observer.Expect(o => o.UpdateObserver());
             mocks.ReplayAll();
 
-            HydraulicBoundaryLocation hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+            HydraulicBoundaryLocation hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation
+            {
+                DesignWaterLevelCalculation =
+                {
+                    InputParameters =
+                    {
+                        ShouldIllustrationPointsBeCalculated = false
+                    }
+                }
+            };
+
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 Locations =
@@ -318,9 +328,6 @@
                 Data = new DesignWaterLevelLocationContext(hydraulicBoundaryLocation, hydraulicBoundaryDatabase)
             };
 
-            // Precondition
-            Assert.IsFalse(hydraulicBoundaryLocation.DesignWaterLevelCalculation.InputParameters.ShouldIllustrationPointsBeCalculated);
-
             // Call
             properties.ShouldIllustrationPointsBeCalculated = true;
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightLocationContextPropertiesTest.cs
===================================================================
diff -u -r7594f72cabeb4802ffab5715e2edb2712fc1f0df -rf70b1b56aded32ecb0e2ff593eb089f4059125db
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightLocationContextPropertiesTest.cs	(.../WaveHeightLocationContextPropertiesTest.cs)	(revision 7594f72cabeb4802ffab5715e2edb2712fc1f0df)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightLocationContextPropertiesTest.cs	(.../WaveHeightLocationContextPropertiesTest.cs)	(revision f70b1b56aded32ecb0e2ff593eb089f4059125db)
@@ -305,7 +305,17 @@
             observer.Expect(o => o.UpdateObserver());
             mocks.ReplayAll();
 
-            HydraulicBoundaryLocation hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+            HydraulicBoundaryLocation hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation
+            {
+                WaveHeightCalculation =
+                {
+                    InputParameters =
+                    {
+                        ShouldIllustrationPointsBeCalculated = false
+                    }
+                }
+            };
+
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 Locations =
@@ -321,9 +331,6 @@
                 Data = new WaveHeightLocationContext(hydraulicBoundaryLocation, hydraulicBoundaryDatabase)
             };
 
-            // Precondition
-            Assert.IsFalse(hydraulicBoundaryLocation.WaveHeightCalculation.InputParameters.ShouldIllustrationPointsBeCalculated);
-
             // Call
             properties.ShouldIllustrationPointsBeCalculated = true;