Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/DikeHeightAssessmentOutputCreateExtensions.cs
===================================================================
diff -u -r17d94418777b0f9fe0e6ed05553ea30cc9977e67 -r9798fd949a2e90dfe1750377f9757fc456571ed1
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/DikeHeightAssessmentOutputCreateExtensions.cs	(.../DikeHeightAssessmentOutputCreateExtensions.cs)	(revision 17d94418777b0f9fe0e6ed05553ea30cc9977e67)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/DikeHeightAssessmentOutputCreateExtensions.cs	(.../DikeHeightAssessmentOutputCreateExtensions.cs)	(revision 9798fd949a2e90dfe1750377f9757fc456571ed1)
@@ -38,9 +38,9 @@
         {
             return new GrassCoverErosionInwardsDikeHeightOutputEntity
             {
-                DikeHeight = double.IsNaN(output.Result)
+                DikeHeight = double.IsNaN(output.DikeHeight)
                                  ? (double?) null
-                                 : output.Result,
+                                 : output.DikeHeight,
                 TargetProbability = double.IsNaN(output.TargetProbability)
                                         ? (double?) null
                                         : output.TargetProbability,
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/DikeHeightAssessmentOutputCreateExtensionsTest.cs
===================================================================
diff -u -r3e43a4363fdbbeef529387ca3c86802094532813 -r9798fd949a2e90dfe1750377f9757fc456571ed1
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/DikeHeightAssessmentOutputCreateExtensionsTest.cs	(.../DikeHeightAssessmentOutputCreateExtensionsTest.cs)	(revision 3e43a4363fdbbeef529387ca3c86802094532813)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/DikeHeightAssessmentOutputCreateExtensionsTest.cs	(.../DikeHeightAssessmentOutputCreateExtensionsTest.cs)	(revision 9798fd949a2e90dfe1750377f9757fc456571ed1)
@@ -47,7 +47,7 @@
 
             // Assert
             Assert.IsNotNull(entity);
-            Assert.AreEqual(output.Result, entity.DikeHeight, output.Result.GetAccuracy());
+            Assert.AreEqual(output.DikeHeight, entity.DikeHeight, output.DikeHeight.GetAccuracy());
             Assert.AreEqual(output.TargetProbability, entity.TargetProbability);
             Assert.AreEqual(output.TargetReliability, entity.TargetReliability, output.TargetReliability.GetAccuracy());
             Assert.AreEqual(output.CalculatedProbability, entity.CalculatedProbability);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs
===================================================================
diff -u -r17d94418777b0f9fe0e6ed05553ea30cc9977e67 -r9798fd949a2e90dfe1750377f9757fc456571ed1
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs	(.../GrassCoverErosionInwardsOutputCreateExtensionsTest.cs)	(revision 17d94418777b0f9fe0e6ed05553ea30cc9977e67)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs	(.../GrassCoverErosionInwardsOutputCreateExtensionsTest.cs)	(revision 9798fd949a2e90dfe1750377f9757fc456571ed1)
@@ -62,7 +62,7 @@
             Assert.AreEqual(probabilityAssessmentOutput.RequiredReliability.Value, entity.RequiredReliability);
 
             var dikeHeightEntity = entity.GrassCoverErosionInwardsDikeHeightOutputEntities.First();
-            Assert.AreEqual(dikeHeightAssessmentOutput.Result, dikeHeightEntity.DikeHeight, dikeHeightAssessmentOutput.Result.GetAccuracy());
+            Assert.AreEqual(dikeHeightAssessmentOutput.DikeHeight, dikeHeightEntity.DikeHeight, dikeHeightAssessmentOutput.DikeHeight.GetAccuracy());
             Assert.AreEqual(dikeHeightAssessmentOutput.TargetProbability, dikeHeightEntity.TargetProbability);
             Assert.AreEqual(dikeHeightAssessmentOutput.TargetReliability, dikeHeightEntity.TargetReliability, dikeHeightAssessmentOutput.TargetReliability.GetAccuracy());
             Assert.AreEqual(dikeHeightAssessmentOutput.CalculatedProbability, dikeHeightEntity.CalculatedProbability);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -r17d94418777b0f9fe0e6ed05553ea30cc9977e67 -r9798fd949a2e90dfe1750377f9757fc456571ed1
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision 17d94418777b0f9fe0e6ed05553ea30cc9977e67)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision 9798fd949a2e90dfe1750377f9757fc456571ed1)
@@ -1490,7 +1490,7 @@
                 Assert.IsNull(actualOutput);
                 return;
             }
