Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs
===================================================================
diff -u -r0981b22c56801334d3f71343f1a861070a404e3e -r17dd865ebeac34b0d00e80d5a4afcea40c2dc83a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs	(.../HydraulicBoundaryLocationCreateExtensions.cs)	(revision 0981b22c56801334d3f71343f1a861070a404e3e)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs	(.../HydraulicBoundaryLocationCreateExtensions.cs)	(revision 17dd865ebeac34b0d00e80d5a4afcea40c2dc83a)
@@ -59,34 +59,23 @@
                 Order = order
             };
 
-            CreateDesignWaterLevelOutput(entity, location.DesignWaterLevelOutput);
-            CreateWaveHeightOutput(entity, location.WaveHeightOutput);
+            CreateHydraulicLocationOutput(entity, location.DesignWaterLevelOutput, HydraulicLocationOutputType.DesignWaterLevel);
+            CreateHydraulicLocationOutput(entity, location.WaveHeightOutput, HydraulicLocationOutputType.WaveHeight);
 
             registry.Register(entity, location);
             return entity;
         }
 
-        private static void CreateDesignWaterLevelOutput(HydraulicLocationEntity entity, HydraulicBoundaryLocationOutput output)
+        private static void CreateHydraulicLocationOutput(HydraulicLocationEntity entity, HydraulicBoundaryLocationOutput output,
+                                                          HydraulicLocationOutputType outputType)
         {
-            if (output == null)
+            if (output != null)
             {
-                return;
+                entity.HydraulicLocationOutputEntities.Add(output.Create<HydraulicLocationOutputEntity>
+                                                               (outputType));
             }
-            entity.HydraulicLocationOutputEntities.Add(output.Create<HydraulicLocationOutputEntity>
-                                                           (HydraulicLocationOutputType.DesignWaterLevel));
         }
 
-        private static void CreateWaveHeightOutput(HydraulicLocationEntity entity, HydraulicBoundaryLocationOutput output)
-        {
-            if (output == null)
-            {
-                return;
-            }
-
-            entity.HydraulicLocationOutputEntities.Add(output.Create<HydraulicLocationOutputEntity>(
-                HydraulicLocationOutputType.WaveHeight));
-        }
-
         #region Grass CoverErosion Outwards HydraulicLocation
 
         /// <summary>
@@ -118,34 +107,26 @@
                 Order = order
             };
 
-            CreateDesignWaterLevelOutput(entity, location.DesignWaterLevelOutput);
-            CreateWaveHeightOutput(entity, location.WaveHeightOutput);
+            CreateGrassCoverErosionOutwardsHydraulicLocationOutput(entity, location.DesignWaterLevelOutput,
+                                                                   HydraulicLocationOutputType.DesignWaterLevel);
+            CreateGrassCoverErosionOutwardsHydraulicLocationOutput(entity, location.WaveHeightOutput,
+                                                                   HydraulicLocationOutputType.WaveHeight);
 
             registry.Register(entity, location);
             return entity;
         }
 
-        private static void CreateDesignWaterLevelOutput(GrassCoverErosionOutwardsHydraulicLocationEntity entity, HydraulicBoundaryLocationOutput output)
+        private static void CreateGrassCoverErosionOutwardsHydraulicLocationOutput(GrassCoverErosionOutwardsHydraulicLocationEntity entity,
+                                                                                   HydraulicBoundaryLocationOutput output,
+                                                                                   HydraulicLocationOutputType outputType)
         {
-            if (output == null)
+            if (output != null)
             {
-                return;
+                entity.GrassCoverErosionOutwardsHydraulicLocationOutputEntities.Add(output.Create<GrassCoverErosionOutwardsHydraulicLocationOutputEntity>
+                                                                                        (outputType));
             }
-            entity.GrassCoverErosionOutwardsHydraulicLocationOutputEntities.Add(output.Create<GrassCoverErosionOutwardsHydraulicLocationOutputEntity>(
-                HydraulicLocationOutputType.DesignWaterLevel));
         }
 
-        private static void CreateWaveHeightOutput(GrassCoverErosionOutwardsHydraulicLocationEntity entity, HydraulicBoundaryLocationOutput output)
-        {
-            if (output == null)
-            {
-                return;
-            }
-
-            entity.GrassCoverErosionOutwardsHydraulicLocationOutputEntities.Add(output.Create<GrassCoverErosionOutwardsHydraulicLocationOutputEntity>(
-                HydraulicLocationOutputType.WaveHeight));
-        }
-
         #endregion
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationOutputCreateExtensions.cs
===================================================================
diff -u -r0981b22c56801334d3f71343f1a861070a404e3e -r17dd865ebeac34b0d00e80d5a4afcea40c2dc83a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationOutputCreateExtensions.cs	(.../HydraulicBoundaryLocationOutputCreateExtensions.cs)	(revision 0981b22c56801334d3f71343f1a861070a404e3e)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationOutputCreateExtensions.cs	(.../HydraulicBoundaryLocationOutputCreateExtensions.cs)	(revision 17dd865ebeac34b0d00e80d5a4afcea40c2dc83a)
@@ -35,12 +35,12 @@
         /// <typeparam name="THydraulicLocationOutputEntity">The output entity type to create.</typeparam>
         /// <param name="output">The output to create a database entity for.</param>
         /// <param name="outputType">The calculation output type.</param>
