Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -r7c8a0a5a12eacb750f96b03c6f01248fa4bc43b7 -raa9bd8cb8d845786765b7a59be9c9c29488ae598
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision 7c8a0a5a12eacb750f96b03c6f01248fa4bc43b7)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision aa9bd8cb8d845786765b7a59be9c9c29488ae598)
@@ -157,7 +157,7 @@
                                                                                                           context.AssessmentSection,
                                                                                                           () => context.AssessmentSection.FailureMechanismContribution.Norm),
                 AfterCreate = (view, context) => { view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService; },
-                CloseForData = CloseDesignWaterLevelCalculationsViewForData
+                CloseForData = (view, data) => CloseHydraulicBoundaryCalculationsViewForData(view.AssessmentSection, data)
             };
 
             yield return new ViewInfo<
@@ -167,13 +167,13 @@
             {
                 GetViewName = (view, context) => RingtoetsGrassCoverErosionOutwardsFormsResources.GrassCoverErosionOutwardsWaveHeightCalculationsContext_DisplayName,
                 GetViewData = context => context.WrappedData,
-                CloseForData = CloseGrassCoverErosionOutwardsCalculationsViewForData,
                 Image = RingtoetsCommonFormsResources.GenericInputOutputIcon,
                 CreateInstance = context => new GrassCoverErosionOutwardsWaveHeightCalculationsView(context.WrappedData,
                                                                                                     context.FailureMechanism,
                                                                                                     context.AssessmentSection,
                                                                                                     () => context.AssessmentSection.FailureMechanismContribution.Norm),
-                AfterCreate = (view, context) => { view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService; }
+                AfterCreate = (view, context) => { view.CalculationGuiService = hydraulicBoundaryLocationCalculationGuiService; },
+                CloseForData = (view, data) => CloseHydraulicBoundaryCalculationsViewForData(view.AssessmentSection, data)
             };
         }
 
@@ -387,24 +387,6 @@
 
         #endregion
 
-        #region GrassCoverErosionOutwardsWaveHeightCalculationsView
-
-        private static bool CloseGrassCoverErosionOutwardsCalculationsViewForData(GrassCoverErosionOutwardsWaveHeightCalculationsView view, object dataToCloseFor)
-        {
-            return CloseHydraulicBoundaryCalculationsViewForData(view.AssessmentSection, dataToCloseFor);
-        }
-
-        #endregion
-
-        #region GrassCoverErosionOutwardsDesignWaterLevelCalculationsView
-
-        private static bool CloseDesignWaterLevelCalculationsViewForData(GrassCoverErosionOutwardsDesignWaterLevelCalculationsView view, object dataToCloseFor)
-        {
-            return CloseHydraulicBoundaryCalculationsViewForData(view.AssessmentSection, dataToCloseFor);
-        }
-
-        #endregion
-
         private static bool CloseHydraulicBoundaryCalculationsViewForData(IAssessmentSection viewAssessmentSection,
                                                                           object dataToCloseFor)
         {
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationContextPropertyInfoTest.cs
===================================================================
diff -u -rd4d9e097b083b08da6a704c849aeda702ff76a53 -raa9bd8cb8d845786765b7a59be9c9c29488ae598
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationContextPropertyInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationContextPropertyInfoTest.cs)	(revision d4d9e097b083b08da6a704c849aeda702ff76a53)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationContextPropertyInfoTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationContextPropertyInfoTest.cs)	(revision aa9bd8cb8d845786765b7a59be9c9c29488ae598)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.Linq;
 using Core.Common.Gui.Plugin;
 using Core.Common.Gui.PropertyBag;
