Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs
===================================================================
diff -u -rfc4f8f86955f675f94208db783c8d0624d2b2250 -r3e2b418a9bbc27e2e990b15325b1350e6d56dc3d
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs	(.../HeightStructuresCalculationServiceTest.cs)	(revision fc4f8f86955f675f94208db783c8d0624d2b2250)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs	(.../HeightStructuresCalculationServiceTest.cs)	(revision 3e2b418a9bbc27e2e990b15325b1350e6d56dc3d)
@@ -504,20 +504,17 @@
             {
                 InputParameters =
                 {
-                    HydraulicBoundaryLocation = assessmentSectionStub.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001)
+                    HydraulicBoundaryLocation = assessmentSectionStub.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001),
+                    Structure = new TestHeightStructure()
                 }
             };
 
-            var failureMechanismSection = heightStructuresFailureMechanism.Sections.First();
-
             string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
 
             // Call
             Action call = () => new HeightStructuresCalculationService().Calculate(calculation,
                                                                                    assessmentSectionStub,
-                                                                                   failureMechanismSection,
-                                                                                   heightStructuresFailureMechanism.GeneralInput,
-                                                                                   heightStructuresFailureMechanism.Contribution,
+                                                                                   heightStructuresFailureMechanism,
                                                                                    validFilePath);
 
             // Assert
@@ -554,11 +551,11 @@
             {
                 InputParameters =
                 {
-                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test", 1, 1)
+                    HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test", 1, 1),
+                    Structure = new TestHeightStructure()
                 }
             };
 
-            var failureMechanismSection = heightStructuresFailureMechanism.Sections.First();
             var exception = false;
 
             // Call
@@ -568,9 +565,7 @@
                 {
                     new HeightStructuresCalculationService().Calculate(calculation,
                                                                        assessmentSectionStub,
-                                                                       failureMechanismSection,
-                                                                       heightStructuresFailureMechanism.GeneralInput,
-                                                                       heightStructuresFailureMechanism.Contribution,
+                                                                       heightStructuresFailureMechanism,
                                                                        testDataPath);
                 }
                 catch
@@ -619,7 +614,8 @@
             {
                 InputParameters =
                 {
-                    HydraulicBoundaryLocation = assessmentSectionStub.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001)
+                    HydraulicBoundaryLocation = assessmentSectionStub.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001),
+                    Structure = new TestHeightStructure()
                 }
             };
 
@@ -644,9 +640,7 @@
                 // Call
                 new HeightStructuresCalculationService().Calculate(calculation,
                                                                    assessmentSectionStub,
-                                                                   failureMechanismSection,
-                                                                   heightStructuresFailureMechanism.GeneralInput,
-                                                                   heightStructuresFailureMechanism.Contribution,
+                                                                   heightStructuresFailureMechanism,
                                                                    validFilePath);
 
                 // Assert
@@ -705,12 +699,11 @@
             {
                 InputParameters =
                 {
-                    HydraulicBoundaryLocation = assessmentSectionStub.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001)
+                    HydraulicBoundaryLocation = assessmentSectionStub.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001), 
+                    Structure = new TestHeightStructure()
                 }
             };
 
-            FailureMechanismSection failureMechanismSection = heightStructuresFailureMechanism.Sections.First();
-
             using (new HydraRingCalculatorFactoryConfig())
             {
                 var testStructuresOvertoppingCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).StructuresOvertoppingCalculator;
@@ -720,9 +713,7 @@
                 // Call
                 service.Calculate(calculation,
                                   assessmentSectionStub,
-                                  failureMechanismSection,
-                                  heightStructuresFailureMechanism.GeneralInput,
-                                  heightStructuresFailureMechanism.Contribution,
+                                  heightStructuresFailureMechanism,
                                   testDataPath);
 
                 // Assert