Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs
===================================================================
diff -u -r3e0814af5f0045f57ab89723d8d55db530c8f6f5 -r009d53c570e69ba43b0a37c229a661b2b946ba9a
--- Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs	(.../AssessmentSectionCalculationActivityFactoryTest.cs)	(revision 3e0814af5f0045f57ab89723d8d55db530c8f6f5)
+++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs	(.../AssessmentSectionCalculationActivityFactoryTest.cs)	(revision 009d53c570e69ba43b0a37c229a661b2b946ba9a)
@@ -230,7 +230,7 @@
                                      HydraRingCalculationSettingsTestHelper.AssertHydraRingCalculationSettings(
                                          expectedCalculationSettings, (HydraRingCalculationSettings) invocation.Arguments[0]);
                                  })
-                                 .Return(new TestWaveHeightCalculator()).Repeat.Times(4);
+                                 .Return(new TestWaveHeightCalculator()).Repeat.Times(2);
 
                 calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(Arg<HydraRingCalculationSettings>.Is.NotNull))
                                  .WhenCalled(invocation =>
@@ -279,7 +279,7 @@
                 AssessmentSectionCalculationActivityFactory.CreateHydraulicLoadCalculationActivities(assessmentSection);
 
             // Assert
-            Assert.AreEqual(22, activities.Count());
+            Assert.AreEqual(20, activities.Count());
 
             using (new HydraRingCalculatorFactoryConfig(calculatorFactory))
             {
@@ -363,7 +363,7 @@
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation,
-                    CategoryType = AssessmentSectionCategoryType.FactorizedLowerLimitNorm,
+                    CategoryType = AssessmentSectionCategoryType.LowerLimitNorm,
                     UseForeshore = true,
                     UseBreakWater = true,
                     LowerBoundaryRevetment = (RoundedDouble) 1,
@@ -383,7 +383,7 @@
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation,
-                    CategoryType = AssessmentSectionCategoryType.FactorizedLowerLimitNorm,
+                    CategoryType = AssessmentSectionCategoryType.LowerLimitNorm,
                     UseForeshore = true,
                     UseBreakWater = true,
                     LowerBoundaryRevetment = (RoundedDouble) 1,
@@ -403,7 +403,7 @@
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation,
-                    CategoryType = FailureMechanismCategoryType.FactorizedLowerLimitNorm,
+                    CategoryType = FailureMechanismCategoryType.LowerLimitNorm,
                     UseBreakWater = true,
                     LowerBoundaryRevetment = (RoundedDouble) 1,
                     UpperBoundaryRevetment = (RoundedDouble) 3,