Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/DesignWaterLevelLocationContext.cs
===================================================================
diff -u -r4dfedddc797825c49f4ca459dc38be7bc9978ccb -r1f7f79eaf55689da4a8921bb7f15960a2fff9ab7
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/DesignWaterLevelLocationContext.cs	(.../DesignWaterLevelLocationContext.cs)	(revision 4dfedddc797825c49f4ca459dc38be7bc9978ccb)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/DesignWaterLevelLocationContext.cs	(.../DesignWaterLevelLocationContext.cs)	(revision 1f7f79eaf55689da4a8921bb7f15960a2fff9ab7)
@@ -25,20 +25,18 @@
 namespace Ringtoets.Integration.Forms.PresentationObjects
 {
     /// <summary>
-    /// Presentation object for all data required to configure an instance of <see cref="HydraulicBoundaryLocation"/> 
+    /// Presentation object for all data required to configure an instance of <see cref="HydraulicBoundaryLocationCalculation"/>
     /// with a design water level calculation result.
     /// </summary>
     public class DesignWaterLevelLocationContext : HydraulicBoundaryLocationContext
     {
         /// <summary>
         /// Creates a new instance of <see cref="DesignWaterLevelLocationContext"/>.
         /// </summary>
-        /// <param name="wrappedData">The <see cref="HydraulicBoundaryLocation"/> which the <see cref="DesignWaterLevelLocationContext"/>
-        /// belongs to.</param>
-        /// <param name="calculation">The <see cref="HydraulicBoundaryLocationCalculation"/> at stake.</param>
-        /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
-        public DesignWaterLevelLocationContext(HydraulicBoundaryLocation wrappedData,
-                                               HydraulicBoundaryLocationCalculation calculation)
-            : base(calculation) {}
+        /// <param name="wrappedData">The <see cref="HydraulicBoundaryLocationCalculation"/> which the
+        /// <see cref="DesignWaterLevelLocationContext"/> belongs to.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="wrappedData"/> is <c>null</c>.</exception>
+        public DesignWaterLevelLocationContext(HydraulicBoundaryLocationCalculation wrappedData)
+            : base(wrappedData) {}
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/WaveHeightLocationContext.cs
===================================================================
diff -u -r4dfedddc797825c49f4ca459dc38be7bc9978ccb -r1f7f79eaf55689da4a8921bb7f15960a2fff9ab7
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/WaveHeightLocationContext.cs	(.../WaveHeightLocationContext.cs)	(revision 4dfedddc797825c49f4ca459dc38be7bc9978ccb)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/WaveHeightLocationContext.cs	(.../WaveHeightLocationContext.cs)	(revision 1f7f79eaf55689da4a8921bb7f15960a2fff9ab7)
@@ -25,20 +25,18 @@
 namespace Ringtoets.Integration.Forms.PresentationObjects
 {
     /// <summary>
-    /// Presentation object for all data required to configure an instance of <see cref="HydraulicBoundaryLocation"/> 
+    /// Presentation object for all data required to configure an instance of <see cref="HydraulicBoundaryLocationCalculation"/>
     /// with a wave height calculation result.
     /// </summary>
     public class WaveHeightLocationContext : HydraulicBoundaryLocationContext
     {
         /// <summary>
         /// Creates a new instance of <see cref="WaveHeightLocationContext"/>.
         /// </summary>
-        /// <param name="hydraulicBoundaryLocation">The <see cref="HydraulicBoundaryLocation"/> which the <see cref="WaveHeightLocationContext"/>
-        /// belongs to.</param>
-        /// <param name="calculation">The <see cref="HydraulicBoundaryLocationCalculation"/> at stake.</param>
-        /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
-        public WaveHeightLocationContext(HydraulicBoundaryLocation hydraulicBoundaryLocation,
-                                         HydraulicBoundaryLocationCalculation calculation)
-            : base(calculation) {}
+        /// <param name="wrappedData">The <see cref="HydraulicBoundaryLocationCalculation"/> which the
+        /// <see cref="WaveHeightLocationContext"/> belongs to.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="wrappedData"/> is <c>null</c>.</exception>
+        public WaveHeightLocationContext(HydraulicBoundaryLocationCalculation wrappedData)
+            : base(wrappedData) {}
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs
===================================================================
diff -u -r844d3c1ab299cf909c27616c1932e9f64c252c68 -r1f7f79eaf55689da4a8921bb7f15960a2fff9ab7
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs	(.../DesignWaterLevelLocationsView.cs)	(revision 844d3c1ab299cf909c27616c1932e9f64c252c68)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs	(.../DesignWaterLevelLocationsView.cs)	(revision 1f7f79eaf55689da4a8921bb7f15960a2fff9ab7)
@@ -80,7 +80,7 @@
             {
                 HydraulicBoundaryLocation hydraulicBoundaryLocation = ((HydraulicBoundaryLocationRow) currentRow.DataBoundItem).CalculatableObject;
 
-                return new DesignWaterLevelLocationContext(hydraulicBoundaryLocation, GetCalculationFunc(hydraulicBoundaryLocation));
+                return new DesignWaterLevelLocationContext(GetCalculationFunc(hydraulicBoundaryLocation));
             }
 
             return null;
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.cs
===================================================================
diff -u -r844d3c1ab299cf909c27616c1932e9f64c252c68 -r1f7f79eaf55689da4a8921bb7f15960a2fff9ab7
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.cs	(.../WaveHeightLocationsView.cs)	(revision 844d3c1ab299cf909c27616c1932e9f64c252c68)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.cs	(.../WaveHeightLocationsView.cs)	(revision 1f7f79eaf55689da4a8921bb7f15960a2fff9ab7)
@@ -80,7 +80,7 @@
             {
                 HydraulicBoundaryLocation hydraulicBoundaryLocation = ((HydraulicBoundaryLocationRow) currentRow.DataBoundItem).CalculatableObject;
 
-                return new WaveHeightLocationContext(hydraulicBoundaryLocation, GetCalculationFunc(hydraulicBoundaryLocation));
+                return new WaveHeightLocationContext(GetCalculationFunc(hydraulicBoundaryLocation));
             }
 
             return null;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/DesignWaterLevelLocationContextTest.cs
===================================================================
diff -u -r4dfedddc797825c49f4ca459dc38be7bc9978ccb -r1f7f79eaf55689da4a8921bb7f15960a2fff9ab7
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/DesignWaterLevelLocationContextTest.cs	(.../DesignWaterLevelLocationContextTest.cs)	(revision 4dfedddc797825c49f4ca459dc38be7bc9978ccb)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/DesignWaterLevelLocationContextTest.cs	(.../DesignWaterLevelLocationContextTest.cs)	(revision 1f7f79eaf55689da4a8921bb7f15960a2fff9ab7)
@@ -21,6 +21,7 @@
 
 using NUnit.Framework;
 using Ringtoets.Common.Data.Hydraulics;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Integration.Forms.PresentationObjects;
 
 namespace Ringtoets.Integration.Forms.Test.PresentationObjects
@@ -32,11 +33,10 @@
         public void Constructor_ValidParameters_ExpectedValues()
         {
             // Setup
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 2.0, 3.0);
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation);
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
 
             // Call
-            var presentationObject = new DesignWaterLevelLocationContext(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation);
+            var presentationObject = new DesignWaterLevelLocationContext(hydraulicBoundaryLocationCalculation);
 
             // Assert
             Assert.IsInstanceOf<HydraulicBoundaryLocationContext>(presentationObject);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/WaveHeightLocationContextTest.cs
===================================================================
diff -u -r4dfedddc797825c49f4ca459dc38be7bc9978ccb -r1f7f79eaf55689da4a8921bb7f15960a2fff9ab7
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/WaveHeightLocationContextTest.cs	(.../WaveHeightLocationContextTest.cs)	(revision 4dfedddc797825c49f4ca459dc38be7bc9978ccb)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PresentationObjects/WaveHeightLocationContextTest.cs	(.../WaveHeightLocationContextTest.cs)	(revision 1f7f79eaf55689da4a8921bb7f15960a2fff9ab7)
@@ -21,6 +21,7 @@
 
 using NUnit.Framework;
 using Ringtoets.Common.Data.Hydraulics;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Integration.Forms.PresentationObjects;
 
 namespace Ringtoets.Integration.Forms.Test.PresentationObjects
@@ -32,11 +33,10 @@
         public void Constructor_ValidParameters_ExpectedValues()
         {
             // Setup
-            var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 2.0, 3.0);
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation);
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
 
             // Call
-            var presentationObject = new WaveHeightLocationContext(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation);
+            var presentationObject = new WaveHeightLocationContext(hydraulicBoundaryLocationCalculation);
 
             // Assert
             Assert.IsInstanceOf<HydraulicBoundaryLocationContext>(presentationObject);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -r7391d0059873c428ac191f830840d08a47d67393 -r1f7f79eaf55689da4a8921bb7f15960a2fff9ab7
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision 7391d0059873c428ac191f830840d08a47d67393)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision 1f7f79eaf55689da4a8921bb7f15960a2fff9ab7)
@@ -677,7 +677,7 @@
             {
                 HydraulicBoundaryLocation hydraulicBoundaryLocation = ((HydraulicBoundaryLocationRow) selectedRowObject).CalculatableObject;
 
-                return new DesignWaterLevelLocationContext(hydraulicBoundaryLocation, GetCalculationForLocation(hydraulicBoundaryLocation));
+                return new DesignWaterLevelLocationContext(GetCalculationForLocation(hydraulicBoundaryLocation));
             }
 
             protected override LocationsView<HydraulicBoundaryLocation> ShowFullyConfiguredLocationsView(Form form)
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs
===================================================================
diff -u -r9c0ef646a1938dcab474ec22c94a08d597fdbcf8 -r1f7f79eaf55689da4a8921bb7f15960a2fff9ab7
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision 9c0ef646a1938dcab474ec22c94a08d597fdbcf8)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision 1f7f79eaf55689da4a8921bb7f15960a2fff9ab7)
@@ -677,7 +677,7 @@
             {
                 HydraulicBoundaryLocation hydraulicBoundaryLocation = ((HydraulicBoundaryLocationRow) selectedRowObject).CalculatableObject;
 
-                return new WaveHeightLocationContext(hydraulicBoundaryLocation, GetCalculationForLocation(hydraulicBoundaryLocation));
+                return new WaveHeightLocationContext(GetCalculationForLocation(hydraulicBoundaryLocation));
             }
 
             protected override LocationsView<HydraulicBoundaryLocation> ShowFullyConfiguredLocationsView(Form form)
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelLocationContextPropertyInfoTest.cs
===================================================================
diff -u -r63ca446f378484b5dc555b2db50b77f8ff94fa7b -r1f7f79eaf55689da4a8921bb7f15960a2fff9ab7
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelLocationContextPropertyInfoTest.cs	(.../DesignWaterLevelLocationContextPropertyInfoTest.cs)	(revision 63ca446f378484b5dc555b2db50b77f8ff94fa7b)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelLocationContextPropertyInfoTest.cs	(.../DesignWaterLevelLocationContextPropertyInfoTest.cs)	(revision 1f7f79eaf55689da4a8921bb7f15960a2fff9ab7)
@@ -55,14 +55,12 @@
         {
             // Setup
             double designWaterLevel = new Random().NextDouble();
-            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation())
             {
                 Output = new TestHydraulicBoundaryLocationOutput(designWaterLevel)
             };
 
