Index: Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj
===================================================================
diff -u -r4e9d3556e3cee0365fc0f26d0bad19b50594e12d -r3b1be2b494c30728564f41d6d8d14fc6a762957d
--- Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj	(.../Ringtoets.Common.Data.csproj)	(revision 4e9d3556e3cee0365fc0f26d0bad19b50594e12d)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj	(.../Ringtoets.Common.Data.csproj)	(revision 3b1be2b494c30728564f41d6d8d14fc6a762957d)
@@ -21,6 +21,7 @@
     <Compile Include="AssemblyTool\AssessmentSectionAssemblyCategory.cs" />
     <Compile Include="AssemblyTool\AssessmentSectionAssemblyCategoryType.cs" />
     <Compile Include="AssessmentSection\AssessmentSectionComposition.cs" />
+    <Compile Include="AssessmentSection\AssessmentSectionExtensions.cs" />
     <Compile Include="AssessmentSection\BackgroundData.cs" />
     <Compile Include="AssessmentSection\IAssessmentSection.cs" />
     <Compile Include="AssessmentSection\IBackgroundDataConfiguration.cs" />
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj
===================================================================
diff -u -r4e9d3556e3cee0365fc0f26d0bad19b50594e12d -r3b1be2b494c30728564f41d6d8d14fc6a762957d
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj	(.../Ringtoets.Common.Data.Test.csproj)	(revision 4e9d3556e3cee0365fc0f26d0bad19b50594e12d)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj	(.../Ringtoets.Common.Data.Test.csproj)	(revision 3b1be2b494c30728564f41d6d8d14fc6a762957d)
@@ -25,6 +25,7 @@
     <Compile Include="AssemblyTool\AssessmentSectionAssemblyCategoryTest.cs" />
     <Compile Include="AssemblyTool\AssessmentSectionAssemblyCategoryTypeTest.cs" />
     <Compile Include="AssessmentSection\AssessmentSectionCompositionTest.cs" />
+    <Compile Include="AssessmentSection\AssessmentSectionExtensionsTest.cs" />
     <Compile Include="AssessmentSection\BackgroundDataTest.cs" />
     <Compile Include="AssessmentSection\ReferenceLineMetaTest.cs" />
     <Compile Include="AssessmentSection\ReferenceLineTest.cs" />
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Ringtoets.Integration.Data.csproj
===================================================================
diff -u -r3673d3fc1ad55a8f6d1f21c98b0dfe8d9162c8fd -r3b1be2b494c30728564f41d6d8d14fc6a762957d
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/Ringtoets.Integration.Data.csproj	(.../Ringtoets.Integration.Data.csproj)	(revision 3673d3fc1ad55a8f6d1f21c98b0dfe8d9162c8fd)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Ringtoets.Integration.Data.csproj	(.../Ringtoets.Integration.Data.csproj)	(revision 3b1be2b494c30728564f41d6d8d14fc6a762957d)
@@ -12,7 +12,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssessmentSection.cs" />
-    <Compile Include="AssessmentSectionExtensions.cs" />
     <Compile Include="RingtoetsProjectFactory.cs" />
     <Compile Include="RingtoetsProject.cs" />
     <Compile Include="StandAlone\MacrostabilityOutwardsFailureMechanism.cs" />
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Ringtoets.Integration.Data.Test.csproj
===================================================================
diff -u -r3673d3fc1ad55a8f6d1f21c98b0dfe8d9162c8fd -r3b1be2b494c30728564f41d6d8d14fc6a762957d
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Ringtoets.Integration.Data.Test.csproj	(.../Ringtoets.Integration.Data.Test.csproj)	(revision 3673d3fc1ad55a8f6d1f21c98b0dfe8d9162c8fd)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Ringtoets.Integration.Data.Test.csproj	(.../Ringtoets.Integration.Data.Test.csproj)	(revision 3b1be2b494c30728564f41d6d8d14fc6a762957d)
@@ -18,7 +18,6 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AssessmentSectionExtensionsTest.cs" />
     <Compile Include="AssessmentSectionTest.cs" />
     <Compile Include="RingtoetsProjectFactoryTest.cs" />
     <Compile Include="RingtoetsProjectTest.cs" />
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationScenarioFactory.cs
===================================================================
diff -u -red08434acc8f5619842f1c6cb0b7f9a56cf8dad0 -r3b1be2b494c30728564f41d6d8d14fc6a762957d
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationScenarioFactory.cs	(.../PipingCalculationScenarioFactory.cs)	(revision ed08434acc8f5619842f1c6cb0b7f9a56cf8dad0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationScenarioFactory.cs	(.../PipingCalculationScenarioFactory.cs)	(revision 3b1be2b494c30728564f41d6d8d14fc6a762957d)
@@ -163,7 +163,18 @@
             surfaceLine.SetBottomDitchPolderSideAt(fourthCharacteristicPointLocation);
             surfaceLine.SetDitchPolderSideAt(fifthCharacteristicPointLocation);
 
-            HydraulicBoundaryLocation hydraulicBoundaryLocation = TestHydraulicBoundaryLocation.CreateDesignWaterLevelCalculated(1.0);
+            HydraulicBoundaryLocation hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation
+            {
+                DesignWaterLevelCalculation2 =
+                {
+                    Output = new TestHydraulicBoundaryLocationOutput(1.1)
+                },
+                DesignWaterLevelCalculation3 =
+                {
+                    Output = new TestHydraulicBoundaryLocationOutput(2.2)
+                }
+            };
+
             return new PipingCalculationScenario(new GeneralPipingInput())
             {
                 InputParameters =
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r53fa30076e4e6576728f01a8dfff7314889ddb3a -r3b1be2b494c30728564f41d6d8d14fc6a762957d
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 53fa30076e4e6576728f01a8dfff7314889ddb3a)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 3b1be2b494c30728564f41d6d8d14fc6a762957d)
@@ -978,7 +978,7 @@
                 group.Children.Add(invalidCalculation);
 
                 var pipingFailureMechanism = new TestPipingFailureMechanism();