@@ -53,11 +52,7 @@
         public void CreateInstance_WithContext_SetsDataCorrectly()
         {
             // Setup
-            double designWaterLevel = new Random().NextDouble();
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation())
-            {
-                Output = new TestHydraulicBoundaryLocationOutput(designWaterLevel)
-            };
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
 
             var context = new GrassCoverErosionOutwardsDesignWaterLevelCalculationContext(hydraulicBoundaryLocationCalculation);
 
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsWaveHeightCalculationContextPropertyInfoTest.cs
===================================================================
diff -u -rd4d9e097b083b08da6a704c849aeda702ff76a53 -raa9bd8cb8d845786765b7a59be9c9c29488ae598
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsWaveHeightCalculationContextPropertyInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationContextPropertyInfoTest.cs)	(revision d4d9e097b083b08da6a704c849aeda702ff76a53)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsWaveHeightCalculationContextPropertyInfoTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationContextPropertyInfoTest.cs)	(revision aa9bd8cb8d845786765b7a59be9c9c29488ae598)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.Linq;
 using Core.Common.Gui.Plugin;
 using Core.Common.Gui.PropertyBag;
@@ -53,11 +52,7 @@
         public void CreateInstance_WithContext_SetsDataCorrectly()
         {
             // Setup
-            double waveHeight = new Random().NextDouble();
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation())
-            {
-                Output = new TestHydraulicBoundaryLocationOutput(waveHeight)
-            };
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
 
             var context = new GrassCoverErosionOutwardsWaveHeightCalculationContext(hydraulicBoundaryLocationCalculation);
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelCalculationContextPropertyInfoTest.cs
===================================================================
diff -u -rd4d9e097b083b08da6a704c849aeda702ff76a53 -raa9bd8cb8d845786765b7a59be9c9c29488ae598
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelCalculationContextPropertyInfoTest.cs	(.../DesignWaterLevelCalculationContextPropertyInfoTest.cs)	(revision d4d9e097b083b08da6a704c849aeda702ff76a53)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelCalculationContextPropertyInfoTest.cs	(.../DesignWaterLevelCalculationContextPropertyInfoTest.cs)	(revision aa9bd8cb8d845786765b7a59be9c9c29488ae598)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.Linq;
 using Core.Common.Gui.Plugin;
 using Core.Common.Gui.PropertyBag;
@@ -53,11 +52,7 @@
         public void CreateInstance_WithContext_SetsDataCorrectly()
         {
             // Setup
-            double designWaterLevel = new Random().NextDouble();
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation())
-            {
-                Output = new TestHydraulicBoundaryLocationOutput(designWaterLevel)
-            };
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
 
             var context = new DesignWaterLevelCalculationContext(hydraulicBoundaryLocationCalculation);
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelCalculationsContextPropertyInfoTest.cs
===================================================================
diff -u -r59a82ae3063f2dda858cc5cf43e25c224856d88d -raa9bd8cb8d845786765b7a59be9c9c29488ae598
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelCalculationsContextPropertyInfoTest.cs	(.../DesignWaterLevelCalculationsContextPropertyInfoTest.cs)	(revision 59a82ae3063f2dda858cc5cf43e25c224856d88d)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelCalculationsContextPropertyInfoTest.cs	(.../DesignWaterLevelCalculationsContextPropertyInfoTest.cs)	(revision aa9bd8cb8d845786765b7a59be9c9c29488ae598)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.Linq;
 using Core.Common.Base;
 using Core.Common.Gui.Plugin;
@@ -28,7 +27,6 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Hydraulics;
-using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Integration.Forms.PresentationObjects;
 using Ringtoets.Integration.Forms.PropertyClasses;
 
@@ -60,20 +58,8 @@
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             mockRepository.ReplayAll();
 
-            var random = new Random();
+            var hydraulicBoundaryLocationCalculations = new ObservableList<HydraulicBoundaryLocationCalculation>();
 
