Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs
===================================================================
diff -u -r156b46b92a4beaf22dc59e628db19be5536468fc -r9cd1f99915772a8d9990c31e281b70dd663b4e2d
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs	(.../ClosingStructuresCalculationServiceTest.cs)	(revision 156b46b92a4beaf22dc59e628db19be5536468fc)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs	(.../ClosingStructuresCalculationServiceTest.cs)	(revision 9cd1f99915772a8d9990c31e281b70dd663b4e2d)
@@ -71,11 +71,10 @@
             // Setup 
             var mockRepository = new MockRepository();
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(new ClosingStructuresFailureMechanism(),
-                                                                                                       mockRepository);
+                                                                                                       mockRepository,
+                                                                                                       Path.Combine(testDataPath, "HRD dutch coast south.sqlite"));
             mockRepository.ReplayAll();
 
-            assessmentSection.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
-
             var calculation = new TestClosingStructuresCalculation();
 
             SetInvalidInputParameters(calculation.InputParameters, (RoundedDouble) value);
@@ -125,11 +124,10 @@
             // Setup 
             var mockRepository = new MockRepository();
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(new ClosingStructuresFailureMechanism(),
-                                                                                                       mockRepository);
+                                                                                                       mockRepository,
+                                                                                                       Path.Combine(testDataPath, "HRD dutch coast south.sqlite"));
             mockRepository.ReplayAll();
 
-            assessmentSection.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
-
             var calculation = new TestClosingStructuresCalculation
             {
                 InputParameters =
@@ -185,11 +183,10 @@
             // Setup 
             var mockRepository = new MockRepository();
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(new ClosingStructuresFailureMechanism(),
-                                                                                                       mockRepository);
+                                                                                                       mockRepository,
+                                                                                                       Path.Combine(testDataPath, "HRD dutch coast south.sqlite"));
             mockRepository.ReplayAll();
 
-            assessmentSection.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
-
             var calculation = new TestClosingStructuresCalculation
             {
                 InputParameters =
@@ -240,11 +237,10 @@
             // Setup 
             var mockRepository = new MockRepository();
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(new ClosingStructuresFailureMechanism(),
-                                                                                                       mockRepository);
+                                                                                                       mockRepository,
+                                                                                                       Path.Combine(testDataPath, "HRD dutch coast south.sqlite"));
             mockRepository.ReplayAll();
 