-            var context = new DesignWaterLevelLocationContext(hydraulicBoundaryLocation,
-                                                              hydraulicBoundaryLocationCalculation);
+            var context = new DesignWaterLevelLocationContext(hydraulicBoundaryLocationCalculation);
 
             using (var plugin = new RingtoetsPlugin())
             {
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/WaveHeightLocationContextPropertyInfoTest.cs
===================================================================
diff -u -r8b256e4113bff0cf82676406410bfa6347d27629 -r1f7f79eaf55689da4a8921bb7f15960a2fff9ab7
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/WaveHeightLocationContextPropertyInfoTest.cs	(.../WaveHeightLocationContextPropertyInfoTest.cs)	(revision 8b256e4113bff0cf82676406410bfa6347d27629)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/WaveHeightLocationContextPropertyInfoTest.cs	(.../WaveHeightLocationContextPropertyInfoTest.cs)	(revision 1f7f79eaf55689da4a8921bb7f15960a2fff9ab7)
@@ -55,14 +55,12 @@
         {
             // Setup
             double waveHeight = new Random().NextDouble();
-            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation())
             {
                 Output = new TestHydraulicBoundaryLocationOutput(waveHeight)
             };
 
-            var context = new WaveHeightLocationContext(hydraulicBoundaryLocation,
-                                                        hydraulicBoundaryLocationCalculation);
+            var context = new WaveHeightLocationContext(hydraulicBoundaryLocationCalculation);
 
             using (var plugin = new RingtoetsPlugin())
             {