-            var hydraulicBoundaryLocationCalculations = new ObservableList<HydraulicBoundaryLocationCalculation>
-            {
-                new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation())
-                {
-                    Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble())
-                },
-                new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation())
-                {
-                    Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble())
-                }
-            };
-
             var context = new DesignWaterLevelCalculationsContext(hydraulicBoundaryLocationCalculations,
                                                                   assessmentSection,
                                                                   () => 0.01,
@@ -89,8 +75,6 @@
                 // Assert
                 Assert.IsInstanceOf<DesignWaterLevelCalculationsProperties>(objectProperties);
                 Assert.AreSame(hydraulicBoundaryLocationCalculations, objectProperties.Data);
-                DesignWaterLevelCalculationProperties[] calculationProperties = ((DesignWaterLevelCalculationsProperties) objectProperties).Calculations;
-                CollectionAssert.AreEqual(hydraulicBoundaryLocationCalculations, calculationProperties.Select(p => p.Data));
             }
 
             mockRepository.VerifyAll();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/WaveHeightCalculationContextPropertyInfoTest.cs
===================================================================
diff -u -rd4d9e097b083b08da6a704c849aeda702ff76a53 -raa9bd8cb8d845786765b7a59be9c9c29488ae598
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/WaveHeightCalculationContextPropertyInfoTest.cs	(.../WaveHeightCalculationContextPropertyInfoTest.cs)	(revision d4d9e097b083b08da6a704c849aeda702ff76a53)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/WaveHeightCalculationContextPropertyInfoTest.cs	(.../WaveHeightCalculationContextPropertyInfoTest.cs)	(revision aa9bd8cb8d845786765b7a59be9c9c29488ae598)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.Linq;
 using Core.Common.Gui.Plugin;
 using Core.Common.Gui.PropertyBag;
@@ -53,11 +52,7 @@
         public void CreateInstance_WithContext_SetsDataCorrectly()
         {
             // Setup
-            double waveHeight = new Random().NextDouble();
-            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation())
-            {
-                Output = new TestHydraulicBoundaryLocationOutput(waveHeight)
-            };
+            var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation());
 
             var context = new WaveHeightCalculationContext(hydraulicBoundaryLocationCalculation);
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/WaveHeightCalculationsContextPropertyInfoTest.cs
===================================================================
diff -u -r466a02f3ba52351117297fcc1ea2d4242ab92b39 -raa9bd8cb8d845786765b7a59be9c9c29488ae598
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/WaveHeightCalculationsContextPropertyInfoTest.cs	(.../WaveHeightCalculationsContextPropertyInfoTest.cs)	(revision 466a02f3ba52351117297fcc1ea2d4242ab92b39)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/WaveHeightCalculationsContextPropertyInfoTest.cs	(.../WaveHeightCalculationsContextPropertyInfoTest.cs)	(revision aa9bd8cb8d845786765b7a59be9c9c29488ae598)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.Linq;
 using Core.Common.Base;
 using Core.Common.Gui.Plugin;
@@ -28,7 +27,6 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Hydraulics;
-using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Integration.Forms.PresentationObjects;
 using Ringtoets.Integration.Forms.PropertyClasses;
 
@@ -60,20 +58,8 @@
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             mockRepository.ReplayAll();
 
-            var random = new Random();
+            var hydraulicBoundaryLocationCalculations = new ObservableList<HydraulicBoundaryLocationCalculation>();
 
-            var hydraulicBoundaryLocationCalculations = new ObservableList<HydraulicBoundaryLocationCalculation>
-            {
-                new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation())
-                {
-                    Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble())
-                },
-                new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation())
-                {
-                    Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble())
-                }
-            };
-
             var context = new WaveHeightCalculationsContext(hydraulicBoundaryLocationCalculations,
                                                             assessmentSection,
                                                             () => 0.01,
@@ -89,8 +75,6 @@
                 // Assert
                 Assert.IsInstanceOf<WaveHeightCalculationsProperties>(objectProperties);
                 Assert.AreSame(hydraulicBoundaryLocationCalculations, objectProperties.Data);
-                WaveHeightCalculationProperties[] calculationProperties = ((WaveHeightCalculationsProperties) objectProperties).Calculations;
-                CollectionAssert.AreEqual(hydraulicBoundaryLocationCalculations, calculationProperties.Select(p => p.Data));
             }
 
             mockRepository.VerifyAll();