-        /// <returns>A new <paramref name="outputType"/>.</returns>
+        /// <returns>A new <typeparamref name="THydraulicLocationOutputEntity"/> of output type <paramref name="outputType"/>.</returns>
         internal static THydraulicLocationOutputEntity Create<THydraulicLocationOutputEntity>(this HydraulicBoundaryLocationOutput output,
                                                                                               HydraulicLocationOutputType outputType)
             where THydraulicLocationOutputEntity : IHydraulicLocationOutputEntity, new()
         {
-            var entity = new THydraulicLocationOutputEntity
+            return new THydraulicLocationOutputEntity
             {
                 HydraulicLocationOutputType = (byte) outputType,
                 Result = double.IsNaN(output.Result)
@@ -60,8 +60,6 @@
                                             : output.CalculatedReliability,
                 CalculationConvergence = (byte) output.CalculationConvergence
             };
-
-            return entity;
         }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IHydraulicLocationOutputEntity.cs
===================================================================
diff -u -r0981b22c56801334d3f71343f1a861070a404e3e -r17dd865ebeac34b0d00e80d5a4afcea40c2dc83a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IHydraulicLocationOutputEntity.cs	(.../IHydraulicLocationOutputEntity.cs)	(revision 0981b22c56801334d3f71343f1a861070a404e3e)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IHydraulicLocationOutputEntity.cs	(.../IHydraulicLocationOutputEntity.cs)	(revision 17dd865ebeac34b0d00e80d5a4afcea40c2dc83a)
@@ -21,8 +21,14 @@
 
 namespace Application.Ringtoets.Storage.DbContext
 {
+    /// <summary>
+    /// Interface for an output entity that represents a hydraulic boundary location output.
+    /// </summary>
     public interface IHydraulicLocationOutputEntity
     {
+        /// <summary>
+        /// Gets or sets the calculation result.
+        /// </summary>
         double? Result { get; set; }
 
         /// <summary>
@@ -45,7 +51,16 @@
         /// </summary>
         double? CalculatedReliability { get; set; }
 
+        /// <summary>
+        /// Gets or sets the convergence status of a calculation.
+        /// </summary>
+        /// <seealso cref="CalculationConvergence"/>
         byte CalculationConvergence { get; set; }
-        byte HydraulicLocationOutputType { get; set; }
+
+        /// <summary>
+        /// Sets the calculation output type.
+        /// </summary>
+        /// <seealso cref="HydraulicLocationOutputType"/>
+        byte HydraulicLocationOutputType { set; }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialGrassCoverErosionOutwardsHydraulicLocationOutputEntity.cs
===================================================================
diff -u -r0981b22c56801334d3f71343f1a861070a404e3e -r17dd865ebeac34b0d00e80d5a4afcea40c2dc83a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialGrassCoverErosionOutwardsHydraulicLocationOutputEntity.cs	(.../PartialGrassCoverErosionOutwardsHydraulicLocationOutputEntity.cs)	(revision 0981b22c56801334d3f71343f1a861070a404e3e)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialGrassCoverErosionOutwardsHydraulicLocationOutputEntity.cs	(.../PartialGrassCoverErosionOutwardsHydraulicLocationOutputEntity.cs)	(revision 17dd865ebeac34b0d00e80d5a4afcea40c2dc83a)
@@ -21,5 +21,9 @@
 
 namespace Application.Ringtoets.Storage.DbContext
 {
+    /// <summary>
+    /// Partial implementation of <see cref="GrassCoverErosionOutwardsHydraulicLocationOutputEntity"/> that implements 
+    /// <see cref="IHydraulicLocationOutputEntity"/>.
+    /// </summary>
     public partial class GrassCoverErosionOutwardsHydraulicLocationOutputEntity : IHydraulicLocationOutputEntity {}
 }
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialHydraulicLocationOutputEntity.cs
===================================================================
diff -u -r0981b22c56801334d3f71343f1a861070a404e3e -r17dd865ebeac34b0d00e80d5a4afcea40c2dc83a
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialHydraulicLocationOutputEntity.cs	(.../PartialHydraulicLocationOutputEntity.cs)	(revision 0981b22c56801334d3f71343f1a861070a404e3e)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialHydraulicLocationOutputEntity.cs	(.../PartialHydraulicLocationOutputEntity.cs)	(revision 17dd865ebeac34b0d00e80d5a4afcea40c2dc83a)
@@ -21,5 +21,9 @@
 
 namespace Application.Ringtoets.Storage.DbContext
 {
+    /// <summary>
+    /// Partial implementation of <see cref="HydraulicLocationOutputEntity"/> that implements 
+    /// <see cref="IHydraulicLocationOutputEntity"/>.
+    /// </summary>
     public partial class HydraulicLocationOutputEntity : IHydraulicLocationOutputEntity {}
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs
===================================================================
diff -u -r84dcc2c2dfc224ad20285f74b6c7b20f5f49d2b2 -r17dd865ebeac34b0d00e80d5a4afcea40c2dc83a
--- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs	(.../DesignWaterLevelCalculationService.cs)	(revision 84dcc2c2dfc224ad20285f74b6c7b20f5f49d2b2)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs	(.../DesignWaterLevelCalculationService.cs)	(revision 17dd865ebeac34b0d00e80d5a4afcea40c2dc83a)
@@ -170,7 +170,7 @@
                                                        converged);
         }
 
-        private AssessmentLevelCalculationInput CreateInput(HydraulicBoundaryLocation hydraulicBoundaryLocation,
+        private static AssessmentLevelCalculationInput CreateInput(HydraulicBoundaryLocation hydraulicBoundaryLocation,
                                                             double norm,
                                                             string hydraulicBoundaryDatabaseFilePath)
         {
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestHydraulicBoundaryLocationTest.cs
===================================================================
diff -u -r533cfb6b8d9c3e198204d1c6ee022b79049e6d43 -r17dd865ebeac34b0d00e80d5a4afcea40c2dc83a
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestHydraulicBoundaryLocationTest.cs	(.../TestHydraulicBoundaryLocationTest.cs)	(revision 533cfb6b8d9c3e198204d1c6ee022b79049e6d43)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestHydraulicBoundaryLocationTest.cs	(.../TestHydraulicBoundaryLocationTest.cs)	(revision 17dd865ebeac34b0d00e80d5a4afcea40c2dc83a)
@@ -29,7 +29,7 @@
     public class TestHydraulicBoundaryLocationTest
     {
         [Test]
-        public void Constructor_Always_ExpectedValues()
+        public void Constructor_NoParameters_ExpectedValues()
         {
             // Call
             var testLocation = new TestHydraulicBoundaryLocation();
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestHydraulicBoundaryLocation.cs
===================================================================
diff -u -r19db52c6c2776ade0a18342b78f1d64f809ce9d7 -r17dd865ebeac34b0d00e80d5a4afcea40c2dc83a
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestHydraulicBoundaryLocation.cs	(.../TestHydraulicBoundaryLocation.cs)	(revision 19db52c6c2776ade0a18342b78f1d64f809ce9d7)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestHydraulicBoundaryLocation.cs	(.../TestHydraulicBoundaryLocation.cs)	(revision 17dd865ebeac34b0d00e80d5a4afcea40c2dc83a)
@@ -39,7 +39,7 @@
         /// and <see cref="HydraulicBoundaryLocation.WaveHeightOutput"/> set.
         /// </summary>
         /// <param name="designWaterLevel">The design water level result to set in the output.</param>
-        /// <param name="waveHeight">The waveheight result to set in the output.</param>
+        /// <param name="waveHeight">The wave height result to set in the output.</param>
         public TestHydraulicBoundaryLocation(double? designWaterLevel = double.NaN, double? waveHeight = double.NaN)
             : base(0, string.Empty, 0, 0)
         {
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs
===================================================================
diff -u -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 -r17dd865ebeac34b0d00e80d5a4afcea40c2dc83a
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs	(.../PipingInputTest.cs)	(revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs	(.../PipingInputTest.cs)	(revision 17dd865ebeac34b0d00e80d5a4afcea40c2dc83a)
@@ -486,7 +486,7 @@
         }
 
         [Test]
-        public void GivenAssessmentLevelSetByManualInput_WhenWhenManualAssessmentLevelFalseAndHydraulicBoundaryLocationSet_ThenAssessmentLevelUpdatedAndLocationSet()
+        public void GivenAssessmentLevelSetByManualInput_WhenManualAssessmentLevelFalseAndHydraulicBoundaryLocationSet_ThenAssessmentLevelUpdatedAndLocationSet()
         {
             // Given
             var random = new Random(21);
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r0981b22c56801334d3f71343f1a861070a404e3e -r17dd865ebeac34b0d00e80d5a4afcea40c2dc83a
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 0981b22c56801334d3f71343f1a861070a404e3e)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 17dd865ebeac34b0d00e80d5a4afcea40c2dc83a)
@@ -642,11 +642,7 @@
             {
                 calculation.InputParameters.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "", 1, 1)
                 {
-                    DesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(12, double.NaN,
-                                                                                 double.NaN, 
-                                                                                 double.NaN,
-                                                                                 double.NaN, 
-                                                                                 CalculationConvergence.NotCalculated)
+                    DesignWaterLevelOutput = new TestHydraulicBoundaryLocationOutput(12)
                 };
                 calculation.InputParameters.LowerBoundaryRevetment = (RoundedDouble) 1.0;
                 calculation.InputParameters.UpperBoundaryRevetment = (RoundedDouble) 10.0;