Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestHydraulicBoundaryLocationTest.cs
===================================================================
diff -u -r358e0684c5e5efa701a9a4c80fda01defb237949 -r421965c6cc8249febf0a72677c75d49a39078893
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestHydraulicBoundaryLocationTest.cs	(.../TestHydraulicBoundaryLocationTest.cs)	(revision 358e0684c5e5efa701a9a4c80fda01defb237949)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestHydraulicBoundaryLocationTest.cs	(.../TestHydraulicBoundaryLocationTest.cs)	(revision 421965c6cc8249febf0a72677c75d49a39078893)
@@ -39,9 +39,6 @@
             Assert.AreEqual(0, testLocation.Id);
             Assert.IsEmpty(testLocation.Name);
             Assert.AreEqual(new Point2D(0, 0), testLocation.Location);
-
-            Assert.IsNull(testLocation.DesignWaterLevelCalculation1.Output);
-            Assert.IsNull(testLocation.WaveHeightCalculation1.Output);
         }
 
         [Test]
@@ -58,38 +55,6 @@
             Assert.AreEqual(0, testLocation.Id);
             Assert.AreEqual(name, testLocation.Name);
             Assert.AreEqual(new Point2D(0, 0), testLocation.Location);
-
-            Assert.IsNull(testLocation.DesignWaterLevelCalculation1.Output);
-            Assert.IsNull(testLocation.WaveHeightCalculation1.Output);
         }
