Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationExporterTest.cs
===================================================================
diff -u -r3bcc8993307e3b6dea8f496d6acbc9c474581787 -r761de1e3c5718f89ba6f8339f91e0585858c76ae
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationExporterTest.cs	(.../PipingCalculationConfigurationExporterTest.cs)	(revision 3bcc8993307e3b6dea8f496d6acbc9c474581787)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationExporterTest.cs	(.../PipingCalculationConfigurationExporterTest.cs)	(revision 761de1e3c5718f89ba6f8339f91e0585858c76ae)
@@ -110,7 +110,7 @@
 
         protected override PipingCalculationScenario CreateCalculation()
         {
-            return PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput();
+            return new PipingCalculationScenario(new GeneralPipingInput());
         }
 
         protected override PipingCalculationConfigurationExporter CallConfigurationFilePathConstructor(IEnumerable<ICalculationBase> calculations, string filePath)
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r8b37c0f11e7d78b71c298763124973e94845c87b -r761de1e3c5718f89ba6f8339f91e0585858c76ae
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 8b37c0f11e7d78b71c298763124973e94845c87b)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 761de1e3c5718f89ba6f8339f91e0585858c76ae)
@@ -576,12 +576,19 @@
             using (var treeViewControl = new TreeViewControl())
             {
                 var pipingFailureMechanism = new PipingFailureMechanism();
-                var assessmentSection = mocks.Stub<IAssessmentSection>();
+                var assessmentSection = new ObservableTestAssessmentSectionStub();
+                var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+
+                assessmentSection.SetHydraulicBoundaryLocationCalculations(new[]
+                {
+                    hydraulicBoundaryLocation
+                }, true);
+
                 var group = new CalculationGroup
                 {
                     Children =
                     {
-                        PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput()
+                        PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation)
                     }
                 };
 
@@ -626,12 +633,19 @@
             using (var treeViewControl = new TreeViewControl())
             {
                 var pipingFailureMechanism = new TestPipingFailureMechanism();
-                var assessmentSection = mocks.Stub<IAssessmentSection>();
+                var assessmentSection = new ObservableTestAssessmentSectionStub();
+                var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+
+                assessmentSection.SetHydraulicBoundaryLocationCalculations(new[]
+                {
+                    hydraulicBoundaryLocation
+                }, true);
+
                 var group = new CalculationGroup
                 {
                     Children =
                     {
-                        PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput()
+                        PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation)
                     }
                 };
 
@@ -754,12 +768,19 @@
             using (var treeViewControl = new TreeViewControl())
             {
                 var pipingFailureMechanism = new TestPipingFailureMechanism();
-                var assessmentSection = mocks.Stub<IAssessmentSection>();
+                var assessmentSection = new ObservableTestAssessmentSectionStub();
+                var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+
+                assessmentSection.SetHydraulicBoundaryLocationCalculations(new[]
+                {
+                    hydraulicBoundaryLocation
+                }, true);
+
                 var group = new CalculationGroup
                 {
                     Children =
                     {
-                        PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput()
+                        PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation)
                     }
                 };
 
@@ -798,7 +819,7 @@
             {
                 var pipingFailureMechanism = new TestPipingFailureMechanism();
                 var assessmentSection = mocks.Stub<IAssessmentSection>();
-                PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput();
+                PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
                 var group = new CalculationGroup
                 {
                     Children =
@@ -961,7 +982,16 @@
             // Setup
             using (var treeViewControl = new TreeViewControl())
             {
-                PipingCalculationScenario validCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput();
+                var pipingFailureMechanism = new TestPipingFailureMechanism();
+                var assessmentSection = new ObservableTestAssessmentSectionStub();
+                var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+
+                assessmentSection.SetHydraulicBoundaryLocationCalculations(new[]
+                {
+                    hydraulicBoundaryLocation
+                }, true);
+
+                PipingCalculationScenario validCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
                 validCalculation.Name = "A";
                 PipingCalculationScenario invalidCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput();
                 invalidCalculation.Name = "B";
@@ -977,9 +1007,6 @@
                 group.Children.Add(emptyChildGroup);
                 group.Children.Add(invalidCalculation);
 
-                var pipingFailureMechanism = new TestPipingFailureMechanism();
-                var assessmentSection = new ObservableTestAssessmentSectionStub();
-
                 var nodeData = new PipingCalculationGroupContext(group,
                                                                  parentGroup,
                                                                  Enumerable.Empty<PipingSurfaceLine>(),
@@ -1028,7 +1055,16 @@
             {
                 var mainWindow = mocks.Stub<IMainWindow>();
 
-                PipingCalculationScenario validCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput();
+                var pipingFailureMechanism = new TestPipingFailureMechanism();
+                var assessmentSection = new ObservableTestAssessmentSectionStub();
+                var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+
+                assessmentSection.SetHydraulicBoundaryLocationCalculations(new[]
+                {
+                    hydraulicBoundaryLocation
+                }, true);
+
+                PipingCalculationScenario validCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
                 validCalculation.Name = "A";
                 PipingCalculationScenario invalidCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput();
                 invalidCalculation.Name = "B";
@@ -1045,8 +1081,6 @@
                 group.Children.Add(emptyChildGroup);
                 group.Children.Add(invalidCalculation);
 
-                var pipingFailureMechanism = new TestPipingFailureMechanism();
-                IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(pipingFailureMechanism, mocks);
                 var nodeData = new PipingCalculationGroupContext(group,
                                                                  parentGroup,
                                                                  Enumerable.Empty<PipingSurfaceLine>(),
@@ -1100,11 +1134,20 @@
                     calculation2Observer.Expect(o => o.UpdateObserver());
                 }
 
-                PipingCalculationScenario calculation1 = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput();
+                var pipingFailureMechanism = new TestPipingFailureMechanism();
+                var assessmentSection = new ObservableTestAssessmentSectionStub();
+                var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+
+                assessmentSection.SetHydraulicBoundaryLocationCalculations(new[]
+                {
+                    hydraulicBoundaryLocation
+                }, true);
+
+                PipingCalculationScenario calculation1 = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
                 calculation1.Name = "A";
                 calculation1.Output = PipingOutputTestFactory.Create();
                 calculation1.Attach(calculation1Observer);
-                PipingCalculationScenario calculation2 = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput();
+                PipingCalculationScenario calculation2 = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
                 calculation2.Name = "B";
                 calculation2.Output = PipingOutputTestFactory.Create();
                 calculation2.Attach(calculation2Observer);
@@ -1120,9 +1163,6 @@
                 group.Children.Add(emptyChildGroup);
                 group.Children.Add(calculation2);
 
-                var pipingFailureMechanism = new PipingFailureMechanism();
-                IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(pipingFailureMechanism, mocks);
-
                 var nodeData = new PipingCalculationGroupContext(group,
                                                                  parentGroup,
                                                                  Enumerable.Empty<PipingSurfaceLine>(),