-            Assert.AreEqual(expectedOutput.Result, actualOutput.Result);
+            Assert.AreEqual(expectedOutput.DikeHeight, actualOutput.DikeHeight);
             Assert.AreEqual(expectedOutput.TargetProbability, actualOutput.TargetProbability);
             Assert.AreEqual(expectedOutput.TargetReliability, actualOutput.TargetReliability);
             Assert.AreEqual(expectedOutput.CalculatedProbability, actualOutput.CalculatedProbability);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsDikeHeightOutputEntityReadExtensionsTest.cs
===================================================================
diff -u -r3e43a4363fdbbeef529387ca3c86802094532813 -r9798fd949a2e90dfe1750377f9757fc456571ed1
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsDikeHeightOutputEntityReadExtensionsTest.cs	(.../GrassCoverErosionInwardsDikeHeightOutputEntityReadExtensionsTest.cs)	(revision 3e43a4363fdbbeef529387ca3c86802094532813)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsDikeHeightOutputEntityReadExtensionsTest.cs	(.../GrassCoverErosionInwardsDikeHeightOutputEntityReadExtensionsTest.cs)	(revision 9798fd949a2e90dfe1750377f9757fc456571ed1)
@@ -58,7 +58,7 @@
             DikeHeightAssessmentOutput output = entity.Read();
 
             // Assert
-            Assert.AreEqual(dikeHeight, output.Result, output.Result.GetAccuracy());
+            Assert.AreEqual(dikeHeight, output.DikeHeight, output.DikeHeight.GetAccuracy());
             Assert.AreEqual(targetProbability, output.TargetProbability);
             Assert.AreEqual(targetReliability, output.TargetReliability, output.TargetReliability.GetAccuracy());
             Assert.AreEqual(calculatedProbability, output.CalculatedProbability);
@@ -81,7 +81,7 @@
             DikeHeightAssessmentOutput output = entity.Read();
 
             // Assert
-            Assert.IsNaN(output.Result);
+            Assert.IsNaN(output.DikeHeight);
             Assert.IsNaN(output.TargetProbability);
             Assert.IsNaN(output.TargetReliability);
             Assert.IsNaN(output.CalculatedProbability);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs
===================================================================
diff -u -rc77a47325b9db59cceec393a2553af874a06f11f -r9798fd949a2e90dfe1750377f9757fc456571ed1
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs	(.../GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs)	(revision c77a47325b9db59cceec393a2553af874a06f11f)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs	(.../GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs)	(revision 9798fd949a2e90dfe1750377f9757fc456571ed1)
@@ -87,7 +87,25 @@
             Assert.IsNaN(output.ProbabilityAssessmentOutput.RequiredProbability);
             Assert.IsNaN(output.ProbabilityAssessmentOutput.Reliability.Value);
             Assert.IsNaN(output.ProbabilityAssessmentOutput.RequiredReliability.Value);
-            Assert.IsNull(output.DikeHeightAssessmentOutput);
         }
