Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Input/UpliftVanSlipPlaneConstraints.cs
===================================================================
diff -u -r5e06c7c77b595f59f9015775ed2748a28a8bb92e -r08a1d37783424699debf8c053dc95a75df38d8dc
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Input/UpliftVanSlipPlaneConstraints.cs	(.../UpliftVanSlipPlaneConstraints.cs)	(revision 5e06c7c77b595f59f9015775ed2748a28a8bb92e)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Input/UpliftVanSlipPlaneConstraints.cs	(.../UpliftVanSlipPlaneConstraints.cs)	(revision 08a1d37783424699debf8c053dc95a75df38d8dc)
@@ -42,31 +42,29 @@
         public UpliftVanSlipPlaneConstraints(double slipPlaneMinimumDepth,
                                              double slipPlaneMinimumLength,
                                              bool createZones)
-        {
-            CreateZones = createZones;
-            AutomaticForbiddenZones = true;
-            ZoneBoundaryLeft = double.NaN;
-            ZoneBoundaryRight = double.NaN;
-            SlipPlaneMinimumLength = slipPlaneMinimumLength;
-            SlipPlaneMinimumDepth = slipPlaneMinimumDepth;
-        }
+            : this(slipPlaneMinimumDepth, slipPlaneMinimumLength,
+                   double.NaN, double.NaN, createZones, true) {}
 
         /// <summary>
         /// Creates a new instance of <see cref="UpliftVanSlipPlaneConstraints"/>.
         /// </summary>
-        /// <param name="zoneBoundaryLeft">The left zone boundary.</param>
-        /// <param name="zoneBoundaryRight">The right zone boundary.</param>
         /// <param name="slipPlaneMinimumDepth">The slip plane minimum depth.</param>
         /// <param name="slipPlaneMinimumLength">The slip plane minimum length.</param>
+        /// <param name="zoneBoundaryLeft">The left zone boundary.</param>
+        /// <param name="zoneBoundaryRight">The right zone boundary.</param>
         /// <remarks><see cref="CreateZones"/> will be set to <c>true</c> and 
         /// <see cref="AutomaticForbiddenZones"/> will be set to <c>false</c>.</remarks>
