Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r26bd14a3e6900dd265bdea580e9c6f342593d9ef -rb91f96a49bcadf5cfe4e88ccebffa0463e3db370
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs)	(revision 26bd14a3e6900dd265bdea580e9c6f342593d9ef)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs)	(revision b91f96a49bcadf5cfe4e88ccebffa0463e3db370)
@@ -70,12 +70,11 @@
 
             StabilityStoneCoverWaveConditionsCalculation calculation = CreateValidCalculation(hydraulicBoundaryLocation);
 
-            var stabilityStoneCoverFailureMechanism = new StabilityStoneCoverFailureMechanism();
+            CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(
+                calculation,
+                new StabilityStoneCoverFailureMechanism(),
+                assessmentSection);
 
-            CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(calculation,
-                                                                                                                                  stabilityStoneCoverFailureMechanism,
-                                                                                                                                  assessmentSection);
-
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             mockRepository.ReplayAll();
@@ -112,12 +111,11 @@
             assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor = true;
             assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory = "InvalidPreprocessorDirectory";
 
-            var stabilityStoneCoverFailureMechanism = new StabilityStoneCoverFailureMechanism();
+            CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(
+                calculation,
+                new StabilityStoneCoverFailureMechanism(),
+                assessmentSection);
 
-            CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(calculation,
-                                                                                                                                  stabilityStoneCoverFailureMechanism,
-                                                                                                                                  assessmentSection);
-
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             mockRepository.ReplayAll();
@@ -152,12 +150,11 @@
 
             assessmentSection.FailureMechanismContribution.LowerLimitNorm = 0.1;
 
-            var stabilityStoneCoverFailureMechanism = new StabilityStoneCoverFailureMechanism();
+            CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(
+                calculation,
+                new StabilityStoneCoverFailureMechanism(),
+                assessmentSection);
 
-            CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(calculation,
-                                                                                                                                  stabilityStoneCoverFailureMechanism,
-                                                                                                                                  assessmentSection);
-
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             mockRepository.ReplayAll();
@@ -190,12 +187,11 @@
             IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput();
             StabilityStoneCoverWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First());
 
-            var stabilityStoneCoverFailureMechanism = new StabilityStoneCoverFailureMechanism();
+            CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(
+                calculation,
+                new StabilityStoneCoverFailureMechanism(),
+                assessmentSection);
 
-            CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(calculation,
-                                                                                                                                  stabilityStoneCoverFailureMechanism,
-                                                                                                                                  assessmentSection);
-
             RoundedDouble[] waterLevels = GetWaterLevels(calculation, assessmentSection).ToArray();
             int nrOfCalculators = waterLevels.Length * 2;
 
@@ -316,12 +312,11 @@
             IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput();
             StabilityStoneCoverWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First());
 
-            var stabilityStoneCoverFailureMechanism = new StabilityStoneCoverFailureMechanism();
+            CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(
+                calculation,
+                new StabilityStoneCoverFailureMechanism(),
+                assessmentSection);
 
-            CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(calculation,
-                                                                                                                                  stabilityStoneCoverFailureMechanism,
-                                                                                                                                  assessmentSection);
-
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             var calculator = new TestWaveConditionsCosineCalculator();
@@ -371,12 +366,11 @@
             IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput();
             StabilityStoneCoverWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First());
 
-            var stabilityStoneCoverFailureMechanism = new StabilityStoneCoverFailureMechanism();
+            CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(
+                calculation,
+                new StabilityStoneCoverFailureMechanism(),
+                assessmentSection);
 
-            CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(calculation,
-                                                                                                                                  stabilityStoneCoverFailureMechanism,
-                                                                                                                                  assessmentSection);
-
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, string.Empty))
@@ -439,12 +433,11 @@
             IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput();
             StabilityStoneCoverWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First());
 
-            var stabilityStoneCoverFailureMechanism = new StabilityStoneCoverFailureMechanism();
+            CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(
+                calculation,
+                new StabilityStoneCoverFailureMechanism(),
+                assessmentSection);
 
