Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/NormPropertiesIntegrationTest.cs
===================================================================
diff -u -r276e267f0192dc6c4c3a23945ce19d370863a13b -rde7935d9c083905997851deebdf22b1aa3a6220e
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/NormPropertiesIntegrationTest.cs	(.../NormPropertiesIntegrationTest.cs)	(revision 276e267f0192dc6c4c3a23945ce19d370863a13b)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/NormPropertiesIntegrationTest.cs	(.../NormPropertiesIntegrationTest.cs)	(revision de7935d9c083905997851deebdf22b1aa3a6220e)
@@ -335,12 +335,12 @@
                                            bool expectUpdateObserver = true)
         {
             AttachObserver(mockRepository,
-                           assessmentSection.WaterLevelCalculationsForSignalingNorm
+                           assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm
                                             .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation)),
                            expectUpdateObserver);
 
             AttachObserver(mockRepository,
-                           assessmentSection.WaterLevelCalculationsForLowerLimitNorm
+                           assessmentSection.WaterLevelCalculationsForSignalingNorm
                                             .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation)),
                            expectUpdateObserver);
 
@@ -355,12 +355,12 @@
                            expectUpdateObserver);
 
             AttachObserver(mockRepository,
-                           assessmentSection.WaveHeightCalculationsForSignalingNorm
+                           assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm
                                             .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation)),
                            expectUpdateObserver);
 
             AttachObserver(mockRepository,
-                           assessmentSection.WaveHeightCalculationsForLowerLimitNorm
+                           assessmentSection.WaveHeightCalculationsForSignalingNorm
                                             .First(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation)),
                            expectUpdateObserver);
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtil.Test/TestDataGeneratorTest.cs
===================================================================
diff -u -r849b3b49bf8ccc18b170e2356461d882417f19fe -rde7935d9c083905997851deebdf22b1aa3a6220e
--- Ringtoets/Integration/test/Ringtoets.Integration.TestUtil.Test/TestDataGeneratorTest.cs	(.../TestDataGeneratorTest.cs)	(revision 849b3b49bf8ccc18b170e2356461d882417f19fe)
+++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtil.Test/TestDataGeneratorTest.cs	(.../TestDataGeneratorTest.cs)	(revision de7935d9c083905997851deebdf22b1aa3a6220e)
@@ -161,17 +161,14 @@
 
         private static void AssertHydraulicBoundaryLocationOutput(AssessmentSection assessmentSection, bool hasOutput)
         {
-            foreach (HydraulicBoundaryLocation location in assessmentSection.HydraulicBoundaryDatabase.Locations)
-            {
-                Assert.AreEqual(hasOutput, location.DesignWaterLevelCalculation1.HasOutput);
-                Assert.AreEqual(hasOutput, location.DesignWaterLevelCalculation2.HasOutput);
-                Assert.AreEqual(hasOutput, location.DesignWaterLevelCalculation3.HasOutput);
-                Assert.AreEqual(hasOutput, location.DesignWaterLevelCalculation4.HasOutput);
-                Assert.AreEqual(hasOutput, location.WaveHeightCalculation1.HasOutput);
-                Assert.AreEqual(hasOutput, location.WaveHeightCalculation2.HasOutput);
-                Assert.AreEqual(hasOutput, location.WaveHeightCalculation3.HasOutput);
-                Assert.AreEqual(hasOutput, location.WaveHeightCalculation4.HasOutput);
-            }
+            Assert.IsTrue(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm.All(c => !c.HasOutput));
+            Assert.IsTrue(assessmentSection.WaterLevelCalculationsForSignalingNorm.All(c => !c.HasOutput));
+            Assert.IsTrue(assessmentSection.WaterLevelCalculationsForLowerLimitNorm.All(c => !c.HasOutput));
+            Assert.IsTrue(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm.All(c => !c.HasOutput));
+            Assert.IsTrue(assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm.All(c => !c.HasOutput));
+            Assert.IsTrue(assessmentSection.WaveHeightCalculationsForSignalingNorm.All(c => !c.HasOutput));
+            Assert.IsTrue(assessmentSection.WaveHeightCalculationsForLowerLimitNorm.All(c => !c.HasOutput));
+            Assert.IsTrue(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm.All(c => !c.HasOutput));
 
             foreach (HydraulicBoundaryLocation location in assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations)
             {