-
-        [Test]
-        public void CreateFullyCalculated_DesignWaterLevelAndWaveHeight_ExpectedValues()
-        {
-            // Call
-            HydraulicBoundaryLocation testLocation = TestHydraulicBoundaryLocation.CreateFullyCalculated();
-
-            // Assert
-            Assert.IsInstanceOf<HydraulicBoundaryLocation>(testLocation);
-            Assert.AreEqual(0, testLocation.Id);
-            Assert.IsEmpty(testLocation.Name);
-            Assert.AreEqual(new Point2D(0, 0), testLocation.Location);
-
-            AssertCalculationHasOutput(4.5, testLocation.DesignWaterLevelCalculation1);
-            AssertCalculationHasOutput(5.5, testLocation.WaveHeightCalculation1);
-        }
-
-        private static void AssertCalculationHasOutput(double value, HydraulicBoundaryLocationCalculation calculation)
-        {
-            HydraulicBoundaryLocationOutput actual = calculation.Output;
-
-            Assert.AreEqual(value, actual.Result, actual.Result.GetAccuracy());
-            Assert.AreEqual(0, actual.TargetReliability, actual.TargetReliability.GetAccuracy());
-            Assert.AreEqual(0, actual.TargetProbability);
-            Assert.AreEqual(0, actual.CalculatedReliability, actual.CalculatedReliability.GetAccuracy());
-            Assert.AreEqual(0, actual.CalculatedProbability);
-            Assert.AreEqual(CalculationConvergence.CalculatedConverged, actual.CalculationConvergence);
-            Assert.IsNull(actual.GeneralResult);
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestHydraulicBoundaryLocation.cs
===================================================================
diff -u -r2ab89f4256cd77d3386c27ca1cbd49a16f4abba2 -r421965c6cc8249febf0a72677c75d49a39078893
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestHydraulicBoundaryLocation.cs	(.../TestHydraulicBoundaryLocation.cs)	(revision 2ab89f4256cd77d3386c27ca1cbd49a16f4abba2)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestHydraulicBoundaryLocation.cs	(.../TestHydraulicBoundaryLocation.cs)	(revision 421965c6cc8249febf0a72677c75d49a39078893)
@@ -32,47 +32,13 @@
         /// <summary>
         /// Creates a new instance of <see cref="TestHydraulicBoundaryLocation"/>.
         /// </summary>
-        public TestHydraulicBoundaryLocation() : this(null, null) {}
+        public TestHydraulicBoundaryLocation() : this(string.Empty) {}
 
         /// <summary>
         /// Creates a new instance of <see cref="TestHydraulicBoundaryLocation"/>
         /// with the given name.
         /// </summary>
         /// <param name="name">The name for the <see cref="TestHydraulicBoundaryLocation"/>.</param>
         public TestHydraulicBoundaryLocation(string name) : base(0, name, 0, 0) {}
-
-        /// <summary>
-        /// Creates a new instance of <see cref="TestHydraulicBoundaryLocation"/> with 
-        /// <see cref="HydraulicBoundaryLocationCalculation.Output"/> set.
-        /// </summary>
-        /// <param name="designWaterLevel">The design water level result to set in the output.</param>
-        /// <param name="waveHeight">The wave height result to set in the output.</param>
-        private TestHydraulicBoundaryLocation(double? designWaterLevel, double? waveHeight)
-            : this(string.Empty)
-        {
-            if (designWaterLevel.HasValue)
-            {
-                DesignWaterLevelCalculation1.Output = new HydraulicBoundaryLocationOutput(
-                    designWaterLevel.Value, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged, null);
-            }
-
-            if (waveHeight.HasValue)
-            {
-                WaveHeightCalculation1.Output = new HydraulicBoundaryLocationOutput(
-                    waveHeight.Value, 0, 0, 0, 0, CalculationConvergence.CalculatedConverged, null);
-            }
-        }
-
-        /// <summary>
-        /// Creates a new instance of <see cref="TestHydraulicBoundaryLocation"/> with
-        /// <see cref="HydraulicBoundaryLocationCalculation.Output"/> set for
-        /// <see cref="HydraulicBoundaryLocation.DesignWaterLevelCalculation1"/>
-        /// and <see cref="HydraulicBoundaryLocation.WaveHeightCalculation1"/>.
-        /// </summary>
-        /// <returns>A new <see cref="TestHydraulicBoundaryLocation"/>.</returns>
-        public static TestHydraulicBoundaryLocation CreateFullyCalculated()
-        {
-            return new TestHydraulicBoundaryLocation(4.5, 5.5);
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/NormPropertiesIntegrationTest.cs
===================================================================
diff -u -r5333704809da36195e26ea4c4e0fe5ed0169348f -r421965c6cc8249febf0a72677c75d49a39078893
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/NormPropertiesIntegrationTest.cs	(.../NormPropertiesIntegrationTest.cs)	(revision 5333704809da36195e26ea4c4e0fe5ed0169348f)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/NormPropertiesIntegrationTest.cs	(.../NormPropertiesIntegrationTest.cs)	(revision 421965c6cc8249febf0a72677c75d49a39078893)
@@ -58,7 +58,7 @@
             const int numberOfCalculationsWithOutput = 3;
 
             var random = new Random();
-            HydraulicBoundaryLocation hydraulicBoundaryLocation1 = TestHydraulicBoundaryLocation.CreateFullyCalculated();
+            var hydraulicBoundaryLocation1 = new TestHydraulicBoundaryLocation();
             var hydraulicBoundaryLocation2 = new TestHydraulicBoundaryLocation();
 
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
@@ -157,7 +157,7 @@
         {
             // Setup
             var random = new Random();
-            TestHydraulicBoundaryLocation hydraulicBoundaryLocation = TestHydraulicBoundaryLocation.CreateFullyCalculated();
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
             {
                 HydraulicBoundaryDatabase =
@@ -235,8 +235,6 @@
 
             AssertHydraulicBoundaryOutput(assessmentSection, hydraulicBoundaryLocation, true);
             AssertHydraulicBoundaryOutput(assessmentSection.GrassCoverErosionOutwards, hydraulicBoundaryLocation, true);
-            Assert.IsTrue(hydraulicBoundaryLocation.WaveHeightCalculation1.HasOutput);
-            Assert.IsTrue(hydraulicBoundaryLocation.DesignWaterLevelCalculation1.HasOutput);
             Assert.IsTrue(pipingCalculation.HasOutput);
             Assert.IsTrue(grassCoverErosionInwardsCalculation.HasOutput);
             Assert.IsTrue(heightStructuresCalculation.HasOutput);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs
===================================================================
diff -u -r479b54f8d0ae25dd5585ee63d907199ae4c36108 -r421965c6cc8249febf0a72677c75d49a39078893
--- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs	(.../RingtoetsDataSynchronizationServiceTest.cs)	(revision 479b54f8d0ae25dd5585ee63d907199ae4c36108)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs	(.../RingtoetsDataSynchronizationServiceTest.cs)	(revision 421965c6cc8249febf0a72677c75d49a39078893)
@@ -396,7 +396,7 @@
         public void ClearHydraulicBoundaryLocationOutput_HydraulicBoundaryGrassCoverErosionOutwardsAndDuneLocations_ClearDataAndReturnAffectedLocations()
         {
             // Setup
-            HydraulicBoundaryLocation hydraulicBoundaryLocation1 = TestHydraulicBoundaryLocation.CreateFullyCalculated();
+            var hydraulicBoundaryLocation1 = new TestHydraulicBoundaryLocation();
             var hydraulicBoundaryLocation2 = new TestHydraulicBoundaryLocation();
             var duneLocation1 = new TestDuneLocation
             {
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsTestDataGeneratorTest.cs
===================================================================
diff -u -rf97178c04b09ba57d3a7c7b8b62b0bd8f5869c5c -r421965c6cc8249febf0a72677c75d49a39078893
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsTestDataGeneratorTest.cs	(.../MacroStabilityInwardsTestDataGeneratorTest.cs)	(revision f97178c04b09ba57d3a7c7b8b62b0bd8f5869c5c)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsTestDataGeneratorTest.cs	(.../MacroStabilityInwardsTestDataGeneratorTest.cs)	(revision 421965c6cc8249febf0a72677c75d49a39078893)
@@ -52,7 +52,7 @@
         {
             // Setup
             var failureMechanism = new MacroStabilityInwardsFailureMechanism();
-            HydraulicBoundaryLocation hydraulicBoundaryLocation = TestHydraulicBoundaryLocation.CreateFullyCalculated();
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
 
             // Call
             MacroStabilityInwardsTestDataGenerator.ConfigureFailureMechanismWithAllCalculationConfigurations(failureMechanism, hydraulicBoundaryLocation);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/PipingTestDataGeneratorTest.cs
===================================================================
diff -u -r45f6ed59c0f37f734395a471935982318d8bf9cf -r421965c6cc8249febf0a72677c75d49a39078893
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/PipingTestDataGeneratorTest.cs	(.../PipingTestDataGeneratorTest.cs)	(revision 45f6ed59c0f37f734395a471935982318d8bf9cf)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/PipingTestDataGeneratorTest.cs	(.../PipingTestDataGeneratorTest.cs)	(revision 421965c6cc8249febf0a72677c75d49a39078893)
@@ -52,7 +52,7 @@
         {
             // Setup
             var failureMechanism = new PipingFailureMechanism();
-            HydraulicBoundaryLocation hydraulicBoundaryLocation = TestHydraulicBoundaryLocation.CreateFullyCalculated();
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
 
             // Call
             PipingTestDataGenerator.ConfigureFailureMechanismWithAllCalculationConfigurations(failureMechanism, hydraulicBoundaryLocation);