-                var assessmentSection = mocks.Stub<IAssessmentSection>();
+                var assessmentSection = new ObservableTestAssessmentSectionStub();
 
                 var nodeData = new PipingCalculationGroupContext(group,
                                                                  parentGroup,
@@ -1080,6 +1080,7 @@
                     contextMenu.Items[contextMenuCalculateAllIndexNestedGroup].PerformClick();
                 }
             }
+
             // Assert
         }
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs
===================================================================
diff -u -r171eda478707e1f059c568074c7be10ecc93abb8 -r3b1be2b494c30728564f41d6d8d14fc6a762957d
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs	(.../PipingCalculationScenarioContextTreeNodeInfoTest.cs)	(revision 171eda478707e1f059c568074c7be10ecc93abb8)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs	(.../PipingCalculationScenarioContextTreeNodeInfoTest.cs)	(revision 3b1be2b494c30728564f41d6d8d14fc6a762957d)
@@ -934,7 +934,7 @@
             {
                 var calculation = new PipingCalculationScenario(new GeneralPipingInput());
                 var pipingFailureMechanism = new TestPipingFailureMechanism();
-                var assessmentSection = mocks.Stub<IAssessmentSection>();
+                var assessmentSection = new ObservableTestAssessmentSectionStub();
 
                 var pipingCalculationContext = new PipingCalculationScenarioContext(calculation,
                                                                                     new CalculationGroup(),
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r171eda478707e1f059c568074c7be10ecc93abb8 -r3b1be2b494c30728564f41d6d8d14fc6a762957d
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision 171eda478707e1f059c568074c7be10ecc93abb8)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision 3b1be2b494c30728564f41d6d8d14fc6a762957d)
@@ -662,7 +662,7 @@
                 failureMechanism.CalculationsGroup.Children.Add(validCalculation);
                 failureMechanism.CalculationsGroup.Children.Add(invalidCalculation);
 
-                var assessmentSection = mocks.Stub<IAssessmentSection>();
+                var assessmentSection = new ObservableTestAssessmentSectionStub();
                 var failureMechanismContext = new PipingFailureMechanismContext(failureMechanism, assessmentSection);
 
                 var menuBuilder = new CustomItemsOnlyContextMenuBuilder();