Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs
===================================================================
diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -r533cfb6b8d9c3e198204d1c6ee022b79049e6d43
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision e182f6f394aa75e739467a77e7bcacd9a8b25429)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision 533cfb6b8d9c3e198204d1c6ee022b79049e6d43)
@@ -24,7 +24,6 @@
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Base;
-using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
@@ -34,6 +33,7 @@
 using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Hydraulics;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.GuiServices;
 using Ringtoets.Common.Forms.Views;
 using Ringtoets.Integration.Forms.PresentationObjects;
@@ -182,7 +182,7 @@
             HydraulicBoundaryDatabase newHydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(10, "10", 10.0, 10.0)
             {
-                WaveHeight = (RoundedDouble) 10.23
+                WaveHeightOutput = new TestHydraulicBoundaryLocationOutput(10.23)
             };
             newHydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation);
 
@@ -222,7 +222,7 @@
             Assert.AreEqual("-", rows[2].Cells[locationWaveHeightColumnIndex].FormattedValue);
 
             // Call
-            assessmentSection.HydraulicBoundaryDatabase.Locations.ForEach(loc => loc.WaveHeight = RoundedDouble.NaN);
+            assessmentSection.HydraulicBoundaryDatabase.Locations.ForEach(loc => loc.WaveHeightOutput = null);
             assessmentSection.NotifyObservers();
 
             // Assert
@@ -307,7 +307,7 @@
         {
             var view = ShowWaveHeightLocationsView();
 
-            var assessmentSection = new TestAssessmentSection()
+            var assessmentSection = new TestAssessmentSection
             {
                 HydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase()
             };
@@ -347,11 +347,11 @@
                 Locations.Add(new HydraulicBoundaryLocation(1, "1", 1.0, 1.0));
                 Locations.Add(new HydraulicBoundaryLocation(2, "2", 2.0, 2.0)
                 {
-                    WaveHeight = (RoundedDouble) 1.23
+                    WaveHeightOutput = new TestHydraulicBoundaryLocationOutput(1.23)
                 });
                 Locations.Add(new HydraulicBoundaryLocation(3, "3", 3.0, 3.0)
                 {
-                    DesignWaterLevel = (RoundedDouble) 2.45
+                    DesignWaterLevelOutput = new TestHydraulicBoundaryLocationOutput(2.45)
                 });
             }
         }