-            CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(calculation,
-                                                                                                                                  stabilityStoneCoverFailureMechanism,
-                                                                                                                                  assessmentSection);
-
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, string.Empty)).Return(new TestWaveConditionsCosineCalculator());
@@ -480,12 +473,11 @@
             IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput();
             StabilityStoneCoverWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First());
 
-            var stabilityStoneCoverFailureMechanism = new StabilityStoneCoverFailureMechanism();
+            CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(
+                calculation,
+                new StabilityStoneCoverFailureMechanism(),
+                assessmentSection);
 
-            CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(calculation,
-                                                                                                                                  stabilityStoneCoverFailureMechanism,
-                                                                                                                                  assessmentSection);
-
             int nrOfCalculators = GetWaterLevels(calculation, assessmentSection).Count() * 2;
 
             var mockRepository = new MockRepository();
@@ -521,12 +513,11 @@
             IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput();
             StabilityStoneCoverWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First());
 
-            var failureMechanism = new StabilityStoneCoverFailureMechanism();
+            CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(
+                calculation,
+                new StabilityStoneCoverFailureMechanism(),
+                assessmentSection);
 
-            CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(calculation,
-                                                                                                                                  failureMechanism,
-                                                                                                                                  assessmentSection);
-
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, string.Empty)).Return(new TestWaveConditionsCosineCalculator
@@ -559,12 +550,11 @@
             IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput();
             StabilityStoneCoverWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First());
 
-            var stabilityStoneCoverFailureMechanism = new StabilityStoneCoverFailureMechanism();
+            CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(
+                calculation,
+                new StabilityStoneCoverFailureMechanism(),
+                assessmentSection);
 
-            CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(calculation,
-                                                                                                                                  stabilityStoneCoverFailureMechanism,
-                                                                                                                                  assessmentSection);
-
             var mockRepository = new MockRepository();
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateWaveConditionsCosineCalculator(testDataPath, string.Empty)).Return(new TestWaveConditionsCosineCalculator
@@ -593,12 +583,11 @@
             IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput();
             StabilityStoneCoverWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First());
 
-            var stabilityStoneCoverFailureMechanism = new StabilityStoneCoverFailureMechanism();
+            CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(
+                calculation,
+                new StabilityStoneCoverFailureMechanism(),
+                assessmentSection);
 
-            CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(calculation,
-                                                                                                                                  stabilityStoneCoverFailureMechanism,
-                                                                                                                                  assessmentSection);
-
             int nrOfCalculators = GetWaterLevels(calculation, assessmentSection).Count() * 2;
 
             var mockRepository = new MockRepository();
@@ -626,15 +615,14 @@
             IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput();
             StabilityStoneCoverWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First());
 
-            var stabilityStoneCoverFailureMechanism = new StabilityStoneCoverFailureMechanism();
-
             assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true;
             assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor = true;
             assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory = validPreprocessorDirectory;
 
-            CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(calculation,
-                                                                                                                                  stabilityStoneCoverFailureMechanism,
-                                                                                                                                  assessmentSection);
+            CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(
+                calculation,
+                new StabilityStoneCoverFailureMechanism(),
+                assessmentSection);
             int nrOfCalculators = GetWaterLevels(calculation, assessmentSection).Count() * 2;
 
             var mockRepository = new MockRepository();
@@ -662,15 +650,14 @@
             IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput();
             StabilityStoneCoverWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First());
 
-            var stabilityStoneCoverFailureMechanism = new StabilityStoneCoverFailureMechanism();
-
             assessmentSection.HydraulicBoundaryDatabase.CanUsePreprocessor = true;
             assessmentSection.HydraulicBoundaryDatabase.UsePreprocessor = false;
             assessmentSection.HydraulicBoundaryDatabase.PreprocessorDirectory = "InvalidPreprocessorDirectory";
 
-            CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(calculation,
-                                                                                                                                  stabilityStoneCoverFailureMechanism,
-                                                                                                                                  assessmentSection);
+            CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity(
+                calculation,
+                new StabilityStoneCoverFailureMechanism(),
+                assessmentSection);
             int nrOfCalculators = GetWaterLevels(calculation, assessmentSection).Count() * 2;
 
             var mockRepository = new MockRepository();