Index: Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocation.cs
===================================================================
diff -u -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c -rf2ebd2cc0a13778b6a79feb1d5082c48de1a73cd
--- Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocation.cs	(.../HydraulicBoundaryLocation.cs)	(revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocation.cs	(.../HydraulicBoundaryLocation.cs)	(revision f2ebd2cc0a13778b6a79feb1d5082c48de1a73cd)
@@ -137,17 +137,6 @@
         /// </summary>
         public HydraulicBoundaryLocationCalculation WaveHeightCalculation4 { get; }
 
-        /// <summary>
-        /// Gets the wave height of the hydraulic boundary location.
-        /// </summary>
-        public RoundedDouble WaveHeight
-        {
-            get
-            {
-                return WaveHeightCalculation1.Output?.Result ?? RoundedDouble.NaN;
-            }
-        }
-
         #endregion
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationsPropertiesTest.cs
===================================================================
diff -u -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c -rf2ebd2cc0a13778b6a79feb1d5082c48de1a73cd
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationsPropertiesTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsPropertiesTest.cs)	(revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelLocationsPropertiesTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsPropertiesTest.cs)	(revision f2ebd2cc0a13778b6a79feb1d5082c48de1a73cd)
@@ -22,6 +22,7 @@
 using System;
 using System.ComponentModel;
 using Core.Common.Base;
+using Core.Common.Base.Data;
 using Core.Common.Gui.Converters;
 using Core.Common.Gui.PropertyBag;
 using Core.Common.TestUtil;
@@ -105,7 +106,10 @@
             Assert.AreEqual(location.Name, locationProperties.Name);
             Assert.AreEqual(location.Id, locationProperties.Id);
             Assert.AreEqual(location.Location, locationProperties.Location);
-            Assert.AreEqual(location.DesignWaterLevel, locationProperties.DesignWaterLevel, location.DesignWaterLevel.GetAccuracy());
+
+            RoundedDouble designWaterLevel = location.DesignWaterLevelCalculation1.Output.Result;
+            Assert.AreEqual(designWaterLevel, locationProperties.DesignWaterLevel, designWaterLevel.GetAccuracy());
+
             Assert.AreEqual("Ja", locationProperties.Convergence);
         }
     }
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c -rf2ebd2cc0a13778b6a79feb1d5082c48de1a73cd
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs)	(revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs)	(revision f2ebd2cc0a13778b6a79feb1d5082c48de1a73cd)
@@ -245,6 +245,7 @@
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
             Assert.AreEqual(5, rows.Count);
 
+            const double designWaterLevel = 10.23;
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(10, "10", 10.0, 10.0)
             {
                 DesignWaterLevelCalculation1 =
@@ -253,7 +254,7 @@
                     {
                         ShouldIllustrationPointsBeCalculated = true
                     },
-                    Output = new TestHydraulicBoundaryLocationOutput(10.23)
+                    Output = new TestHydraulicBoundaryLocationOutput(designWaterLevel)
                 }
             };
 
@@ -272,7 +273,7 @@
             Assert.AreEqual("10", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("10", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(10, 10).ToString(), cells[locationColumnIndex].FormattedValue);
-            Assert.AreEqual(hydraulicBoundaryLocation.DesignWaterLevel, cells[locationDesignWaterlevelColumnIndex].Value);
+            Assert.AreEqual(designWaterLevel, cells[locationDesignWaterlevelColumnIndex].Value);
             Assert.AreNotSame(dataGridViewSource, locationsDataGridView.DataSource);
             Assert.IsFalse((bool) rows[0].Cells[locationCalculateColumnIndex].Value);
         }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationsPropertiesTest.cs
===================================================================
diff -u -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c -rf2ebd2cc0a13778b6a79feb1d5082c48de1a73cd
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationsPropertiesTest.cs	(.../DesignWaterLevelLocationsPropertiesTest.cs)	(revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationsPropertiesTest.cs	(.../DesignWaterLevelLocationsPropertiesTest.cs)	(revision f2ebd2cc0a13778b6a79feb1d5082c48de1a73cd)
@@ -23,6 +23,7 @@
 using System.ComponentModel;
 using System.Linq;
 using Core.Common.Base;
+using Core.Common.Base.Data;
 using Core.Common.Gui.Converters;
 using Core.Common.TestUtil;
 using NUnit.Framework;
@@ -91,7 +92,9 @@
             Assert.AreEqual(location.Name, designWaterLevelLocationProperties.Name);
             Assert.AreEqual(location.Id, designWaterLevelLocationProperties.Id);
             Assert.AreEqual(location.Location, designWaterLevelLocationProperties.Location);
-            Assert.AreEqual(location.DesignWaterLevel, designWaterLevelLocationProperties.DesignWaterLevel, location.DesignWaterLevel.GetAccuracy());
+
+            RoundedDouble designWaterLevel = location.DesignWaterLevelCalculation1.Output.Result;
+            Assert.AreEqual(designWaterLevel, designWaterLevelLocationProperties.DesignWaterLevel, designWaterLevel.GetAccuracy());
         }
 
         [Test]