Index: Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj
===================================================================
diff -u -r29590bf9ec9ced87e1fc0e124466238c4151def8 -rca40078fc6bbc0b5c4dab2629cb2ece30b06d425
--- Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj	(.../Ringtoets.Common.Data.csproj)	(revision 29590bf9ec9ced87e1fc0e124466238c4151def8)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj	(.../Ringtoets.Common.Data.csproj)	(revision ca40078fc6bbc0b5c4dab2629cb2ece30b06d425)
@@ -32,6 +32,7 @@
     <Compile Include="AssessmentSection\WellKnownBackgroundDataConfiguration.cs" />
     <Compile Include="AssessmentSection\WmtsBackgroundDataConfiguration.cs" />
     <Compile Include="Calculation\ICalculatable.cs" />
+    <Compile Include="Calculation\ICalculationInputWithLocation.cs" />
     <Compile Include="Comment.cs" />
     <Compile Include="Contribution\NormType.cs" />
     <Compile Include="DikeProfiles\BreakWater.cs" />
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -rf1d9e7cfbfff37c23c610fdc3430607d936d5e91 -rca40078fc6bbc0b5c4dab2629cb2ece30b06d425
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismAssemblyFactoryTest.cs	(.../MacroStabilityOutwardsFailureMechanismAssemblyFactoryTest.cs)	(revision f1d9e7cfbfff37c23c610fdc3430607d936d5e91)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismAssemblyFactoryTest.cs	(.../MacroStabilityOutwardsFailureMechanismAssemblyFactoryTest.cs)	(revision ca40078fc6bbc0b5c4dab2629cb2ece30b06d425)
@@ -899,7 +899,10 @@
         {
             // Setup
             var failureMechanism = new MacroStabilityOutwardsFailureMechanism();
-            failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
+            failureMechanism.AddSections(new[]
+            {
+                FailureMechanismSectionTestFactory.CreateFailureMechanismSection()
+            });
 
             var mocks = new MockRepository();
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks);
@@ -931,7 +934,10 @@
         {
             // Setup
             var failureMechanism = new MacroStabilityOutwardsFailureMechanism();
-            failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
+            failureMechanism.AddSections(new[]
+            {
+                FailureMechanismSectionTestFactory.CreateFailureMechanismSection()
+            });
             MacroStabilityOutwardsFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single();
             sectionResult.UseManualAssemblyCategoryGroup = true;
             sectionResult.ManualAssemblyCategoryGroup = new Random(39).NextEnumValue<FailureMechanismSectionAssemblyCategoryGroup>();
@@ -1019,7 +1025,10 @@
         {
             // Setup
             var failureMechanism = new MacroStabilityOutwardsFailureMechanism();
-            failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection());
+            failureMechanism.AddSections(new[]
+            {
+                FailureMechanismSectionTestFactory.CreateFailureMechanismSection()
+            });
 
             var mocks = new MockRepository();
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/MacroStabilityOutwardsFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rea7fd6455177ea93f8419e6a29fc00d1d3167359 -rca40078fc6bbc0b5c4dab2629cb2ece30b06d425
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/MacroStabilityOutwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../MacroStabilityOutwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision ea7fd6455177ea93f8419e6a29fc00d1d3167359)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/MacroStabilityOutwardsFailureMechanismContextTreeNodeInfoTest.cs	(.../MacroStabilityOutwardsFailureMechanismContextTreeNodeInfoTest.cs)	(revision ca40078fc6bbc0b5c4dab2629cb2ece30b06d425)
@@ -191,7 +191,7 @@
 
                 failureMechanismAssemblyCategoriesContext.GetFailureMechanismSectionAssemblyCategoriesFunc();
                 MacroStabilityOutwardsProbabilityAssessmentInput probabilityAssessmentInput = failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput;
-                Assert.AreEqual(probabilityAssessmentInput.GetN(probabilityAssessmentInput.SectionLength), calculator.AssemblyCategoriesInput.N);
+                Assert.AreEqual(probabilityAssessmentInput.GetN(probabilityAssessmentInput.SectionLength), calculator.FailureMechanismN);
             }
 
             var failureMechanismResultsContext = (FailureMechanismSectionResultContext<MacroStabilityOutwardsFailureMechanismSectionResult>)