Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationsView.cs
===================================================================
diff -u -r3ec1b0d4ff7f42b7dbdd0b15fb17e80886e6cfd6 -r1b32dabaee890a050a41c37eb5ddb7681b5d04a0
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationsView.cs	(.../HydraulicBoundaryLocationsView.cs)	(revision 3ec1b0d4ff7f42b7dbdd0b15fb17e80886e6cfd6)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationsView.cs	(.../HydraulicBoundaryLocationsView.cs)	(revision 1b32dabaee890a050a41c37eb5ddb7681b5d04a0)
@@ -38,12 +38,12 @@
     /// </summary>
     public abstract partial class HydraulicBoundaryLocationsView : LocationsView<HydraulicBoundaryLocation>
     {
+        protected readonly Func<HydraulicBoundaryLocation, HydraulicBoundaryLocationCalculation> getCalculationFunc;
+
         private readonly ObservableList<HydraulicBoundaryLocation> locations;
         private readonly Observer hydraulicBoundaryLocationsObserver;
         private readonly RecursiveObserver<ObservableList<HydraulicBoundaryLocation>, HydraulicBoundaryLocation> hydraulicBoundaryLocationObserver;
 
-        protected readonly Func<HydraulicBoundaryLocation, HydraulicBoundaryLocationCalculation> getCalculationFunc;
-
         /// <summary>
         /// Creates a new instance of <see cref="HydraulicBoundaryLocationsView"/>.
         /// </summary>
@@ -87,6 +87,11 @@
 
         public override object Data { get; set; }
 
+        /// <summary>
+        /// Gets or sets the <see cref="IHydraulicBoundaryLocationCalculationGuiService"/>.
+        /// </summary>
+        public IHydraulicBoundaryLocationCalculationGuiService CalculationGuiService { get; set; }
+
         protected override void Dispose(bool disposing)
         {
             hydraulicBoundaryLocationsObserver.Dispose();
@@ -95,11 +100,6 @@
             base.Dispose(disposing);
         }
 
-        /// <summary>
-        /// Gets or sets the <see cref="IHydraulicBoundaryLocationCalculationGuiService"/>.
-        /// </summary>
-        public IHydraulicBoundaryLocationCalculationGuiService CalculationGuiService { get; set; }
-
         protected override void InitializeDataGridView()
         {
             base.InitializeDataGridView();
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs
===================================================================
diff -u -rb3bd3e50716cae539be438773246e2c8c32dafd8 -r1b32dabaee890a050a41c37eb5ddb7681b5d04a0
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs	(.../DesignWaterLevelLocationsView.cs)	(revision b3bd3e50716cae539be438773246e2c8c32dafd8)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs	(.../DesignWaterLevelLocationsView.cs)	(revision 1b32dabaee890a050a41c37eb5ddb7681b5d04a0)
@@ -39,7 +39,6 @@
     {
         private readonly Func<double> getNormFunc;
         private readonly DesignWaterLevelCalculationMessageProvider messageProvider;
-        private readonly Func<HydraulicBoundaryLocation, HydraulicBoundaryLocationCalculation> getCalculationFunc;
 
         /// <summary>
         /// Creates a new instance of <see cref="DesignWaterLevelLocationsView"/>.
@@ -54,13 +53,8 @@
                                              Func<HydraulicBoundaryLocation, HydraulicBoundaryLocationCalculation> getCalculationFunc,
                                              IAssessmentSection assessmentSection,
                                              Func<double> getNormFunc)
-            : base(locations, assessmentSection)
+            : base(locations, getCalculationFunc, assessmentSection)
         {
-            if (getCalculationFunc == null)
-            {
-                throw new ArgumentNullException(nameof(getCalculationFunc));
-            }
-
             if (getNormFunc == null)
             {
                 throw new ArgumentNullException(nameof(getNormFunc));
@@ -70,7 +64,6 @@
 
             messageProvider = new DesignWaterLevelCalculationMessageProvider();
 
-            this.getCalculationFunc = getCalculationFunc;
             this.getNormFunc = getNormFunc;
         }
 
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.cs
===================================================================
diff -u -rf1b30ca9c0be59c482dbc76b59815095efa81e51 -r1b32dabaee890a050a41c37eb5ddb7681b5d04a0
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.cs	(.../WaveHeightLocationsView.cs)	(revision f1b30ca9c0be59c482dbc76b59815095efa81e51)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.cs	(.../WaveHeightLocationsView.cs)	(revision 1b32dabaee890a050a41c37eb5ddb7681b5d04a0)
@@ -39,7 +39,6 @@
     {
         private readonly Func<double> getNormFunc;
         private readonly WaveHeightCalculationMessageProvider messageProvider;
-        private readonly Func<HydraulicBoundaryLocation, HydraulicBoundaryLocationCalculation> getCalculationFunc;
 
         /// <summary>
         /// Creates a new instance of <see cref="WaveHeightLocationsView"/>.
@@ -54,13 +53,8 @@
                                        Func<HydraulicBoundaryLocation, HydraulicBoundaryLocationCalculation> getCalculationFunc,
                                        IAssessmentSection assessmentSection,
                                        Func<double> getNormFunc)
-            : base(locations, assessmentSection)
+            : base(locations, getCalculationFunc, assessmentSection)
         {
-            if (getCalculationFunc == null)
-            {
-                throw new ArgumentNullException(nameof(getCalculationFunc));
-            }
-
             if (getNormFunc == null)
             {
                 throw new ArgumentNullException(nameof(getNormFunc));
@@ -70,7 +64,6 @@
 
             messageProvider = new WaveHeightCalculationMessageProvider();
 
-            this.getCalculationFunc = getCalculationFunc;
             this.getNormFunc = getNormFunc;
         }
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -rdc29cedbc45824cf39bdc0814958f17b572d4577 -r1b32dabaee890a050a41c37eb5ddb7681b5d04a0
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision dc29cedbc45824cf39bdc0814958f17b572d4577)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision 1b32dabaee890a050a41c37eb5ddb7681b5d04a0)
@@ -73,24 +73,6 @@
         }
 
         [Test]
-        public void Constructor_GetCalculationFuncNull_ThrowsArgumentNullException()
-        {
-            // Setup
-            IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(mockRepository);
-            mockRepository.ReplayAll();
-
-            // Call
-            TestDelegate test = () => new DesignWaterLevelLocationsView(new ObservableList<HydraulicBoundaryLocation>(),
-                                                                        null,
-                                                                        assessmentSection,
-                                                                        () => 0.01);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(test);
-            Assert.AreEqual("getCalculationFunc", exception.ParamName);
-        }
-
-        [Test]
         public void Constructor_GetNormFuncNull_ThrowsArgumentNullException()
         {
             // Setup
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs
===================================================================
diff -u -rdc29cedbc45824cf39bdc0814958f17b572d4577 -r1b32dabaee890a050a41c37eb5ddb7681b5d04a0
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision dc29cedbc45824cf39bdc0814958f17b572d4577)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision 1b32dabaee890a050a41c37eb5ddb7681b5d04a0)
@@ -73,24 +73,6 @@
         }
 
         [Test]
-        public void Constructor_GetCalculationFuncNull_ThrowsArgumentNullException()
-        {
-            // Setup
-            IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(mockRepository);
-            mockRepository.ReplayAll();
-
-            // Call
-            TestDelegate test = () => new WaveHeightLocationsView(new ObservableList<HydraulicBoundaryLocation>(),
-                                                                  null,
-                                                                  assessmentSection,
-                                                                  () => 0.01);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(test);
-            Assert.AreEqual("getCalculationFunc", exception.ParamName);
-        }
-
-        [Test]
         public void Constructor_GetNormFuncNull_ThrowsArgumentNullException()
         {
             // Setup