Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioTestFactory.cs
===================================================================
diff -u -r74df3b2f37b578eb5f0d5c8d33379d965805bb8e -r3bb7a41354c5435adb115183031f35d2a4493155
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioTestFactory.cs	(.../MacroStabilityInwardsCalculationScenarioTestFactory.cs)	(revision 74df3b2f37b578eb5f0d5c8d33379d965805bb8e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioTestFactory.cs	(.../MacroStabilityInwardsCalculationScenarioTestFactory.cs)	(revision 3bb7a41354c5435adb115183031f35d2a4493155)
@@ -26,7 +26,6 @@
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.Probabilistics;
-using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
 using Ringtoets.MacroStabilityInwards.Primitives;
 
@@ -143,9 +142,18 @@
         /// <summary>
         /// Creates a scenario with valid input.
         /// </summary>
+        /// <param name="hydraulicBoundaryLocation">The hydraulic boundary location to set to the input.</param>
         /// <returns>A new <see cref="MacroStabilityInwardsCalculationScenario"/>.</returns>
-        public static MacroStabilityInwardsCalculationScenario CreateMacroStabilityInwardsCalculationScenarioWithValidInput()
+        /// <remarks>The caller is responsible for actually providing a valid hydraulic boundary location
+        /// (for instance when it comes to the presence of a normative assessment level).</remarks>
+        /// <exception cref="ArgumentNullException">Throw when <paramref name="hydraulicBoundaryLocation"/> is <c>null</c>.</exception>
+        public static MacroStabilityInwardsCalculationScenario CreateMacroStabilityInwardsCalculationScenarioWithValidInput(HydraulicBoundaryLocation hydraulicBoundaryLocation)
         {
+            if (hydraulicBoundaryLocation == null)
+            {
+                throw new ArgumentNullException(nameof(hydraulicBoundaryLocation));
+            }
+
             const double top = 10.56;
             var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, new MacroStabilityInwardsSoilProfile1D("Ondergrondschematisatie", 0.0, new[]
             {
@@ -242,18 +250,6 @@
             surfaceLine.SetSurfaceLevelInsideAt(sixthCharacteristicPointLocation);
             surfaceLine.ReferenceLineIntersectionWorldPoint = new Point2D(0.0, 0.0);
 
-            HydraulicBoundaryLocation hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation
-            {
-                DesignWaterLevelCalculation2 =
-                {
-                    Output = new TestHydraulicBoundaryLocationOutput(1.1)
-                },
-                DesignWaterLevelCalculation3 =
-                {
-                    Output = new TestHydraulicBoundaryLocationOutput(2.2)
-                }
-            };
-
             return new MacroStabilityInwardsCalculationScenario
             {
                 InputParameters =
@@ -326,16 +322,5 @@
                 }
             };
         }
-
-        /// <summary>
-        /// Creates a scenario with valid input and output.
-        /// </summary>
-        /// <returns>A new <see cref="MacroStabilityInwardsCalculationScenario"/>.</returns>
-        public static MacroStabilityInwardsCalculationScenario CreateCalculatedMacroStabilityInwardsCalculationScenario()
-        {
-            MacroStabilityInwardsCalculationScenario calculation = CreateMacroStabilityInwardsCalculationScenarioWithValidInput();
-            calculation.Output = MacroStabilityInwardsOutputTestFactory.CreateRandomOutput();
-            return calculation;
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationScenarioTestFactory.cs
===================================================================
diff -u -rd2953d6162e73a4056e2cf2bb383a574d7c32136 -r3bb7a41354c5435adb115183031f35d2a4493155
--- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationScenarioTestFactory.cs	(.../PipingCalculationScenarioTestFactory.cs)	(revision d2953d6162e73a4056e2cf2bb383a574d7c32136)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationScenarioTestFactory.cs	(.../PipingCalculationScenarioTestFactory.cs)	(revision 3bb7a41354c5435adb115183031f35d2a4493155)
@@ -113,7 +113,8 @@
         /// </summary>
         /// <param name="hydraulicBoundaryLocation">The hydraulic boundary location to set to the input.</param>
         /// <returns>A new <see cref="PipingCalculationScenario"/>.</returns>
-        /// <remarks>The caller is responsible for actually providing a valid hydraulic boundary location.</remarks>
+        /// <remarks>The caller is responsible for actually providing a valid hydraulic boundary location
+        /// (for instance when it comes to the presence of a normative assessment level).</remarks>
         /// <exception cref="ArgumentNullException">Throw when <paramref name="hydraulicBoundaryLocation"/> is <c>null</c>.</exception>
         public static PipingCalculationScenario CreatePipingCalculationScenarioWithValidInput(HydraulicBoundaryLocation hydraulicBoundaryLocation)
         {