-        public UpliftVanSlipPlaneConstraints(double zoneBoundaryLeft,
-                                             double zoneBoundaryRight,
-                                             double slipPlaneMinimumDepth,
-                                             double slipPlaneMinimumLength)
+        public UpliftVanSlipPlaneConstraints(double slipPlaneMinimumDepth, double slipPlaneMinimumLength,
+                                             double zoneBoundaryLeft, double zoneBoundaryRight)
+            : this(slipPlaneMinimumDepth, slipPlaneMinimumLength, zoneBoundaryLeft,
+                   zoneBoundaryRight, true, false) {}
+
+        private UpliftVanSlipPlaneConstraints(double slipPlaneMinimumDepth, double slipPlaneMinimumLength,
+                                              double zoneBoundaryLeft, double zoneBoundaryRight,
+                                              bool createZones, bool automaticForbiddenZones)
         {
-            CreateZones = true;
-            AutomaticForbiddenZones = false;
+            CreateZones = createZones;
+            AutomaticForbiddenZones = automaticForbiddenZones;
             ZoneBoundaryLeft = zoneBoundaryLeft;
             ZoneBoundaryRight = zoneBoundaryRight;
             SlipPlaneMinimumDepth = slipPlaneMinimumDepth;
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapper.cs
===================================================================
diff -u -ra06f1ed48db991a6604ac72d06107a0f47bf5963 -r08a1d37783424699debf8c053dc95a75df38d8dc
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapper.cs	(.../UpliftVanKernelWrapper.cs)	(revision a06f1ed48db991a6604ac72d06107a0f47bf5963)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapper.cs	(.../UpliftVanKernelWrapper.cs)	(revision 08a1d37783424699debf8c053dc95a75df38d8dc)
@@ -45,7 +45,6 @@
         {
             stabilityModel = new StabilityModel
             {
-                SlipPlaneConstraints = new SlipPlaneConstraints(),
                 GridOrientation = GridOrientation.Inwards,
                 SlipCircle = new SlipCircle(),
                 SearchAlgorithm = SearchAlgorithm.Grid,
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/UpliftVanSlipPlaneConstraintsConverter.cs
===================================================================
diff -u -r5e06c7c77b595f59f9015775ed2748a28a8bb92e -r08a1d37783424699debf8c053dc95a75df38d8dc
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/UpliftVanSlipPlaneConstraintsConverter.cs	(.../UpliftVanSlipPlaneConstraintsConverter.cs)	(revision 5e06c7c77b595f59f9015775ed2748a28a8bb92e)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/UpliftVanSlipPlaneConstraintsConverter.cs	(.../UpliftVanSlipPlaneConstraintsConverter.cs)	(revision 08a1d37783424699debf8c053dc95a75df38d8dc)
@@ -46,17 +46,11 @@
                 throw new ArgumentNullException(nameof(input));
             }
 
-            if (input.CreateZones && input.ZoningBoundariesDeterminationType == MacroStabilityInwardsZoningBoundariesDeterminationType.Manual)
-            {
-                return new UpliftVanSlipPlaneConstraints(input.ZoneBoundaryLeft,
-                                                         input.ZoneBoundaryRight,
-                                                         input.SlipPlaneMinimumDepth,
-                                                         input.SlipPlaneMinimumLength);
-            }
-
-            return new UpliftVanSlipPlaneConstraints(input.SlipPlaneMinimumDepth,
-                                                     input.SlipPlaneMinimumLength,
-                                                     input.CreateZones);
+            return input.CreateZones && input.ZoningBoundariesDeterminationType == MacroStabilityInwardsZoningBoundariesDeterminationType.Manual
+                       ? new UpliftVanSlipPlaneConstraints(input.SlipPlaneMinimumDepth, input.SlipPlaneMinimumLength,
+                                                           input.ZoneBoundaryLeft, input.ZoneBoundaryRight)
+                       : new UpliftVanSlipPlaneConstraints(input.SlipPlaneMinimumDepth, input.SlipPlaneMinimumLength,
+                                                           input.CreateZones);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsCalculationScenarioFactoryTest.cs
===================================================================
diff -u -r9e2f9f7fe2d7daf45c943fc446cd9edc4298290d -r08a1d37783424699debf8c053dc95a75df38d8dc
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsCalculationScenarioFactoryTest.cs	(.../MacroStabilityInwardsCalculationScenarioFactoryTest.cs)	(revision 9e2f9f7fe2d7daf45c943fc446cd9edc4298290d)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsCalculationScenarioFactoryTest.cs	(.../MacroStabilityInwardsCalculationScenarioFactoryTest.cs)	(revision 08a1d37783424699debf8c053dc95a75df38d8dc)
@@ -304,6 +304,11 @@
             Assert.AreEqual(1, inputParameters.RightGrid.NumberOfVerticalPoints);
             Assert.AreEqual(1, inputParameters.RightGrid.NumberOfHorizontalPoints);
 
+            Assert.IsTrue(inputParameters.CreateZones);
+            Assert.AreEqual(MacroStabilityInwardsZoningBoundariesDeterminationType.Manual, inputParameters.ZoningBoundariesDeterminationType);
+            Assert.AreEqual(2, inputParameters.ZoneBoundaryLeft, inputParameters.ZoneBoundaryLeft.GetAccuracy());
+            Assert.AreEqual(4, inputParameters.ZoneBoundaryRight, inputParameters.ZoneBoundaryRight.GetAccuracy());
+
             Assert.AreEqual(0, inputParameters.StochasticSoilProfile.Probability);
             Assert.AreEqual("Ondergrondschematisatie", inputParameters.StochasticSoilProfile.SoilProfile.Name);
             Assert.IsInstanceOf<MacroStabilityInwardsSoilProfile1D>(inputParameters.StochasticSoilProfile.SoilProfile);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioFactory.cs
===================================================================
diff -u -r9e2f9f7fe2d7daf45c943fc446cd9edc4298290d -r08a1d37783424699debf8c053dc95a75df38d8dc
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioFactory.cs	(.../MacroStabilityInwardsCalculationScenarioFactory.cs)	(revision 9e2f9f7fe2d7daf45c943fc446cd9edc4298290d)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioFactory.cs	(.../MacroStabilityInwardsCalculationScenarioFactory.cs)	(revision 08a1d37783424699debf8c053dc95a75df38d8dc)
@@ -293,7 +293,11 @@
                         ZBottom = (RoundedDouble) 1.0,
                         NumberOfVerticalPoints = 1,
                         NumberOfHorizontalPoints = 1
-                    }
+                    },
+                    CreateZones = true,
+                    ZoningBoundariesDeterminationType = MacroStabilityInwardsZoningBoundariesDeterminationType.Manual,
+                    ZoneBoundaryLeft = (RoundedDouble) 2,
+                    ZoneBoundaryRight = (RoundedDouble) 4
                 }
             };
         }
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Input/UpliftVanCalculatorInputTest.cs
===================================================================
diff -u -r5e06c7c77b595f59f9015775ed2748a28a8bb92e -r08a1d37783424699debf8c053dc95a75df38d8dc
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Input/UpliftVanCalculatorInputTest.cs	(.../UpliftVanCalculatorInputTest.cs)	(revision 5e06c7c77b595f59f9015775ed2748a28a8bb92e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Input/UpliftVanCalculatorInputTest.cs	(.../UpliftVanCalculatorInputTest.cs)	(revision 08a1d37783424699debf8c053dc95a75df38d8dc)
@@ -55,7 +55,7 @@
             var drainageConstruction = new DrainageConstruction();
             var phreaticLineOffsets = new PhreaticLineOffsets();
             var slipPlane = new UpliftVanSlipPlane();
-            var slipPlaneConstraints = new UpliftVanSlipPlaneConstraints(double.NaN, double.NaN, true);
+            var slipPlaneConstraints = new UpliftVanSlipPlaneConstraints(random.NextDouble(), random.NextDouble(), random.NextBoolean());
             var waternetCreationMode = random.NextEnumValue<WaternetCreationMode>();
             var plLineCreationMethod = random.NextEnumValue<PlLineCreationMethod>();
             var landwardDirection = random.NextEnumValue<LandwardDirection>();
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Input/UpliftVanSlipPlaneConstraintsTest.cs
===================================================================
diff -u -r5e06c7c77b595f59f9015775ed2748a28a8bb92e -r08a1d37783424699debf8c053dc95a75df38d8dc
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Input/UpliftVanSlipPlaneConstraintsTest.cs	(.../UpliftVanSlipPlaneConstraintsTest.cs)	(revision 5e06c7c77b595f59f9015775ed2748a28a8bb92e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Input/UpliftVanSlipPlaneConstraintsTest.cs	(.../UpliftVanSlipPlaneConstraintsTest.cs)	(revision 08a1d37783424699debf8c053dc95a75df38d8dc)
@@ -61,10 +61,8 @@
             double zoneBoundaryRight = random.NextDouble();
 
             // Call
-            var constraints = new UpliftVanSlipPlaneConstraints(zoneBoundaryLeft,
-                                                                zoneBoundaryRight,
-                                                                slipPlaneMinimumDepth,
-                                                                slipPlaneMinimumLength);
+            var constraints = new UpliftVanSlipPlaneConstraints(slipPlaneMinimumDepth,
+                                                                slipPlaneMinimumLength, zoneBoundaryLeft, zoneBoundaryRight);
 
             // Assert
             Assert.IsTrue(constraints.CreateZones);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/UpliftVanCalculatorTest.cs
===================================================================
diff -u -r5e06c7c77b595f59f9015775ed2748a28a8bb92e -r08a1d37783424699debf8c053dc95a75df38d8dc
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/UpliftVanCalculatorTest.cs	(.../UpliftVanCalculatorTest.cs)	(revision 5e06c7c77b595f59f9015775ed2748a28a8bb92e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/UpliftVanCalculatorTest.cs	(.../UpliftVanCalculatorTest.cs)	(revision 08a1d37783424699debf8c053dc95a75df38d8dc)
@@ -313,7 +313,7 @@
                 PhreaticLineOffsetsExtreme = new PhreaticLineOffsets(),
                 PhreaticLineOffsetsDaily = new PhreaticLineOffsets(),
                 SlipPlane = new UpliftVanSlipPlane(),
-                SlipPlaneConstraints = new UpliftVanSlipPlaneConstraints(double.NaN, double.NaN, false)
+                SlipPlaneConstraints = new UpliftVanSlipPlaneConstraints(random.NextDouble(), random.NextDouble(), random.NextBoolean())
             });
         }
 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SlipPlaneConstraintsCreatorTest.cs
