Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismContributionPropertiesIntegrationTest.cs
===================================================================
diff -u -r89eae73f8976ca604e84498de97ed59d5ae1c4bf -r26d6bbe7a5d0881fcdfd7723f7d9d0bfb8a0c742
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismContributionPropertiesIntegrationTest.cs	(.../FailureMechanismContributionPropertiesIntegrationTest.cs)	(revision 89eae73f8976ca604e84498de97ed59d5ae1c4bf)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/FailureMechanismContributionPropertiesIntegrationTest.cs	(.../FailureMechanismContributionPropertiesIntegrationTest.cs)	(revision 26d6bbe7a5d0881fcdfd7723f7d9d0bfb8a0c742)
@@ -173,7 +173,41 @@
         private void ChangeValueNoPermissionGivenAndVerifyNoNotificationsAndOutputForAllDataSet(Action<FailureMechanismContributionProperties> setPropertyAction)
         {
             // Setup
-            TestHydraulicBoundaryLocation hydraulicBoundaryLocation = TestHydraulicBoundaryLocation.CreateFullyCalculated();
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation
+            {
+                DesignWaterLevelCalculation1 =
+                {
+                    Output = new TestHydraulicBoundaryLocationOutput(1.1)
+                },
+                DesignWaterLevelCalculation2 =
+                {
+                    Output = new TestHydraulicBoundaryLocationOutput(2.2)
+                },
+                DesignWaterLevelCalculation3 =
+                {
+                    Output = new TestHydraulicBoundaryLocationOutput(3.3)
+                },
+                DesignWaterLevelCalculation4 =
+                {
+                    Output = new TestHydraulicBoundaryLocationOutput(4.4)
+                },
+                WaveHeightCalculation1 =
+                {
+                    Output = new TestHydraulicBoundaryLocationOutput(5.5)
+                },
+                WaveHeightCalculation2 =
+                {
+                    Output = new TestHydraulicBoundaryLocationOutput(6.6)
+                },
+                WaveHeightCalculation3 =
+                {
+                    Output = new TestHydraulicBoundaryLocationOutput(7.7)
+                },
+                WaveHeightCalculation4 =
+                {
+                    Output = new TestHydraulicBoundaryLocationOutput(8.8)
+                }
+            };
 
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike)
             {
@@ -270,7 +304,13 @@
             Assert.AreEqual(originalNorm, failureMechanismContribution.Norm);
 
             Assert.IsTrue(hydraulicBoundaryLocation.WaveHeightCalculation1.HasOutput);
+            Assert.IsTrue(hydraulicBoundaryLocation.WaveHeightCalculation2.HasOutput);
+            Assert.IsTrue(hydraulicBoundaryLocation.WaveHeightCalculation3.HasOutput);
+            Assert.IsTrue(hydraulicBoundaryLocation.WaveHeightCalculation4.HasOutput);
             Assert.IsTrue(hydraulicBoundaryLocation.DesignWaterLevelCalculation1.HasOutput);
+            Assert.IsTrue(hydraulicBoundaryLocation.DesignWaterLevelCalculation2.HasOutput);
+            Assert.IsTrue(hydraulicBoundaryLocation.DesignWaterLevelCalculation3.HasOutput);
+            Assert.IsTrue(hydraulicBoundaryLocation.DesignWaterLevelCalculation4.HasOutput);
             Assert.IsTrue(grassCoverErosionOutwardsHydraulicBoundaryLocation.WaveHeightCalculation1.HasOutput);
             Assert.IsTrue(grassCoverErosionOutwardsHydraulicBoundaryLocation.DesignWaterLevelCalculation1.HasOutput);
             Assert.IsNotNull(pipingCalculation.Output);
@@ -800,7 +840,13 @@
         private static void AssertHydraulicBoundaryLocationOutputClear(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(FailureMechanismContributionProperties properties, FailureMechanismContribution failureMechanismContribution)
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs
===================================================================
diff -u -rc0532d07766ecad2566f7cfa4a97a9aeb6e8540c -r26d6bbe7a5d0881fcdfd7723f7d9d0bfb8a0c742
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs	(.../AssessmentSectionViewTest.cs)	(revision c0532d07766ecad2566f7cfa4a97a9aeb6e8540c)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs	(.../AssessmentSectionViewTest.cs)	(revision 26d6bbe7a5d0881fcdfd7723f7d9d0bfb8a0c742)
@@ -235,7 +235,13 @@
 
                 // When
                 hydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble());
+                hydraulicBoundaryLocation.DesignWaterLevelCalculation2.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble());
+                hydraulicBoundaryLocation.DesignWaterLevelCalculation3.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble());
+                hydraulicBoundaryLocation.DesignWaterLevelCalculation4.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble());
                 hydraulicBoundaryLocation.WaveHeightCalculation1.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble());
+                hydraulicBoundaryLocation.WaveHeightCalculation2.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble());
+                hydraulicBoundaryLocation.WaveHeightCalculation3.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble());
+                hydraulicBoundaryLocation.WaveHeightCalculation4.Output = new TestHydraulicBoundaryLocationOutput(random.NextDouble());
                 hydraulicBoundaryLocation.NotifyObservers();
 
                 // Then