Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs
===================================================================
diff -u -r045755f96d4c3083f4194d49d3639d0634231a03 -r3c5ebba1960e62145fdf5ca05f7efcf3e99cf6f5
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs	(.../ClosingStructuresCalculationServiceTest.cs)	(revision 045755f96d4c3083f4194d49d3639d0634231a03)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs	(.../ClosingStructuresCalculationServiceTest.cs)	(revision 3c5ebba1960e62145fdf5ca05f7efcf3e99cf6f5)
@@ -557,7 +557,6 @@
                     input.FailureProbabilityReparation,
                     input.IdenticalApertures,
                     input.AllowedLevelIncreaseStorage.Mean, input.AllowedLevelIncreaseStorage.StandardDeviation,
-                    generalInput.ModelFactorStorageVolume.Mean, generalInput.ModelFactorStorageVolume.StandardDeviation,
                     input.StorageStructureArea.Mean, input.StorageStructureArea.CoefficientOfVariation,
                     generalInput.ModelFactorInflowVolume,
                     input.FlowWidthAtBottomProtection.Mean, input.FlowWidthAtBottomProtection.StandardDeviation,
@@ -638,7 +637,6 @@
                     input.FailureProbabilityReparation,
                     input.IdenticalApertures,
                     input.AllowedLevelIncreaseStorage.Mean, input.AllowedLevelIncreaseStorage.StandardDeviation,
-                    generalInput.ModelFactorStorageVolume.Mean, generalInput.ModelFactorStorageVolume.StandardDeviation,
                     input.StorageStructureArea.Mean, input.StorageStructureArea.CoefficientOfVariation,
                     generalInput.ModelFactorInflowVolume,
                     input.FlowWidthAtBottomProtection.Mean, input.FlowWidthAtBottomProtection.StandardDeviation,
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs
===================================================================
diff -u -r045755f96d4c3083f4194d49d3639d0634231a03 -r3c5ebba1960e62145fdf5ca05f7efcf3e99cf6f5
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs	(.../StabilityPointStructuresCalculationServiceTest.cs)	(revision 045755f96d4c3083f4194d49d3639d0634231a03)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs	(.../StabilityPointStructuresCalculationServiceTest.cs)	(revision 3c5ebba1960e62145fdf5ca05f7efcf3e99cf6f5)
@@ -540,8 +540,6 @@
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
 
             var mockRepository = new MockRepository();
-            IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism,
-                                                                                                       mockRepository);
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             mockRepository.ReplayAll();
 
@@ -630,8 +628,6 @@
                     input.LevelCrestStructure.StandardDeviation,
                     input.StructureNormalOrientation,
                     input.FactorStormDurationOpenStructure,
-                    generalInput.ModelFactorSubCriticalFlow.Mean,
-                    generalInput.ModelFactorSubCriticalFlow.CoefficientOfVariation,
                     input.ThresholdHeightOpenWeir.Mean,
                     input.ThresholdHeightOpenWeir.StandardDeviation,
                     input.InsideWaterLevelFailureConstruction.Mean,
@@ -751,8 +747,6 @@
                     input.LevelCrestStructure.StandardDeviation,
                     input.StructureNormalOrientation,
                     input.FactorStormDurationOpenStructure,
-                    generalInput.ModelFactorSubCriticalFlow.Mean,
-                    generalInput.ModelFactorSubCriticalFlow.CoefficientOfVariation,
                     input.ThresholdHeightOpenWeir.Mean,
                     input.ThresholdHeightOpenWeir.StandardDeviation,
                     input.InsideWaterLevelFailureConstruction.Mean,
@@ -869,8 +863,6 @@
                     input.LevelCrestStructure.StandardDeviation,
                     input.StructureNormalOrientation,
                     input.FactorStormDurationOpenStructure,
-                    generalInput.ModelFactorSubCriticalFlow.Mean,
-                    generalInput.ModelFactorSubCriticalFlow.CoefficientOfVariation,
                     input.ThresholdHeightOpenWeir.Mean,
                     input.ThresholdHeightOpenWeir.StandardDeviation,
                     input.InsideWaterLevelFailureConstruction.Mean,
@@ -990,8 +982,6 @@
                     input.LevelCrestStructure.StandardDeviation,
                     input.StructureNormalOrientation,
                     input.FactorStormDurationOpenStructure,
-                    generalInput.ModelFactorSubCriticalFlow.Mean,
-                    generalInput.ModelFactorSubCriticalFlow.CoefficientOfVariation,
                     input.ThresholdHeightOpenWeir.Mean,
                     input.ThresholdHeightOpenWeir.StandardDeviation,
                     input.InsideWaterLevelFailureConstruction.Mean,
@@ -1108,8 +1098,6 @@
                     input.LevelCrestStructure.StandardDeviation,
                     input.StructureNormalOrientation,
                     input.FactorStormDurationOpenStructure,
-                    generalInput.ModelFactorSubCriticalFlow.Mean,
-                    generalInput.ModelFactorSubCriticalFlow.CoefficientOfVariation,
                     input.ThresholdHeightOpenWeir.Mean,
                     input.ThresholdHeightOpenWeir.StandardDeviation,
                     input.InsideWaterLevelFailureConstruction.Mean,
@@ -1229,8 +1217,6 @@
                     input.LevelCrestStructure.StandardDeviation,
                     input.StructureNormalOrientation,
                     input.FactorStormDurationOpenStructure,
-                    generalInput.ModelFactorSubCriticalFlow.Mean,
-                    generalInput.ModelFactorSubCriticalFlow.CoefficientOfVariation,
                     input.ThresholdHeightOpenWeir.Mean,
                     input.ThresholdHeightOpenWeir.StandardDeviation,
                     input.InsideWaterLevelFailureConstruction.Mean,
@@ -1347,8 +1333,6 @@
                     input.LevelCrestStructure.StandardDeviation,
                     input.StructureNormalOrientation,
                     input.FactorStormDurationOpenStructure,
-                    generalInput.ModelFactorSubCriticalFlow.Mean,
-                    generalInput.ModelFactorSubCriticalFlow.CoefficientOfVariation,
                     input.ThresholdHeightOpenWeir.Mean,
                     input.ThresholdHeightOpenWeir.StandardDeviation,
                     input.InsideWaterLevelFailureConstruction.Mean,
@@ -1468,8 +1452,6 @@
                     input.LevelCrestStructure.StandardDeviation,
                     input.StructureNormalOrientation,
                     input.FactorStormDurationOpenStructure,
-                    generalInput.ModelFactorSubCriticalFlow.Mean,
-                    generalInput.ModelFactorSubCriticalFlow.CoefficientOfVariation,
                     input.ThresholdHeightOpenWeir.Mean,
                     input.ThresholdHeightOpenWeir.StandardDeviation,
                     input.InsideWaterLevelFailureConstruction.Mean,