Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs
===================================================================
diff -u -rfc4f8f86955f675f94208db783c8d0624d2b2250 -r3e2b418a9bbc27e2e990b15325b1350e6d56dc3d
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs	(.../ClosingStructuresCalculationServiceTest.cs)	(revision fc4f8f86955f675f94208db783c8d0624d2b2250)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs	(.../ClosingStructuresCalculationServiceTest.cs)	(revision 3e2b418a9bbc27e2e990b15325b1350e6d56dc3d)
@@ -141,7 +141,6 @@
                 new Point2D(0, 0),
                 new Point2D(1, 1)
             }));
-            FailureMechanismSection failureMechanismSection = closingStructuresFailureMechanism.Sections.First();
 
             var calculation = new TestClosingStructuresCalculation()
             {
@@ -157,8 +156,9 @@
             using (new HydraRingCalculatorFactoryConfig())
             {
                 var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).StructuresClosureCalculator;
-                TestDelegate call = () => service.Calculate(calculation, assessmentSectionStub, failureMechanismSection,
-                                                            closingStructuresFailureMechanism.GeneralInput, closingStructuresFailureMechanism.Contribution,
+                TestDelegate call = () => service.Calculate(calculation,
+                                                            assessmentSectionStub,
+                                                            closingStructuresFailureMechanism,
                                                             testDataPath);
 
                 StructuresClosureCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray();
@@ -217,9 +217,7 @@
                 // Call
                 new ClosingStructuresCalculationService().Calculate(calculation,
                                                                     assessmentSectionStub,
-                                                                    failureMechanismSection,
-                                                                    closingStructuresFailureMechanism.GeneralInput,
-                                                                    closingStructuresFailureMechanism.Contribution,
+                                                                    closingStructuresFailureMechanism,
                                                                     validDataFilepath);
 
                 // Assert
@@ -312,9 +310,7 @@
                 // Call
                 new ClosingStructuresCalculationService().Calculate(calculation,
                                                                     assessmentSectionStub,
-                                                                    failureMechanismSection,
-                                                                    closingStructuresFailureMechanism.GeneralInput,
-                                                                    closingStructuresFailureMechanism.Contribution,
+                                                                    closingStructuresFailureMechanism,
                                                                     validDataFilepath);
 
                 // Assert
@@ -406,9 +402,7 @@
                 // Call
                 new ClosingStructuresCalculationService().Calculate(calculation,
                                                                     assessmentSectionStub,
-                                                                    failureMechanismSection,
-                                                                    closingStructuresFailureMechanism.GeneralInput,
-                                                                    closingStructuresFailureMechanism.Contribution,
+                                                                    closingStructuresFailureMechanism,
                                                                     validDataFilepath);
 
                 // Assert
@@ -477,14 +471,10 @@
                 }
             };
 
-            var failureMechanismSection = closingStructuresFailureMechanism.Sections.First();
-
             // Call
             Action call = () => new ClosingStructuresCalculationService().Calculate(calculation,
                                                                                     assessmentSectionStub,
-                                                                                    failureMechanismSection,
-                                                                                    closingStructuresFailureMechanism.GeneralInput,
-                                                                                    closingStructuresFailureMechanism.Contribution,
+                                                                                    closingStructuresFailureMechanism,
                                                                                     validDataFilepath);
 
             // Assert
@@ -528,7 +518,6 @@
                 }
             };
 
-            FailureMechanismSection failureMechanismSection = closingStructuresFailureMechanism.Sections.First();
             var exception = false;
 
             // Call
@@ -538,10 +527,8 @@
                 {
                     new ClosingStructuresCalculationService().Calculate(calculation,
                                                                         assessmentSectionStub,
-                                                                        failureMechanismSection,
-                                                                        closingStructuresFailureMechanism.GeneralInput,
-                                                                        closingStructuresFailureMechanism.Contribution,
-                                                                        validDataFilepath);
+                                                                        closingStructuresFailureMechanism,
+                                                                        testDataPath);
                 }
                 catch
                 {
@@ -580,8 +567,7 @@
                 new Point2D(0, 0),
                 new Point2D(1, 1)
             }));
-            FailureMechanismSection failureMechanismSection = closingStructuresFailureMechanism.Sections.First();
-
+  
             var calculation = new TestClosingStructuresCalculation()
             {
                 InputParameters =
@@ -599,10 +585,8 @@
                 // Call
                 service.Calculate(calculation,
                                   assessmentSectionStub,
-                                  failureMechanismSection,
-                                  closingStructuresFailureMechanism.GeneralInput,
-                                  closingStructuresFailureMechanism.Contribution,
-                                  validDataFilepath);
+                                  closingStructuresFailureMechanism,
+                                  testDataPath);
 
                 // Assert
                 Assert.IsNull(calculation.Output);