+
+        [Test]
+        public void Read_ValidEntityWithOutputEntity_ReturnGrassCoverErosionInwardsOutputWithOutput()
+        {
+            // Setup
+            var entity = new GrassCoverErosionInwardsOutputEntity
+            {
+                GrassCoverErosionInwardsDikeHeightOutputEntities =
+                {
+                    new GrassCoverErosionInwardsDikeHeightOutputEntity()
+                }
+            };
+
+            // Call
+            GrassCoverErosionInwardsOutput output = entity.Read();
+
+            // Assert
+            Assert.IsNotNull(output.DikeHeightAssessmentOutput);
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Service/RingtoetsCommonDataCalculationService.cs
===================================================================
diff -u -r4428701fa38521e07aff35c0e2058951ac7d0c93 -r9798fd949a2e90dfe1750377f9757fc456571ed1
--- Ringtoets/Common/src/Ringtoets.Common.Service/RingtoetsCommonDataCalculationService.cs	(.../RingtoetsCommonDataCalculationService.cs)	(revision 4428701fa38521e07aff35c0e2058951ac7d0c93)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/RingtoetsCommonDataCalculationService.cs	(.../RingtoetsCommonDataCalculationService.cs)	(revision 9798fd949a2e90dfe1750377f9757fc456571ed1)
@@ -27,17 +27,17 @@
 namespace Ringtoets.Common.Service
 {
     /// <summary>
-    /// Service for providing common data calculation services 
+    /// Service for providing common data calculation services.
     /// </summary>
     public static class RingtoetsCommonDataCalculationService
     {
         /// <summary>
         /// Determines whether the calculated output is converged,
-        /// based on the <paramref name="reliabilityIndex"/> and the <paramref name="norm"/>
+        /// based on the <paramref name="reliabilityIndex"/> and the <paramref name="norm"/>.
         /// </summary>
         /// <param name="reliabilityIndex">The resultant reliability index after a calculation.</param>
-        /// <param name="norm">The norm to use during the calculation.</param>
-        /// <returns><c>True</c> if the solution converged, <c>false</c> if otherwise</returns>
+        /// <param name="norm">The norm used during the calculation.</param>
+        /// <returns><c>True</c> if the solution converged, <c>false</c> if otherwise.</returns>
         public static CalculationConvergence CalculationConverged(double reliabilityIndex, double norm)
         {
             return Math.Abs(reliabilityIndex - StatisticsConverter.ProbabilityToReliability(norm)) <= 1.0e-3 ?
@@ -46,11 +46,11 @@
         }
 
         /// <summary>
-        /// Gets the reqiured probability which is needed in profile specific calculations.
+        /// Gets the required probability which is needed in profile specific calculations.
         /// </summary>
         /// <param name="norm">The assessment section norm.</param>
-        /// <param name="failureMechanismContribution">The failure mechanism contribution</param>
-        /// <param name="n">the 'N' parameter used to factor in the 'length effect'.</param>
+        /// <param name="failureMechanismContribution">The failure mechanism contribution.</param>
+        /// <param name="n">The 'N' parameter used to factor in the 'length effect'.</param>
         /// <returns>The profile specific required probability.</returns>
         /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="failureMechanismContribution"/> 
         /// or <paramref name="n"/> is not greater than 0.</exception>
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/DikeHeightAssessmentOutput.cs
===================================================================
diff -u -rd56bec747401ad6676fac64af5eef6d5fd89c47c -r9798fd949a2e90dfe1750377f9757fc456571ed1
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/DikeHeightAssessmentOutput.cs	(.../DikeHeightAssessmentOutput.cs)	(revision d56bec747401ad6676fac64af5eef6d5fd89c47c)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/DikeHeightAssessmentOutput.cs	(.../DikeHeightAssessmentOutput.cs)	(revision 9798fd949a2e90dfe1750377f9757fc456571ed1)
@@ -27,22 +27,22 @@
 namespace Ringtoets.GrassCoverErosionInwards.Data
 {
     /// <summary>
-    /// This class contains the result a dike height calculation.
+    /// This class contains the result of a dike height calculation.
     /// </summary>
     public class DikeHeightAssessmentOutput
     {
         /// <summary>
         /// Creates a new instance of <see cref="DikeHeightAssessmentOutput"/>.
         /// </summary>
-        /// <param name="result">The calculation result.</param>
+        /// <param name="dikeHeight">The calculated dike height.</param>
         /// <param name="targetProbability">The norm used during the calculation.</param>
         /// <param name="targetReliability">The reliability index used during the calculation.</param>
-        /// <param name="calculatedProbability">the calculated probability.</param>
-        /// <param name="calculatedReliability">The calculated reliability.</param>
+        /// <param name="calculatedProbability">The calculated probability.</param>
+        /// <param name="calculatedReliability">The calculated reliability index.</param>
         /// <param name="calculationConvergence">The convergence status of the calculation.</param>
         /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="targetProbability"/> 
         /// or <paramref name="calculatedProbability"/> falls outside the [0.0, 1.0] range and is not <see cref="double.NaN"/>.</exception>
-        public DikeHeightAssessmentOutput(double result, double targetProbability, double targetReliability,
+        public DikeHeightAssessmentOutput(double dikeHeight, double targetProbability, double targetReliability,
                                                double calculatedProbability, double calculatedReliability,
                                                CalculationConvergence calculationConvergence)
         {
@@ -57,7 +57,7 @@
                                                       RingtoetsCommonDataResources.Probability_Must_be_in_range_zero_to_one);
             }
 
-            Result = new RoundedDouble(2, result);
+            DikeHeight = new RoundedDouble(2, dikeHeight);
 
             TargetProbability = targetProbability;
             TargetReliability = new RoundedDouble(5, targetReliability);
@@ -67,18 +67,18 @@
         }
 
         /// <summary>
-        /// Gets the result of the calculation.
+        /// Gets the calculated dike height.
         /// </summary>
-        public RoundedDouble Result { get; private set; }
+        public RoundedDouble DikeHeight { get; private set; }
 
         /// <summary>
-        /// Gets the target probability.
+        /// Gets the norm used during the calculation.
         /// [1/year]
         /// </summary>
         public double TargetProbability { get; private set; }
 
         /// <summary>
-        /// Gets the target beta.
+        /// Gets the reliability index used during the calculation.
         /// [-]
         /// </summary>
         public RoundedDouble TargetReliability { get; private set; }
@@ -90,7 +90,7 @@
         public double CalculatedProbability { get; private set; }
 
         /// <summary>
-        /// Gets the calculated reliability.
+        /// Gets the calculated reliability index.
         /// [-]
         /// </summary>
         public RoundedDouble CalculatedReliability { get; private set; }
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsOutput.cs
===================================================================
diff -u -r4428701fa38521e07aff35c0e2058951ac7d0c93 -r9798fd949a2e90dfe1750377f9757fc456571ed1
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsOutput.cs	(.../GrassCoverErosionInwardsOutput.cs)	(revision 4428701fa38521e07aff35c0e2058951ac7d0c93)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsOutput.cs	(.../GrassCoverErosionInwardsOutput.cs)	(revision 9798fd949a2e90dfe1750377f9757fc456571ed1)
@@ -69,7 +69,7 @@
             {
                 return DikeHeightAssessmentOutput == null
                            ? RoundedDouble.NaN
-                           : DikeHeightAssessmentOutput.Result;
+                           : DikeHeightAssessmentOutput.DikeHeight;
             }
         }
 
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/DikeHeightAssessmentOutputTest.cs
===================================================================
diff -u -rd56bec747401ad6676fac64af5eef6d5fd89c47c -r9798fd949a2e90dfe1750377f9757fc456571ed1
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/DikeHeightAssessmentOutputTest.cs	(.../DikeHeightAssessmentOutputTest.cs)	(revision d56bec747401ad6676fac64af5eef6d5fd89c47c)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/DikeHeightAssessmentOutputTest.cs	(.../DikeHeightAssessmentOutputTest.cs)	(revision 9798fd949a2e90dfe1750377f9757fc456571ed1)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
@@ -30,21 +31,24 @@
     public class DikeHeightAssessmentOutputTest
     {
         [Test]
-        public void Constructor_InvalidTargetProbability_ThrowsArgumentOutOfRangeException(
-            [Random(1)] double result,
-            [Values(-0.01, 1.01)] double targetProbability,
-            [Random(1)] double targetReliability,
-            [Random(1)] double calculatedProbability,
-            [Random(1)] double calculatedReliability,
-            [Values(CalculationConvergence.CalculatedNotConverged, CalculationConvergence.CalculatedConverged,
-                CalculationConvergence.NotCalculated)] CalculationConvergence convergence)
+        [TestCase(-0.01)]
+        [TestCase(1.01)]
+        public void Constructor_InvalidTargetProbability_ThrowsArgumentOutOfRangeException(double targetProbability)
         {
+            // Setup
+            var random = new Random(32);
+            double dikeHeight = random.NextDouble();
+            double targetReliability = random.NextDouble();
+            double calculatedProbability = random.NextDouble();
+            double calculatedReliability = random.NextDouble();
+            CalculationConvergence convergence = random.NextEnumValue<CalculationConvergence>();
+
             // Call
-            TestDelegate call = () => new DikeHeightAssessmentOutput(result, targetProbability,
-                                                                          targetReliability,
-                                                                          calculatedProbability,
-                                                                          calculatedReliability,
-                                                                          convergence);
+            TestDelegate call = () => new DikeHeightAssessmentOutput(dikeHeight, targetProbability,
+                                                                     targetReliability,
+                                                                     calculatedProbability,
+                                                                     calculatedReliability,
+                                                                     convergence);
 
             // Assert
             ArgumentOutOfRangeException exception = Assert.Throws<ArgumentOutOfRangeException>(call);
@@ -53,21 +57,24 @@
         }
 
         [Test]
-        public void Constructor_InvalidCalculatedProbability_ThrowsArgumentOutOfRangeException(
-            [Random(1)] double result,
-            [Random(1)] double targetProbability,
-            [Random(1)] double targetReliability,
-            [Values(-0.01, 1.01)] double calculatedProbability,
-            [Random(1)] double calculatedReliability,
-            [Values(CalculationConvergence.CalculatedNotConverged, CalculationConvergence.CalculatedConverged,
-                CalculationConvergence.NotCalculated)] CalculationConvergence convergence)
+        [TestCase(-0.01)]
+        [TestCase(1.01)]
+        public void Constructor_InvalidCalculatedProbability_ThrowsArgumentOutOfRangeException(double calculatedProbability)
         {
+            // Setup
+            var random = new Random(32);
+            double dikeHeight = random.NextDouble();
+            double targetProbability = random.NextDouble();
+            double targetReliability = random.NextDouble();
+            double calculatedReliability = random.NextDouble();
+            CalculationConvergence convergence = random.NextEnumValue<CalculationConvergence>();
+
             // Call
-            TestDelegate call = () => new DikeHeightAssessmentOutput(result, targetProbability,
-                                                                          targetReliability,
-                                                                          calculatedProbability,
-                                                                          calculatedReliability,
-                                                                          convergence);
+            TestDelegate call = () => new DikeHeightAssessmentOutput(dikeHeight, targetProbability,
+                                                                     targetReliability,
+                                                                     calculatedProbability,
+                                                                     calculatedReliability,
+                                                                     convergence);
 
             // Assert
             ArgumentOutOfRangeException exception = Assert.Throws<ArgumentOutOfRangeException>(call);
@@ -76,24 +83,26 @@
         }
 
         [Test]
-        public void Constructor_ValidInput_ExpectedProperties(
-            [Random(1)] double result,
-            [Random(1)] double targetProbability,
-            [Random(1)] double targetReliability,
-            [Random(1)] double calculatedProbability,
-            [Random(1)] double calculatedReliability,
-            [Values(CalculationConvergence.CalculatedNotConverged, CalculationConvergence.CalculatedConverged,
-                CalculationConvergence.NotCalculated)] CalculationConvergence convergence)
+        public void Constructor_ValidInput_ExpectedProperties()
         {
+            // Setup
+            var random = new Random(32);
+            double dikeHeight = random.NextDouble();
+            double targetProbability = random.NextDouble();
+            double targetReliability = random.NextDouble();
+            double calculatedProbability = random.NextDouble();
+            double calculatedReliability = random.NextDouble();
+            CalculationConvergence convergence = random.NextEnumValue<CalculationConvergence>();
+
             // Call
-            var output = new DikeHeightAssessmentOutput(result, targetProbability,
-                                                             targetReliability,
-                                                             calculatedProbability,
-                                                             calculatedReliability,
-                                                             convergence);
+            var output = new DikeHeightAssessmentOutput(dikeHeight, targetProbability,
+                                                        targetReliability,
+                                                        calculatedProbability,
+                                                        calculatedReliability,
+                                                        convergence);
 
             // Assert
-            Assert.AreEqual(result, output.Result, output.Result.GetAccuracy());
+            Assert.AreEqual(dikeHeight, output.DikeHeight, output.DikeHeight.GetAccuracy());
             Assert.AreEqual(targetProbability, output.TargetProbability);
             Assert.AreEqual(targetReliability, output.TargetReliability, output.TargetReliability.GetAccuracy());
             Assert.AreEqual(calculatedProbability, output.CalculatedProbability);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test.csproj
===================================================================
diff -u -rd56bec747401ad6676fac64af5eef6d5fd89c47c -r9798fd949a2e90dfe1750377f9757fc456571ed1
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test.csproj	(.../Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test.csproj)	(revision d56bec747401ad6676fac64af5eef6d5fd89c47c)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test.csproj	(.../Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test.csproj)	(revision 9798fd949a2e90dfe1750377f9757fc456571ed1)
@@ -64,6 +64,10 @@
       <Project>{3BBFD65B-B277-4E50-AE6D-BD24C3434609}</Project>
       <Name>Core.Common.Base</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj">
+      <Project>{D749EE4C-CE50-4C17-BF01-9A953028C126}</Project>
+      <Name>Core.Common.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\src\Ringtoets.Common.Data\Ringtoets.Common.Data.csproj">
       <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
       <Name>Ringtoets.Common.Data</Name>
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/TestDikeHeightAssessmentOutputTest.cs
===================================================================
diff -u -rd56bec747401ad6676fac64af5eef6d5fd89c47c -r9798fd949a2e90dfe1750377f9757fc456571ed1
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/TestDikeHeightAssessmentOutputTest.cs	(.../TestDikeHeightAssessmentOutputTest.cs)	(revision d56bec747401ad6676fac64af5eef6d5fd89c47c)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil.Test/TestDikeHeightAssessmentOutputTest.cs	(.../TestDikeHeightAssessmentOutputTest.cs)	(revision 9798fd949a2e90dfe1750377f9757fc456571ed1)
@@ -19,6 +19,8 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
@@ -32,13 +34,13 @@
         public void TestHydraulicBoundaryLocationOutput_WithoutConvergence_ReturnsExpectedValues()
         {
             // Setup
-            const double result = 9.0;
+            const double dikeHeight = 9.0;
 
             // Call
-            DikeHeightAssessmentOutput output = new TestDikeHeightAssessmentOutput(result);
+            DikeHeightAssessmentOutput output = new TestDikeHeightAssessmentOutput(dikeHeight);
 
             // Assert
-            Assert.AreEqual(result, output.Result, output.Result.GetAccuracy());
+            Assert.AreEqual(dikeHeight, output.DikeHeight, output.DikeHeight.GetAccuracy());
             Assert.IsNaN(output.TargetProbability);
             Assert.IsNaN(output.TargetReliability);
             Assert.IsNaN(output.CalculatedProbability);
@@ -47,18 +49,18 @@
         }
 
         [Test]
-        public void TestHydraulicBoundaryLocationOutput_WithConvergence_ReturnsExpectedValues(
-            [Values(CalculationConvergence.CalculatedConverged, CalculationConvergence.NotCalculated,
-                CalculationConvergence.CalculatedNotConverged)] CalculationConvergence convergence)
+        public void TestHydraulicBoundaryLocationOutput_WithConvergence_ReturnsExpectedValues()
         {
             // Setup
-            const double result = 9.5;
+            var random = new Random(12);
+            double dikeHeight = random.NextDouble();
+            CalculationConvergence convergence = random.NextEnumValue<CalculationConvergence>();
 
             // Call
-            DikeHeightAssessmentOutput output = new TestDikeHeightAssessmentOutput(result, convergence);
+            DikeHeightAssessmentOutput output = new TestDikeHeightAssessmentOutput(dikeHeight, convergence);
 
             // Assert
-            Assert.AreEqual(result, output.Result, output.Result.GetAccuracy());
+            Assert.AreEqual(dikeHeight, output.DikeHeight, output.DikeHeight.GetAccuracy());
             Assert.IsNaN(output.TargetProbability);
             Assert.IsNaN(output.TargetReliability);
             Assert.IsNaN(output.CalculatedProbability);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/TestDikeHeightAssessmentOutput.cs
===================================================================
diff -u -rd56bec747401ad6676fac64af5eef6d5fd89c47c -r9798fd949a2e90dfe1750377f9757fc456571ed1
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/TestDikeHeightAssessmentOutput.cs	(.../TestDikeHeightAssessmentOutput.cs)	(revision d56bec747401ad6676fac64af5eef6d5fd89c47c)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.TestUtil/TestDikeHeightAssessmentOutput.cs	(.../TestDikeHeightAssessmentOutput.cs)	(revision 9798fd949a2e90dfe1750377f9757fc456571ed1)
@@ -32,9 +32,9 @@
          /// <summary>
         /// Creates a new instance of <see cref="TestDikeHeightAssessmentOutput"/>.
         /// </summary>
-        /// <param name="result">The result to set in the output.</param>
+        /// <param name="dikeHeight">The result to set in the output.</param>
         /// <param name="calculationConvergence">The <see cref="CalculationConvergence"/> to set in the output.</param>
-        public TestDikeHeightAssessmentOutput(double result, CalculationConvergence calculationConvergence = CalculationConvergence.NotCalculated) :
-            base(result, double.NaN, double.NaN, double.NaN, double.NaN, calculationConvergence) {}
+        public TestDikeHeightAssessmentOutput(double dikeHeight, CalculationConvergence calculationConvergence = CalculationConvergence.NotCalculated) :
+            base(dikeHeight, double.NaN, double.NaN, double.NaN, double.NaN, calculationConvergence) {}
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -racf86909628278e511e07a2096f71664e6ef9ee8 -r9798fd949a2e90dfe1750377f9757fc456571ed1
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs)	(revision acf86909628278e511e07a2096f71664e6ef9ee8)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs)	(revision 9798fd949a2e90dfe1750377f9757fc456571ed1)
@@ -499,7 +499,7 @@
             Assert.IsFalse(double.IsNaN(calculation.Output.DikeHeight));
             DikeHeightAssessmentOutput dikeHeightAssessmentOutput = calculation.Output.DikeHeightAssessmentOutput;
             Assert.IsNotNull(dikeHeightAssessmentOutput);
-            Assert.IsFalse(double.IsNaN(dikeHeightAssessmentOutput.Result));
+            Assert.IsFalse(double.IsNaN(dikeHeightAssessmentOutput.DikeHeight));
             mocks.VerifyAll();
         }
 
@@ -554,7 +554,7 @@
             Assert.IsNaN(calculation.Output.DikeHeight);
             DikeHeightAssessmentOutput dikeHeightAssessmentOutput = calculation.Output.DikeHeightAssessmentOutput;
             Assert.IsNotNull(dikeHeightAssessmentOutput);
-            Assert.IsNaN(dikeHeightAssessmentOutput.Result);
+            Assert.IsNaN(dikeHeightAssessmentOutput.DikeHeight);
             mocks.VerifyAll();
         }
 
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs
===================================================================
diff -u -r4428701fa38521e07aff35c0e2058951ac7d0c93 -r9798fd949a2e90dfe1750377f9757fc456571ed1
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs	(.../GrassCoverErosionInwardsCalculationServiceTest.cs)	(revision 4428701fa38521e07aff35c0e2058951ac7d0c93)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs	(.../GrassCoverErosionInwardsCalculationServiceTest.cs)	(revision 9798fd949a2e90dfe1750377f9757fc456571ed1)
@@ -439,7 +439,7 @@
                 DikeHeightAssessmentOutput dikeHeightAssessmentOutput = calculation.Output.DikeHeightAssessmentOutput;
                 Assert.IsNotNull(dikeHeightAssessmentOutput);
 
-                Assert.IsFalse(double.IsNaN(dikeHeightAssessmentOutput.Result));
+                Assert.IsFalse(double.IsNaN(dikeHeightAssessmentOutput.DikeHeight));
                 Assert.IsFalse(double.IsNaN(dikeHeightAssessmentOutput.TargetProbability));
                 Assert.IsFalse(double.IsNaN(dikeHeightAssessmentOutput.TargetReliability));
                 Assert.IsFalse(double.IsNaN(dikeHeightAssessmentOutput.CalculatedProbability));