===================================================================
diff -u -r5e06c7c77b595f59f9015775ed2748a28a8bb92e -r08a1d37783424699debf8c053dc95a75df38d8dc
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SlipPlaneConstraintsCreatorTest.cs	(.../SlipPlaneConstraintsCreatorTest.cs)	(revision 5e06c7c77b595f59f9015775ed2748a28a8bb92e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SlipPlaneConstraintsCreatorTest.cs	(.../SlipPlaneConstraintsCreatorTest.cs)	(revision 08a1d37783424699debf8c053dc95a75df38d8dc)
@@ -45,10 +45,8 @@
         {
             // Setup
             var random = new Random(39);
-            var upliftVanSlipPlaneConstraints = new UpliftVanSlipPlaneConstraints(random.NextDouble(),
-                                                                                  random.NextDouble(),
-                                                                                  random.NextDouble(),
-                                                                                  random.NextDouble());
+            var upliftVanSlipPlaneConstraints = new UpliftVanSlipPlaneConstraints(random.NextDouble(), random.NextDouble(),
+                                                                                  random.NextDouble(), random.NextDouble());
 
             // Call
             SlipPlaneConstraints constraints = SlipPlaneConstraintsCreator.Create(upliftVanSlipPlaneConstraints);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs
===================================================================
diff -u -ra06f1ed48db991a6604ac72d06107a0f47bf5963 -r08a1d37783424699debf8c053dc95a75df38d8dc
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs	(.../UpliftVanKernelWrapperTest.cs)	(revision a06f1ed48db991a6604ac72d06107a0f47bf5963)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Kernels/UpliftVan/UpliftVanKernelWrapperTest.cs	(.../UpliftVanKernelWrapperTest.cs)	(revision 08a1d37783424699debf8c053dc95a75df38d8dc)
@@ -279,8 +279,6 @@
 
         private static void AssertIrrelevantValues(StabilityModel stabilityModel)
         {
-            Assert.IsNaN(stabilityModel.SlipPlaneConstraints.XEntryMin); // Set during calculation
-            Assert.IsNaN(stabilityModel.SlipPlaneConstraints.XEntryMax); // Set during calculation
             Assert.IsEmpty(stabilityModel.UniformLoads); // No traffic load for WBI
             Assert.AreEqual(0.0, stabilityModel.FileVersionAsRead); // Set by XML serialization
             Assert.IsNull(stabilityModel.MinimumSafetyCurve); // Output
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/UpliftVanSlipPlaneConstraintsConverterTest.cs
===================================================================
diff -u -ra06f1ed48db991a6604ac72d06107a0f47bf5963 -r08a1d37783424699debf8c053dc95a75df38d8dc
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/UpliftVanSlipPlaneConstraintsConverterTest.cs	(.../UpliftVanSlipPlaneConstraintsConverterTest.cs)	(revision a06f1ed48db991a6604ac72d06107a0f47bf5963)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/UpliftVanSlipPlaneConstraintsConverterTest.cs	(.../UpliftVanSlipPlaneConstraintsConverterTest.cs)	(revision 08a1d37783424699debf8c053dc95a75df38d8dc)
@@ -44,40 +44,15 @@
         }
 
         [Test]
-        public void Convert_CreateZonesFalse_ReturnsExpectedUpliftVanSlipPlaneConstraints()
+        [TestCase(true)]
+        [TestCase(false)]
+        public void Convert_ZoningDeterminationTypeAutomatic_ReturnsExpectedUpliftVanSlipPlaneConstraints(bool createZones)
         {
             // Setup
             var random = new Random(39);
             var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties())
             {
-                CreateZones = false,
-                ZoningBoundariesDeterminationType = random.NextEnumValue<MacroStabilityInwardsZoningBoundariesDeterminationType>(),
-                SlipPlaneMinimumDepth = random.NextRoundedDouble(),
-                SlipPlaneMinimumLength = random.NextRoundedDouble(),
-                ZoneBoundaryLeft = random.NextRoundedDouble(),
-                ZoneBoundaryRight = random.NextRoundedDouble()
-            };
-
-            // Call
-            UpliftVanSlipPlaneConstraints constraints = UpliftVanSlipPlaneConstraintsConverter.Convert(input);
-
-            // Assert
-            Assert.IsFalse(constraints.CreateZones);
-            Assert.IsTrue(constraints.AutomaticForbiddenZones);
-            Assert.AreEqual(input.SlipPlaneMinimumDepth, constraints.SlipPlaneMinimumDepth, input.SlipPlaneMinimumDepth.GetAccuracy());
-            Assert.AreEqual(input.SlipPlaneMinimumLength, constraints.SlipPlaneMinimumLength, input.SlipPlaneMinimumLength.GetAccuracy());
-            Assert.IsNaN(constraints.ZoneBoundaryLeft);
-            Assert.IsNaN(constraints.ZoneBoundaryRight);
-        }
-
-        [Test]
-        public void Convert_ZoningDeterminationTypeAutomatic_ReturnsExpectedUpliftVanSlipPlaneConstraints()
-        {
-            // Setup
-            var random = new Random(39);
-            var input = new MacroStabilityInwardsInput(new MacroStabilityInwardsInput.ConstructionProperties())
-            {
-                CreateZones = true,
+                CreateZones = createZones,
                 ZoningBoundariesDeterminationType = MacroStabilityInwardsZoningBoundariesDeterminationType.Automatic,
                 SlipPlaneMinimumDepth = random.NextRoundedDouble(),
                 SlipPlaneMinimumLength = random.NextRoundedDouble(),
@@ -89,7 +64,7 @@
             UpliftVanSlipPlaneConstraints constraints = UpliftVanSlipPlaneConstraintsConverter.Convert(input);
 
             // Assert
-            Assert.IsTrue(constraints.CreateZones);
+            Assert.AreEqual(createZones, constraints.CreateZones);
             Assert.IsTrue(constraints.AutomaticForbiddenZones);
             Assert.AreEqual(input.SlipPlaneMinimumDepth, constraints.SlipPlaneMinimumDepth, input.SlipPlaneMinimumDepth.GetAccuracy());
             Assert.AreEqual(input.SlipPlaneMinimumLength, constraints.SlipPlaneMinimumLength, input.SlipPlaneMinimumLength.GetAccuracy());
@@ -98,7 +73,7 @@
         }
 
         [Test]
-        public void Convert_ZoningDeterminationTypeManual_ReturnsExpectedUpliftVanSlipPlaneConstraints()
+        public void Convert_CreateZonesTrueAndZoningDeterminationTypeManual_ReturnsExpectedUpliftVanSlipPlaneConstraints()
         {
             // Setup
             var random = new Random(39);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs
===================================================================
diff -u -r53375024cc287410d9c23b78aa2d806a3a381ae0 -r08a1d37783424699debf8c053dc95a75df38d8dc
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs	(.../MacroStabilityInwardsCalculationServiceTest.cs)	(revision 53375024cc287410d9c23b78aa2d806a3a381ae0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs	(.../MacroStabilityInwardsCalculationServiceTest.cs)	(revision 08a1d37783424699debf8c053dc95a75df38d8dc)
@@ -405,6 +405,41 @@
         }
 
         [Test]
+        [TestCase(true, MacroStabilityInwardsZoningBoundariesDeterminationType.Automatic)]
+        [TestCase(false, MacroStabilityInwardsZoningBoundariesDeterminationType.Automatic)]
+        [TestCase(false, MacroStabilityInwardsZoningBoundariesDeterminationType.Manual)]
+        public void Calculate_ZoningBoundariesDeterminationTypeAutomatic_SetsInputOnCalculator(bool createZones,
+                                                                                               MacroStabilityInwardsZoningBoundariesDeterminationType zoningBoundariesDeterminationType)
+        {
+            // Setup
+            var random = new Random(11);
+            MacroStabilityInwardsInput inputParameters = testCalculation.InputParameters;
+            inputParameters.CreateZones = createZones;
+            inputParameters.ZoningBoundariesDeterminationType = zoningBoundariesDeterminationType;
+
+            inputParameters.SlipPlaneMinimumDepth = random.NextRoundedDouble();
+            inputParameters.SlipPlaneMinimumLength = random.NextRoundedDouble();
+            inputParameters.ZoneBoundaryLeft = random.NextRoundedDouble();
+            inputParameters.ZoneBoundaryRight = random.NextRoundedDouble();
+
+            using (new MacroStabilityInwardsCalculatorFactoryConfig())
+            {
+                // Call
+                MacroStabilityInwardsCalculationService.Calculate(testCalculation);
+
+                // Assert
+                UpliftVanCalculatorInput actualInput = ((TestMacroStabilityInwardsCalculatorFactory) MacroStabilityInwardsCalculatorFactory.Instance)
+                    .LastCreatedUpliftVanCalculator.Input;
+                Assert.IsTrue(actualInput.SlipPlaneConstraints.AutomaticForbiddenZones);
+                Assert.AreEqual(createZones, actualInput.SlipPlaneConstraints.CreateZones);
+                Assert.IsNaN(actualInput.SlipPlaneConstraints.ZoneBoundaryLeft);
+                Assert.IsNaN(actualInput.SlipPlaneConstraints.ZoneBoundaryRight);
+                Assert.AreEqual(inputParameters.SlipPlaneMinimumDepth, actualInput.SlipPlaneConstraints.SlipPlaneMinimumDepth);
+                Assert.AreEqual(inputParameters.SlipPlaneMinimumLength, actualInput.SlipPlaneConstraints.SlipPlaneMinimumLength);
+            }
+        }
+
+        [Test]
         public void Calculate_CalculationRan_SetOutput()
         {
             // Setup
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsInputValidatorTest.cs
===================================================================
diff -u -r9655570a15a7fff650337906cb33de8042312c29 -r08a1d37783424699debf8c053dc95a75df38d8dc
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsInputValidatorTest.cs	(.../MacroStabilityInwardsInputValidatorTest.cs)	(revision 9655570a15a7fff650337906cb33de8042312c29)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsInputValidatorTest.cs	(.../MacroStabilityInwardsInputValidatorTest.cs)	(revision 08a1d37783424699debf8c053dc95a75df38d8dc)
@@ -306,7 +306,6 @@
         public void Validate_ZoneBoundaryRightSmallerThanZoneBoundaryLeft_ReturnsError()
         {
             // Setup
-            input.ZoningBoundariesDeterminationType = MacroStabilityInwardsZoningBoundariesDeterminationType.Manual;
             input.ZoneBoundaryLeft = (RoundedDouble) 0.5;
             input.ZoneBoundaryRight = (RoundedDouble) 0.2;
 
@@ -327,7 +326,6 @@
         public void Validate_ZoneBoundariesOutsideSurfaceLine_ReturnsError(double zoneBoundaryLeft, double zoneBoundaryRight)
         {
             // Setup
-            input.ZoningBoundariesDeterminationType = MacroStabilityInwardsZoningBoundariesDeterminationType.Manual;
             input.ZoneBoundaryLeft = (RoundedDouble) zoneBoundaryLeft;
             input.ZoneBoundaryRight = (RoundedDouble) zoneBoundaryRight;