Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationOutputTest.cs
===================================================================
diff -u -r8ba742d2139563c9571e32f074c7c4b3077f45ee -r1ab0201beb5f403186b715a0ed4e30bcf7f78f9a
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationOutputTest.cs	(.../HydraulicBoundaryLocationOutputTest.cs)	(revision 8ba742d2139563c9571e32f074c7c4b3077f45ee)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationOutputTest.cs	(.../HydraulicBoundaryLocationOutputTest.cs)	(revision 1ab0201beb5f403186b715a0ed4e30bcf7f78f9a)
@@ -39,19 +39,14 @@
         {
             // Setup
             var random = new Random(32);
-            double result = random.NextDouble();
-            double targetReliability = random.NextDouble();
-            double calculatedProbability = random.NextDouble();
-            double calculatedReliability = random.NextDouble();
-            var convergence = random.NextEnumValue<CalculationConvergence>();
 
             // Call
-            TestDelegate call = () => new HydraulicBoundaryLocationOutput(result,
-                                                                          targetProbability,
-                                                                          targetReliability,
-                                                                          calculatedProbability,
-                                                                          calculatedReliability,
-                                                                          convergence);
+            TestDelegate call = () => new HydraulicBoundaryLocationOutput(random.NextDouble(),
+                                                                          random.NextDouble(),
+                                                                          random.NextDouble(),
+                                                                          random.NextDouble(),
+                                                                          random.NextDouble(),
+                                                                          random.NextEnumValue<CalculationConvergence>());
 
             // Assert
             var exception = Assert.Throws<ArgumentOutOfRangeException>(call);
@@ -67,19 +62,14 @@
         {
             // Setup
             var random = new Random(32);
-            double result = random.NextDouble();
-            double targetProbability = random.NextDouble();
-            double targetReliability = random.NextDouble();
-            double calculatedReliability = random.NextDouble();
-            var convergence = random.NextEnumValue<CalculationConvergence>();
 
             // Call
-            TestDelegate call = () => new HydraulicBoundaryLocationOutput(result,
-                                                                          targetProbability,
-                                                                          targetReliability,
+            TestDelegate call = () => new HydraulicBoundaryLocationOutput(random.NextDouble(),
+                                                                          random.NextDouble(),
+                                                                          random.NextDouble(),
                                                                           calculatedProbability,
-                                                                          calculatedReliability,
-                                                                          convergence);
+                                                                          random.NextDouble(),
+                                                                          random.NextEnumValue<CalculationConvergence>());
 
             // Assert
             var exception = Assert.Throws<ArgumentOutOfRangeException>(call);
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/WaveHeightCalculationTest.cs
===================================================================
diff -u -r7f4eb38b0c9023e8a66cbce632cd10a16ef9e4bb -r1ab0201beb5f403186b715a0ed4e30bcf7f78f9a
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/WaveHeightCalculationTest.cs	(.../WaveHeightCalculationTest.cs)	(revision 7f4eb38b0c9023e8a66cbce632cd10a16ef9e4bb)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/WaveHeightCalculationTest.cs	(.../WaveHeightCalculationTest.cs)	(revision 1ab0201beb5f403186b715a0ed4e30bcf7f78f9a)
@@ -101,8 +101,8 @@
 
         [Test]
         [TestCaseSource(nameof(HydraulicBoundaryLocationsToCalculate))]
-        public void IsCalculated_NotFullyCalculated_ReturnIsCalculated(HydraulicBoundaryLocation hydraulicBoundaryLocation,
-                                                                       bool shouldBeCalculated)
+        public void IsCalculated_HydraulicBoundaryLocationsToCalculate_ReturnIsCalculated(
+            HydraulicBoundaryLocation hydraulicBoundaryLocation, bool shouldBeCalculated)
         {
             // Setup
             var calculation = new WaveHeightCalculation(hydraulicBoundaryLocation);
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/IllustrationPoints/TestSubMechanismIllustrationPoint.cs
===================================================================
diff -u -r7f4eb38b0c9023e8a66cbce632cd10a16ef9e4bb -r1ab0201beb5f403186b715a0ed4e30bcf7f78f9a
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/IllustrationPoints/TestSubMechanismIllustrationPoint.cs	(.../TestSubMechanismIllustrationPoint.cs)	(revision 7f4eb38b0c9023e8a66cbce632cd10a16ef9e4bb)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/IllustrationPoints/TestSubMechanismIllustrationPoint.cs	(.../TestSubMechanismIllustrationPoint.cs)	(revision 1ab0201beb5f403186b715a0ed4e30bcf7f78f9a)
@@ -25,12 +25,12 @@
 namespace Ringtoets.Common.Data.TestUtil.IllustrationPoints
 {
     /// <summary>
-    /// A simple submechanism illustration point which can be used for testing.
+    /// A simple submechanism illustration point that can be used for testing.
     /// </summary>
     public class TestSubMechanismIllustrationPoint : SubMechanismIllustrationPoint
     {
         /// <summary>
-        /// Creates a <see cref="TestSubMechanismIllustrationPoint"/>.
+        /// Creates a new instance of <see cref="TestSubMechanismIllustrationPoint"/>.
         /// </summary>
         public TestSubMechanismIllustrationPoint()
             : base("Illustration Point",
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/IllustrationPoints/TestWindDirection.cs
===================================================================
diff -u -rf1e6b4ad5dddc6e771288f17a0b619d6dd23ec07 -r1ab0201beb5f403186b715a0ed4e30bcf7f78f9a
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/IllustrationPoints/TestWindDirection.cs	(.../TestWindDirection.cs)	(revision f1e6b4ad5dddc6e771288f17a0b619d6dd23ec07)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/IllustrationPoints/TestWindDirection.cs	(.../TestWindDirection.cs)	(revision 1ab0201beb5f403186b715a0ed4e30bcf7f78f9a)
@@ -24,12 +24,12 @@
 namespace Ringtoets.Common.Data.TestUtil.IllustrationPoints
 {
     /// <summary>
-    /// Simple wind direction which can be used for testing.
+    /// Simple wind direction that can be used for testing.
     /// </summary>
     public class TestWindDirection : WindDirection
     {
         /// <summary>
-        /// Creates a new instance of <see cref="TestWindDirection"/>
+        /// Creates a new instance of <see cref="TestWindDirection"/>.
         /// </summary>
         public TestWindDirection() : base("SSE", 5.0) {}
     }
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestHydraulicBoundaryLocation.cs
===================================================================
diff -u -r8bb6e849266ec28412ebfe23beccd7235c4db9bf -r1ab0201beb5f403186b715a0ed4e30bcf7f78f9a
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestHydraulicBoundaryLocation.cs	(.../TestHydraulicBoundaryLocation.cs)	(revision 8bb6e849266ec28412ebfe23beccd7235c4db9bf)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestHydraulicBoundaryLocation.cs	(.../TestHydraulicBoundaryLocation.cs)	(revision 1ab0201beb5f403186b715a0ed4e30bcf7f78f9a)
@@ -24,7 +24,7 @@
 namespace Ringtoets.Common.Data.TestUtil
 {
     /// <summary>
-    /// Class that creates simple instances of <see cref="HydraulicBoundaryLocation"/>, which
+    /// Class that creates simple instances of <see cref="HydraulicBoundaryLocation"/>, that
     /// can be used during testing.
     /// </summary>
     public class TestHydraulicBoundaryLocation : HydraulicBoundaryLocation
@@ -77,7 +77,7 @@
         /// <summary>
         /// Creates a new instance of <see cref="TestHydraulicBoundaryLocation"/> with 
         /// <see cref="HydraulicBoundaryLocationCalculation.Output"/> set for
-        /// <see cref="HydraulicBoundaryLocation.DesignWaterLevelCalculation"/>
+        /// <see cref="HydraulicBoundaryLocation.DesignWaterLevelCalculation"/>.
         /// </summary>
         /// <param name="designWaterLevel">The design water level result to set in the output.</param>
         /// <returns>A new <see cref="TestHydraulicBoundaryLocation"/>.</returns>
@@ -89,7 +89,7 @@
         /// <summary>
         /// Creates a new instance of <see cref="TestHydraulicBoundaryLocation"/> with 
         /// <see cref="HydraulicBoundaryLocationCalculation.Output"/> set for
-        /// <see cref="HydraulicBoundaryLocation.WaveHeightCalculation"/>
+        /// <see cref="HydraulicBoundaryLocation.WaveHeightCalculation"/>.
         /// </summary>
         /// <param name="waveheight">The wave height result to set in the output.</param>
         /// <returns>A new <see cref="TestHydraulicBoundaryLocation"/>.</returns>
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationRowTest.cs
===================================================================
diff -u -r24e3831cb8cb0ee3b0d0c6f6cde536e3a6639391 -r1ab0201beb5f403186b715a0ed4e30bcf7f78f9a
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationRowTest.cs	(.../HydraulicBoundaryLocationRowTest.cs)	(revision 24e3831cb8cb0ee3b0d0c6f6cde536e3a6639391)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationRowTest.cs	(.../HydraulicBoundaryLocationRowTest.cs)	(revision 1ab0201beb5f403186b715a0ed4e30bcf7f78f9a)
@@ -36,11 +36,9 @@
         [Test]
         public void Constructor_HydraulicBoundaryLocationCalculationNull_ThrowsArgumentNullException()
         {
-            // Setup
-            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
-
             // Call
-            TestDelegate call = () => new HydraulicBoundaryLocationRow(hydraulicBoundaryLocation, null);
+            TestDelegate call = () => new HydraulicBoundaryLocationRow(new TestHydraulicBoundaryLocation(),
+                                                                       null);
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
@@ -82,10 +80,8 @@
             [Values(true, false)] bool setIllustrationPoints)
         {
             // Setup
-            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
             var calculation = new HydraulicBoundaryLocationCalculation();
-            var row = new HydraulicBoundaryLocationRow(hydraulicBoundaryLocation,
-                                                       calculation);
+            var row = new HydraulicBoundaryLocationRow(new TestHydraulicBoundaryLocation(), calculation);
 
             // Call
             row.IncludeIllustrationPoints = setIllustrationPoints;
@@ -99,9 +95,8 @@
         public void Result_WithCalculationOutput_ReturnsResult()
         {
             // Setup
-            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
             var calculation = new HydraulicBoundaryLocationCalculation();
-            var row = new HydraulicBoundaryLocationRow(hydraulicBoundaryLocation,
+            var row = new HydraulicBoundaryLocationRow(new TestHydraulicBoundaryLocation(),
                                                        calculation);
 
             var random = new Random(432);
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs
===================================================================
diff -u -r8ba742d2139563c9571e32f074c7c4b3077f45ee -r1ab0201beb5f403186b715a0ed4e30bcf7f78f9a
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs	(.../HydraulicBoundaryLocationsViewTest.cs)	(revision 8ba742d2139563c9571e32f074c7c4b3077f45ee)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs	(.../HydraulicBoundaryLocationsViewTest.cs)	(revision 1ab0201beb5f403186b715a0ed4e30bcf7f78f9a)
@@ -261,8 +261,7 @@
 
             protected override HydraulicBoundaryLocationRow CreateNewRow(HydraulicBoundaryLocation location)
             {
-                return new TestHydraulicBoundaryLocationRow(location,
-                                                            location.WaveHeightCalculation);
+                return new TestHydraulicBoundaryLocationRow(location, location.WaveHeightCalculation);
             }
 
             protected override void HandleCalculateSelectedLocations(IEnumerable<HydraulicBoundaryLocation> locations)