Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs
===================================================================
diff -u -rc48f16746209f799f93c6fc79a5202a9e3fd419f -r849754a9c56fc8ad4e2733f9ca04de7c01cbac3f
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs	(.../PipingInputContextPropertiesTest.cs)	(revision c48f16746209f799f93c6fc79a5202a9e3fd419f)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs	(.../PipingInputContextPropertiesTest.cs)	(revision 849754a9c56fc8ad4e2733f9ca04de7c01cbac3f)
@@ -1654,7 +1654,15 @@
             mocks.ReplayAll();
 
             var failureMechanism = new PipingFailureMechanism();
-            var calculation = new PipingCalculationScenario(failureMechanism.GeneralInput);
+
+            var calculation = new PipingCalculationScenario(failureMechanism.GeneralInput)
+            {
+                InputParameters =
+                {
+                    UseAssessmentLevelManualInput = useCustomAssessmentLevel
+                }
+            };
+
             var context = new PipingInputContext(calculation.InputParameters, calculation,
                                                  Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
                                                  Enumerable.Empty<StochasticSoilModel>(),
@@ -1665,7 +1673,6 @@
                 Data = context
             };
 
-            calculation.InputParameters.UseAssessmentLevelManualInput = useCustomAssessmentLevel;
 
             // Call
             var result = properties.DynamicReadOnlyValidationMethod("AssessmentLevel");
@@ -1698,7 +1705,15 @@
             mocks.ReplayAll();
 
             var failureMechanism = new PipingFailureMechanism();
-            var calculation = new PipingCalculationScenario(failureMechanism.GeneralInput);
+
+            var calculation = new PipingCalculationScenario(failureMechanism.GeneralInput)
+            {
+                InputParameters =
+                {
+                    UseAssessmentLevelManualInput = useCustomAssessmentLevel
+                }
+            };
+
             var context = new PipingInputContext(calculation.InputParameters, calculation,
                                                  Enumerable.Empty<RingtoetsPipingSurfaceLine>(),
                                                  Enumerable.Empty<StochasticSoilModel>(),
@@ -1709,7 +1724,6 @@
                 Data = context
             };
 
-            calculation.InputParameters.UseAssessmentLevelManualInput = useCustomAssessmentLevel;
 
             // Call
             var result = properties.DynamicVisibleValidationMethod("SelectedHydraulicBoundaryLocation");
@@ -1747,23 +1761,27 @@
             // Setup
             var mocks = new MockRepository();
             var assessmentSection = mocks.Stub<IAssessmentSection>();
+
             var calculationObserver = mocks.StrictMock<IObserver>();
-            var inputObserver = mocks.StrictMock<IObserver>();
             int numberOfChangedProperties = hasOutput ? 1 : 0;
             calculationObserver.Expect(o => o.UpdateObserver()).Repeat.Times(numberOfChangedProperties);
+
+            var inputObserver = mocks.StrictMock<IObserver>();
             inputObserver.Expect(o => o.UpdateObserver());
+
             mocks.ReplayAll();
-            
+
             if (hasOutput)
             {
                 calculation.Output = new TestPipingOutput();
             }
-            var failureMechanism = new PipingFailureMechanism();
+            calculation.Attach(calculationObserver);
 
             PipingInput inputParameters = calculation.InputParameters;
-            calculation.Attach(calculationObserver);
             inputParameters.Attach(inputObserver);
 
+            var failureMechanism = new PipingFailureMechanism();
+
             var properties = new PipingInputContextProperties
             {
                 Data = new PipingInputContext(inputParameters,