Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs
===================================================================
diff -u -r3779c7f7d030999a59cdbaa73e805f1e4e98165c -r9cd1f99915772a8d9990c31e281b70dd663b4e2d
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs	(.../HeightStructuresCalculationServiceTest.cs)	(revision 3779c7f7d030999a59cdbaa73e805f1e4e98165c)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs	(.../HeightStructuresCalculationServiceTest.cs)	(revision 9cd1f99915772a8d9990c31e281b70dd663b4e2d)
@@ -67,11 +67,11 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(new HeightStructuresFailureMechanism(), mockRepository);
+            IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(new HeightStructuresFailureMechanism(),
+                                                                                                       mockRepository,
+                                                                                                       validFilePath);
             mockRepository.ReplayAll();
 
-            assessmentSection.HydraulicBoundaryDatabase.FilePath = validFilePath;
-
             const string expectedValidationMessage = "De waarde voor 'oriëntatie' moet een concreet getal zijn.";
 
             var calculation = new TestHeightStructuresCalculation
@@ -110,11 +110,10 @@
             // Setup
             var mockRepository = new MockRepository();
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(new HeightStructuresFailureMechanism(),
-                                                                                                       mockRepository);
+                                                                                                       mockRepository,
+                                                                                                       validFilePath);
             mockRepository.ReplayAll();
 
-            assessmentSection.HydraulicBoundaryDatabase.FilePath = validFilePath;
-
             string expectedValidationMessage = $"De verwachtingswaarde voor '{parameterName}' moet een concreet getal zijn.";
 
             var calculation = new TestHeightStructuresCalculation
@@ -154,11 +153,11 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(new HeightStructuresFailureMechanism(), mockRepository);
+            IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(new HeightStructuresFailureMechanism(),
+                                                                                                       mockRepository,
+                                                                                                       validFilePath);
             mockRepository.ReplayAll();
 
-            assessmentSection.HydraulicBoundaryDatabase.FilePath = validFilePath;
-
             string expectedValidationMessage = $"De verwachtingswaarde voor '{parameterName}' moet een positief getal zijn.";
 
             var calculation = new TestHeightStructuresCalculation
@@ -201,11 +200,11 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(new HeightStructuresFailureMechanism(), mockRepository);
+            IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(new HeightStructuresFailureMechanism(),
+                                                                                                       mockRepository,
+                                                                                                       validFilePath);
             mockRepository.ReplayAll();
 
-            assessmentSection.HydraulicBoundaryDatabase.FilePath = validFilePath;
-
             string expectedValidationMessage = $"De standaardafwijking voor '{parameterName}' moet groter zijn dan of gelijk zijn aan 0.";
 
             var calculation = new TestHeightStructuresCalculation
@@ -247,11 +246,11 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(new HeightStructuresFailureMechanism(), mockRepository);
+            IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(new HeightStructuresFailureMechanism(),
+                                                                                                       mockRepository,
+                                                                                                       validFilePath);
             mockRepository.ReplayAll();
 
-            assessmentSection.HydraulicBoundaryDatabase.FilePath = validFilePath;
-
             string expectedValidationMessage = $"De variatiecoëfficiënt voor '{parameterName}' moet groter zijn dan of gelijk zijn aan 0.";
 
             var calculation = new TestHeightStructuresCalculation
@@ -292,11 +291,11 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(new HeightStructuresFailureMechanism(), mockRepository);
+            IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(new HeightStructuresFailureMechanism(),
+                                                                                                       mockRepository,
+                                                                                                       validFilePath);
             mockRepository.ReplayAll();
 
-            assessmentSection.HydraulicBoundaryDatabase.FilePath = validFilePath;
-
             var calculation = new TestHeightStructuresCalculation
             {
                 InputParameters =
@@ -330,11 +329,11 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(new HeightStructuresFailureMechanism(), mockRepository);
+            IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(new HeightStructuresFailureMechanism(),
+                                                                                                       mockRepository,
+                                                                                                       validFilePath);
             mockRepository.ReplayAll();
 
-            assessmentSection.HydraulicBoundaryDatabase.FilePath = validFilePath;
-
             var calculation = new TestHeightStructuresCalculation
             {
                 InputParameters =
@@ -408,9 +407,6 @@
             {
                 Action call = () => new HeightStructuresCalculationService().Calculate(calculation,
                                                                                        failureMechanism.GeneralInput,
-                                                                                       failureMechanism.GeneralInput.N,
-                                                                                       assessmentSection.FailureMechanismContribution.Norm,
-                                                                                       failureMechanism.Contribution,
                                                                                        validFilePath,
                                                                                        validPreprocessorDirectory);
 
@@ -463,9 +459,6 @@
             {
                 Action call = () => new HeightStructuresCalculationService().Calculate(calculation,
                                                                                        failureMechanism.GeneralInput,
-                                                                                       failureMechanism.GeneralInput.N,
-                                                                                       assessmentSection.FailureMechanismContribution.Norm,
-                                                                                       failureMechanism.Contribution,
                                                                                        validFilePath,
                                                                                        validPreprocessorDirectory);
 
@@ -518,9 +511,6 @@
                 // Call
                 new HeightStructuresCalculationService().Calculate(calculation,
                                                                    failureMechanism.GeneralInput,
-                                                                   failureMechanism.GeneralInput.N,
-                                                                   assessmentSection.FailureMechanismContribution.Norm,
-                                                                   failureMechanism.Contribution,
                                                                    validFilePath,
                                                                    validPreprocessorDirectory);
 
@@ -596,9 +586,6 @@
                 // Call
                 new HeightStructuresCalculationService().Calculate(calculation,
                                                                    failureMechanism.GeneralInput,
-                                                                   failureMechanism.GeneralInput.N,
-                                                                   assessmentSection.FailureMechanismContribution.Norm,
-                                                                   failureMechanism.Contribution,
                                                                    validFilePath,
                                                                    validPreprocessorDirectory);
 
@@ -675,9 +662,6 @@
                     {
                         new HeightStructuresCalculationService().Calculate(calculation,
                                                                            failureMechanism.GeneralInput,
-                                                                           failureMechanism.GeneralInput.N,
-                                                                           assessmentSection.FailureMechanismContribution.Norm,
-                                                                           failureMechanism.Contribution,
                                                                            validFilePath,
                                                                            validPreprocessorDirectory);
                     }
@@ -741,9 +725,6 @@
                     {
                         new HeightStructuresCalculationService().Calculate(calculation,
                                                                            failureMechanism.GeneralInput,
-                                                                           failureMechanism.GeneralInput.N,
-                                                                           assessmentSection.FailureMechanismContribution.Norm,
-                                                                           failureMechanism.Contribution,
                                                                            validFilePath,
                                                                            validPreprocessorDirectory);
                     }
@@ -808,9 +789,6 @@
                     {
                         new HeightStructuresCalculationService().Calculate(calculation,
                                                                            failureMechanism.GeneralInput,
-                                                                           failureMechanism.GeneralInput.N,
-                                                                           assessmentSection.FailureMechanismContribution.Norm,
-                                                                           failureMechanism.Contribution,
                                                                            validFilePath,
                                                                            validPreprocessorDirectory);
                     }
@@ -871,9 +849,6 @@
                 // Call
                 new HeightStructuresCalculationService().Calculate(calculation,
                                                                    failureMechanism.GeneralInput,
-                                                                   failureMechanism.GeneralInput.N,
-                                                                   assessmentSection.FailureMechanismContribution.Norm,
-                                                                   failureMechanism.Contribution,
                                                                    validFilePath,
                                                                    preprocessorDirectory);