Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsWaveConditionsInputContextPropertyInfoTest.cs
===================================================================
diff -u -rfcd32c8e949b4581cc20adcaa7cf7639fcb69d20 -rcdc0b636945b1939763c78df1e55e3f207f42a94
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsWaveConditionsInputContextPropertyInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertyInfoTest.cs)	(revision fcd32c8e949b4581cc20adcaa7cf7639fcb69d20)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsWaveConditionsInputContextPropertyInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertyInfoTest.cs)	(revision cdc0b636945b1939763c78df1e55e3f207f42a94)
@@ -23,6 +23,7 @@
 using Core.Common.Gui.Plugin;
 using Core.Common.Gui.PropertyBag;
 using NUnit.Framework;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PropertyClasses;
@@ -53,9 +54,11 @@
             // Setup
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
             var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation();
+            var assessmentSection = new ObservableTestAssessmentSectionStub();
             var context = new GrassCoverErosionOutwardsWaveConditionsInputContext(
                 calculation.InputParameters,
                 calculation,
+                assessmentSection,
                 failureMechanism);
 
             using (var plugin = new GrassCoverErosionOutwardsPlugin())
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs
===================================================================
diff -u -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c -rcdc0b636945b1939763c78df1e55e3f207f42a94
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs	(.../WaveConditionsInputTest.cs)	(revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs	(.../WaveConditionsInputTest.cs)	(revision cdc0b636945b1939763c78df1e55e3f207f42a94)
@@ -123,8 +123,6 @@
             Assert.AreEqual(2, input.Orientation.NumberOfDecimalPlaces);
             Assert.IsNaN(input.AssessmentLevel.Value);
             Assert.AreEqual(2, input.AssessmentLevel.NumberOfDecimalPlaces);
-            Assert.IsNaN(input.UpperBoundaryDesignWaterLevel.Value);
-            Assert.AreEqual(2, input.UpperBoundaryDesignWaterLevel.NumberOfDecimalPlaces);
             Assert.IsNaN(input.LowerBoundaryRevetment.Value);
             Assert.AreEqual(2, input.LowerBoundaryRevetment.NumberOfDecimalPlaces);
             Assert.IsNaN(input.UpperBoundaryRevetment.Value);
@@ -138,39 +136,6 @@
         }
 
         [Test]
-        public void HydraulicBoundaryLocation_SetNewValue_AssessmentLevelAndUpperBoundaryDesignWaterLevelExpectedValue()
-        {
-            // Setup
-            var input = new WaveConditionsInput();
-            const double assessmentLevel = 3.2;
-
-            // Call
-            input.HydraulicBoundaryLocation = TestHydraulicBoundaryLocation.CreateDesignWaterLevelCalculated(assessmentLevel);
-
-            // Assert
-            Assert.AreEqual(assessmentLevel, input.AssessmentLevel.Value, input.UpperBoundaryDesignWaterLevel.GetAccuracy());
-            Assert.AreEqual(assessmentLevel - 0.01, input.UpperBoundaryDesignWaterLevel.Value, input.UpperBoundaryDesignWaterLevel.GetAccuracy());
-        }
-
-        [Test]
-        public void HydraulicBoundaryLocation_SetNullValue_AssessmentLevelAndUpperBoundaryDesignWaterLevelNaN()
-        {
-            // Setup
-            const double assessmentLevel = 3.2;
-            var input = new WaveConditionsInput
-            {
-                HydraulicBoundaryLocation = TestHydraulicBoundaryLocation.CreateDesignWaterLevelCalculated(assessmentLevel)
-            };
-
-            // Call
-            input.HydraulicBoundaryLocation = null;
-
-            // Assert
-            Assert.IsNaN(input.AssessmentLevel.Value);
-            Assert.IsNaN(input.UpperBoundaryDesignWaterLevel.Value);
-        }
-
-        [Test]
         [Combinatorial]
         public void ForeshoreProfile_SetNewValue_InputSyncedAccordingly(
             [Values(true, false)] bool withBreakWater,
@@ -434,52 +399,6 @@
         }
 
         [Test]
-        public void UpperBoundaryDesignWaterLevel_NoHydraulicBoundaryLocation_ReturnNaN()
-        {
-            // Setup
-            var waveConditionsInput = new WaveConditionsInput();
-
-            // Call
-            waveConditionsInput.HydraulicBoundaryLocation = null;
-
-            // Assert
-            Assert.AreEqual(new RoundedDouble(2, double.NaN), waveConditionsInput.UpperBoundaryDesignWaterLevel);
-        }
-
-        [Test]
-        public void UpperBoundaryDesignWaterLevel_NoDesignWaterLevel_ReturnNaN()
-        {
-            // Setup
-            var waveConditionsInput = new WaveConditionsInput();
-
-            // Call
-            waveConditionsInput.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0);
-
-            // Assert
-            Assert.AreEqual(new RoundedDouble(2, double.NaN), waveConditionsInput.UpperBoundaryDesignWaterLevel);
-        }
-
-        [Test]
-        public void UpperBoundaryDesignWaterLevel_DesignWaterLevelSet_ReturnValueJustBelowDesignWaterLevel()
-        {
-            // Setup
-            var designWaterLevel = (RoundedDouble) 1.0;
-            var waveConditionsInput = new WaveConditionsInput();
-
-            // Call
-            waveConditionsInput.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0)
-            {
-                DesignWaterLevelCalculation1 =
-                {
-                    Output = new TestHydraulicBoundaryLocationOutput(designWaterLevel)
-                }
-            };
-
-            // Assert
-            Assert.AreEqual(new RoundedDouble(2, designWaterLevel - 0.01), waveConditionsInput.UpperBoundaryDesignWaterLevel);
-        }
-
-        [Test]
         public void LowerBoundaryRevetment_SetNewValue_ValueIsRounded()
         {
             // Setup