Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestHydraulicBoundaryLocationTest.cs
===================================================================
diff -u -r2ab89f4256cd77d3386c27ca1cbd49a16f4abba2 -r358e0684c5e5efa701a9a4c80fda01defb237949
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestHydraulicBoundaryLocationTest.cs	(.../TestHydraulicBoundaryLocationTest.cs)	(revision 2ab89f4256cd77d3386c27ca1cbd49a16f4abba2)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestHydraulicBoundaryLocationTest.cs	(.../TestHydraulicBoundaryLocationTest.cs)	(revision 358e0684c5e5efa701a9a4c80fda01defb237949)
@@ -41,13 +41,7 @@
             Assert.AreEqual(new Point2D(0, 0), testLocation.Location);
 
             Assert.IsNull(testLocation.DesignWaterLevelCalculation1.Output);
-            Assert.IsNull(testLocation.DesignWaterLevelCalculation2.Output);
-            Assert.IsNull(testLocation.DesignWaterLevelCalculation3.Output);
-            Assert.IsNull(testLocation.DesignWaterLevelCalculation4.Output);
             Assert.IsNull(testLocation.WaveHeightCalculation1.Output);
-            Assert.IsNull(testLocation.WaveHeightCalculation2.Output);
-            Assert.IsNull(testLocation.WaveHeightCalculation3.Output);
-            Assert.IsNull(testLocation.WaveHeightCalculation4.Output);
         }
 
         [Test]
@@ -66,13 +60,7 @@
             Assert.AreEqual(new Point2D(0, 0), testLocation.Location);
 
             Assert.IsNull(testLocation.DesignWaterLevelCalculation1.Output);
-            Assert.IsNull(testLocation.DesignWaterLevelCalculation2.Output);
-            Assert.IsNull(testLocation.DesignWaterLevelCalculation3.Output);
-            Assert.IsNull(testLocation.DesignWaterLevelCalculation4.Output);
             Assert.IsNull(testLocation.WaveHeightCalculation1.Output);
-            Assert.IsNull(testLocation.WaveHeightCalculation2.Output);
-            Assert.IsNull(testLocation.WaveHeightCalculation3.Output);
-            Assert.IsNull(testLocation.WaveHeightCalculation4.Output);
         }
 
         [Test]
@@ -88,13 +76,7 @@
             Assert.AreEqual(new Point2D(0, 0), testLocation.Location);
 
             AssertCalculationHasOutput(4.5, testLocation.DesignWaterLevelCalculation1);
-            Assert.IsNull(testLocation.DesignWaterLevelCalculation2.Output);
-            Assert.IsNull(testLocation.DesignWaterLevelCalculation3.Output);
-            Assert.IsNull(testLocation.DesignWaterLevelCalculation4.Output);
             AssertCalculationHasOutput(5.5, testLocation.WaveHeightCalculation1);
-            Assert.IsNull(testLocation.WaveHeightCalculation2.Output);
-            Assert.IsNull(testLocation.WaveHeightCalculation3.Output);
-            Assert.IsNull(testLocation.WaveHeightCalculation4.Output);
         }
 
         private static void AssertCalculationHasOutput(double value, HydraulicBoundaryLocationCalculation calculation)
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/NormPropertiesIntegrationTest.cs
===================================================================
diff -u -rde7935d9c083905997851deebdf22b1aa3a6220e -r358e0684c5e5efa701a9a4c80fda01defb237949
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/NormPropertiesIntegrationTest.cs	(.../NormPropertiesIntegrationTest.cs)	(revision de7935d9c083905997851deebdf22b1aa3a6220e)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/NormPropertiesIntegrationTest.cs	(.../NormPropertiesIntegrationTest.cs)	(revision 358e0684c5e5efa701a9a4c80fda01defb237949)
@@ -422,13 +422,7 @@
         private static void AssertHydraulicBoundaryLocationOutputCleared(HydraulicBoundaryLocation hydraulicBoundaryLocation)
         {
             Assert.IsFalse(hydraulicBoundaryLocation.WaveHeightCalculation1.HasOutput);
-            Assert.IsFalse(hydraulicBoundaryLocation.WaveHeightCalculation2.HasOutput);
-            Assert.IsFalse(hydraulicBoundaryLocation.WaveHeightCalculation3.HasOutput);
-            Assert.IsFalse(hydraulicBoundaryLocation.WaveHeightCalculation4.HasOutput);
             Assert.IsFalse(hydraulicBoundaryLocation.DesignWaterLevelCalculation1.HasOutput);
-            Assert.IsFalse(hydraulicBoundaryLocation.DesignWaterLevelCalculation2.HasOutput);
-            Assert.IsFalse(hydraulicBoundaryLocation.DesignWaterLevelCalculation3.HasOutput);
-            Assert.IsFalse(hydraulicBoundaryLocation.DesignWaterLevelCalculation4.HasOutput);
         }
 
         private static void AssertNormValues(NormProperties properties, FailureMechanismContribution failureMechanismContribution)