-            assessmentSection.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
-
             var calculation = new TestClosingStructuresCalculation
             {
                 InputParameters =
@@ -274,11 +270,11 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(new ClosingStructuresFailureMechanism(), mockRepository);
+            IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(new ClosingStructuresFailureMechanism(),
+                                                                                                       mockRepository,
+                                                                                                       Path.Combine(testDataPath, "HRD dutch coast south.sqlite"));
             mockRepository.ReplayAll();
 
-            assessmentSection.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
-
             var calculation = new TestClosingStructuresCalculation
             {
                 InputParameters =
@@ -313,15 +309,11 @@
         public void Calculate_InvalidInFlowModelType_ThrowsInvalidEnumArgumentException()
         {
             // Setup
-            var failureMechanism = new ClosingStructuresFailureMechanism();
-
             var mockRepository = new MockRepository();
-            IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism,
-                                                                                                       mockRepository);
-
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             mockRepository.ReplayAll();
 
+            var failureMechanism = new ClosingStructuresFailureMechanism();
             var calculation = new TestClosingStructuresCalculation
             {
                 InputParameters =
@@ -337,9 +329,6 @@
                 // Call
                 TestDelegate call = () => service.Calculate(calculation,
                                                             failureMechanism.GeneralInput,
-                                                            failureMechanism.GeneralInput.N,
-                                                            assessmentSection.FailureMechanismContribution.Norm,
-                                                            failureMechanism.Contribution,
                                                             validFilePath,
                                                             validPreprocessorDirectory);
 
@@ -388,9 +377,6 @@
                 // Call
                 new ClosingStructuresCalculationService().Calculate(calculation,
                                                                     failureMechanism.GeneralInput,
-                                                                    failureMechanism.GeneralInput.N,
-                                                                    assessmentSection.FailureMechanismContribution.Norm,
-                                                                    failureMechanism.Contribution,
                                                                     validFilePath,
                                                                     validPreprocessorDirectory);
 
@@ -472,9 +458,6 @@
                 // Call
                 new ClosingStructuresCalculationService().Calculate(calculation,
                                                                     failureMechanism.GeneralInput,
-                                                                    failureMechanism.GeneralInput.N,
-                                                                    assessmentSection.FailureMechanismContribution.Norm,
-                                                                    failureMechanism.Contribution,
                                                                     validFilePath,
                                                                     validPreprocessorDirectory);
 
@@ -554,9 +537,6 @@
                 // Call
                 new ClosingStructuresCalculationService().Calculate(calculation,
                                                                     failureMechanism.GeneralInput,
-                                                                    failureMechanism.GeneralInput.N,
-                                                                    assessmentSection.FailureMechanismContribution.Norm,
-                                                                    failureMechanism.Contribution,
                                                                     validFilePath,
                                                                     validPreprocessorDirectory);
 
@@ -638,9 +618,6 @@
                 // Call
                 new ClosingStructuresCalculationService().Calculate(calculation,
                                                                     failureMechanism.GeneralInput,
-                                                                    failureMechanism.GeneralInput.N,
-                                                                    assessmentSection.FailureMechanismContribution.Norm,
-                                                                    failureMechanism.Contribution,
                                                                     validFilePath,
                                                                     validPreprocessorDirectory);
 
@@ -718,9 +695,6 @@
                 // Call
                 new ClosingStructuresCalculationService().Calculate(calculation,
                                                                     failureMechanism.GeneralInput,
-                                                                    failureMechanism.GeneralInput.N,
-                                                                    assessmentSection.FailureMechanismContribution.Norm,
-                                                                    failureMechanism.Contribution,
                                                                     validFilePath,
                                                                     validPreprocessorDirectory);
 
@@ -799,9 +773,6 @@
                 // Call
                 new ClosingStructuresCalculationService().Calculate(calculation,
                                                                     failureMechanism.GeneralInput,
-                                                                    failureMechanism.GeneralInput.N,
-                                                                    assessmentSection.FailureMechanismContribution.Norm,
-                                                                    failureMechanism.Contribution,
                                                                     validFilePath,
                                                                     validPreprocessorDirectory);
 
@@ -874,9 +845,6 @@
                 // Call
                 new ClosingStructuresCalculationService().Calculate(calculation,
                                                                     failureMechanism.GeneralInput,
-                                                                    failureMechanism.GeneralInput.N,
-                                                                    assessmentSection.FailureMechanismContribution.Norm,
-                                                                    failureMechanism.Contribution,
                                                                     validFilePath,
                                                                     preprocessorDirectory);
 
@@ -939,9 +907,6 @@
             {
                 Action call = () => new ClosingStructuresCalculationService().Calculate(calculation,
                                                                                         failureMechanism.GeneralInput,
-                                                                                        failureMechanism.GeneralInput.N,
-                                                                                        assessmentSection.FailureMechanismContribution.Norm,
-                                                                                        failureMechanism.Contribution,
                                                                                         validFilePath,
                                                                                         validPreprocessorDirectory);
 
@@ -998,9 +963,6 @@
                     {
                         new ClosingStructuresCalculationService().Calculate(calculation,
                                                                             failureMechanism.GeneralInput,
-                                                                            failureMechanism.GeneralInput.N,
-                                                                            assessmentSection.FailureMechanismContribution.Norm,
-                                                                            failureMechanism.Contribution,
                                                                             validFilePath,
                                                                             validPreprocessorDirectory);
                     }
@@ -1063,9 +1025,6 @@
                     {
                         new ClosingStructuresCalculationService().Calculate(calculation,
                                                                             failureMechanism.GeneralInput,
-                                                                            failureMechanism.GeneralInput.N,
-                                                                            assessmentSection.FailureMechanismContribution.Norm,
-                                                                            failureMechanism.Contribution,
                                                                             validFilePath,
                                                                             validPreprocessorDirectory);
                     }
@@ -1130,9 +1089,6 @@
                     {
                         new ClosingStructuresCalculationService().Calculate(calculation,
                                                                             failureMechanism.GeneralInput,
-                                                                            failureMechanism.GeneralInput.N,
-                                                                            assessmentSection.FailureMechanismContribution.Norm,
-                                                                            failureMechanism.Contribution,
                                                                             validFilePath,
                                                                             validPreprocessorDirectory);
                     }