Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensions.cs
===================================================================
diff -u -r33d8b4610b6bc2979e35aa3e23b881a9933e40b5 -rde4ebfc961abbbcd502b9932f52c21e315a631c3
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensions.cs	(.../MacroStabilityInwardsCalculationScenarioCreateExtensions.cs)	(revision 33d8b4610b6bc2979e35aa3e23b881a9933e40b5)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensions.cs	(.../MacroStabilityInwardsCalculationScenarioCreateExtensions.cs)	(revision de4ebfc961abbbcd502b9932f52c21e315a631c3)
@@ -89,6 +89,7 @@
 
             entity.WaterLevelRiverAverage = inputParameters.WaterLevelRiverAverage.ToNaNAsNull();
 
+            entity.DrainageConstructionPresent = Convert.ToByte(inputParameters.DrainageConstructionPresent);
             entity.DrainageConstructionCoordinateX = inputParameters.XCoordinateDrainageConstruction.ToNaNAsNull();
             entity.DrainageConstructionCoordinateZ = inputParameters.ZCoordinateDrainageConstruction.ToNaNAsNull();
 
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs
===================================================================
diff -u -rd75a6c0c39a582f42b7a05b705aaa1f703a47d89 -rde4ebfc961abbbcd502b9932f52c21e315a631c3
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs	(.../MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs)	(revision d75a6c0c39a582f42b7a05b705aaa1f703a47d89)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs	(.../MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs)	(revision de4ebfc961abbbcd502b9932f52c21e315a631c3)
@@ -139,6 +139,7 @@
                     MoveGrid = random.NextBoolean(),
                     DikeSoilScenario = random.NextEnumValue<MacroStabilityInwardsDikeSoilScenario>(),
                     WaterLevelRiverAverage = random.NextRoundedDouble(),
+                    DrainageConstructionPresent = random.NextBoolean(),
                     XCoordinateDrainageConstruction = random.NextRoundedDouble(),
                     ZCoordinateDrainageConstruction = random.NextRoundedDouble(),
                     LocationInputExtreme =
@@ -379,12 +380,12 @@
             Assert.IsNotNull(outputEntity);
 
             MacroStabilityInwardsSemiProbabilisticOutput expectedOutput = scenario.SemiProbabilisticOutput;
-            Assert.AreEqual(expectedOutput.FactorOfStability, outputEntity.FactorOfStability);
+            Assert.AreEqual(expectedOutput.FactorOfStability, outputEntity.FactorOfStability, expectedOutput.FactorOfStability.GetAccuracy());
             Assert.AreEqual(expectedOutput.MacroStabilityInwardsProbability, outputEntity.MacroStabilityInwardsProbability);
-            Assert.AreEqual(expectedOutput.MacroStabilityInwardsReliability, outputEntity.MacroStabilityInwardsReliability);
+            Assert.AreEqual(expectedOutput.MacroStabilityInwardsReliability, outputEntity.MacroStabilityInwardsReliability, expectedOutput.MacroStabilityInwardsReliability.GetAccuracy());
             Assert.AreEqual(expectedOutput.RequiredProbability, outputEntity.RequiredProbability);
-            Assert.AreEqual(expectedOutput.RequiredReliability, outputEntity.RequiredReliability);
-            Assert.AreEqual(expectedOutput.MacroStabilityInwardsFactorOfSafety, outputEntity.MacroStabilityInwardsFactorOfSafety);
+            Assert.AreEqual(expectedOutput.RequiredReliability, outputEntity.RequiredReliability, expectedOutput.RequiredReliability.GetAccuracy());
+            Assert.AreEqual(expectedOutput.MacroStabilityInwardsFactorOfSafety, outputEntity.MacroStabilityInwardsFactorOfSafety, expectedOutput.MacroStabilityInwardsFactorOfSafety.GetAccuracy());
         }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsOutputCreateExtensionsTest.cs
===================================================================
diff -u -rd75a6c0c39a582f42b7a05b705aaa1f703a47d89 -rde4ebfc961abbbcd502b9932f52c21e315a631c3
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsOutputCreateExtensionsTest.cs	(.../MacroStabilityInwardsOutputCreateExtensionsTest.cs)	(revision d75a6c0c39a582f42b7a05b705aaa1f703a47d89)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsOutputCreateExtensionsTest.cs	(.../MacroStabilityInwardsOutputCreateExtensionsTest.cs)	(revision de4ebfc961abbbcd502b9932f52c21e315a631c3)
@@ -121,8 +121,8 @@
             Assert.IsNull(entity.SlipPlaneLeftGridZTop);
             Assert.IsNull(entity.SlipPlaneLeftGridZBottom);
 
+            Assert.IsNull(entity.SlipPlaneRightGridXLeft);
             Assert.IsNull(entity.SlipPlaneRightGridXRight);
-            Assert.IsNull(entity.SlipPlaneRightGridXRight);
             Assert.IsNull(entity.SlipPlaneRightGridZTop);
             Assert.IsNull(entity.SlipPlaneRightGridZBottom);
 
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -r33d8b4610b6bc2979e35aa3e23b881a9933e40b5 -rde4ebfc961abbbcd502b9932f52c21e315a631c3
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensionsTest.cs	(.../MacroStabilityInwardsCalculationEntityReadExtensionsTest.cs)	(revision 33d8b4610b6bc2979e35aa3e23b881a9933e40b5)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensionsTest.cs	(.../MacroStabilityInwardsCalculationEntityReadExtensionsTest.cs)	(revision de4ebfc961abbbcd502b9932f52c21e315a631c3)
@@ -72,6 +72,7 @@
                 MoveGrid = Convert.ToByte(random.NextBoolean()),
                 DikeSoilScenarioType = Convert.ToByte(random.NextEnumValue<MacroStabilityInwardsDikeSoilScenario>()),
                 WaterLevelRiverAverage = random.NextDouble(),
+                DrainageConstructionPresent = Convert.ToByte(random.NextBoolean()),
                 DrainageConstructionCoordinateX = random.NextDouble(),
                 DrainageConstructionCoordinateZ = random.NextDouble(),
                 MinimumLevelPhreaticLineAtDikeTopRiver = random.NextDouble(),
@@ -112,7 +113,8 @@
                 RightGridNrOfHorizontalPoints = random.Next(),
                 RightGridZTop = random.NextDouble(),
                 RightGridZBottom = random.NextDouble(),
-                RightGridNrOfVerticalPoints = random.Next()
+                RightGridNrOfVerticalPoints = random.Next(),
+                CreateZones = Convert.ToByte(random.NextBoolean())
             };
 
             var collector = new ReadConversionCollector();
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSemiProbabilisticOutputEntityReadExtensionsTest.cs
===================================================================
diff -u -r7b4e976738871759292c8219091bae62b966acae -rde4ebfc961abbbcd502b9932f52c21e315a631c3
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSemiProbabilisticOutputEntityReadExtensionsTest.cs	(.../MacroStabilityInwardsSemiProbabilisticOutputEntityReadExtensionsTest.cs)	(revision 7b4e976738871759292c8219091bae62b966acae)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSemiProbabilisticOutputEntityReadExtensionsTest.cs	(.../MacroStabilityInwardsSemiProbabilisticOutputEntityReadExtensionsTest.cs)	(revision de4ebfc961abbbcd502b9932f52c21e315a631c3)
@@ -91,15 +91,15 @@
             Assert.IsNaN(output.MacroStabilityInwardsFactorOfSafety);
         }
 
-        private static void AssertAreEqual(double? expectedParamterValue, double actualParameterValue)
+        private static void AssertAreEqual(double? expectedParameterValue, double actualParameterValue)
         {
-            Assert.AreEqual(expectedParamterValue, actualParameterValue);
+            Assert.AreEqual(expectedParameterValue, actualParameterValue);
         }
 
-        private static void AssertAreEqual(double? expectedParamterValue, RoundedDouble actualParameterValue)
+        private static void AssertAreEqual(double? expectedParameterValue, RoundedDouble actualParameterValue)
         {
-            Assert.IsTrue(expectedParamterValue.HasValue);
-            Assert.AreEqual(expectedParamterValue.Value, actualParameterValue, actualParameterValue.GetAccuracy());
+            Assert.IsTrue(expectedParameterValue.HasValue);
+            Assert.AreEqual(expectedParameterValue.Value, actualParameterValue, actualParameterValue.GetAccuracy());
         }
     }
 }
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityTestHelper.cs
===================================================================
diff -u -r33d8b4610b6bc2979e35aa3e23b881a9933e40b5 -rde4ebfc961abbbcd502b9932f52c21e315a631c3
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityTestHelper.cs	(.../MacroStabilityInwardsCalculationEntityTestHelper.cs)	(revision 33d8b4610b6bc2979e35aa3e23b881a9933e40b5)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityTestHelper.cs	(.../MacroStabilityInwardsCalculationEntityTestHelper.cs)	(revision de4ebfc961abbbcd502b9932f52c21e315a631c3)
@@ -79,6 +79,7 @@
             Assert.AreEqual(Convert.ToByte(input.MoveGrid), entity.MoveGrid);
             Assert.AreEqual(Convert.ToByte(input.DikeSoilScenario), entity.DikeSoilScenarioType);
             AssertAreEqual(input.WaterLevelRiverAverage, entity.WaterLevelRiverAverage);
+            Assert.AreEqual(Convert.ToByte(input.DrainageConstructionPresent), entity.DrainageConstructionPresent);
             AssertAreEqual(input.XCoordinateDrainageConstruction, entity.DrainageConstructionCoordinateX);
             AssertAreEqual(input.ZCoordinateDrainageConstruction, entity.DrainageConstructionCoordinateZ);
             AssertAreEqual(input.MinimumLevelPhreaticLineAtDikeTopRiver, entity.MinimumLevelPhreaticLineAtDikeTopRiver);
@@ -117,8 +118,8 @@
             AssertAreEqual(leftGrid.ZBottom, entity.LeftGridZBottom);
             Assert.AreEqual(leftGrid.NumberOfVerticalPoints, entity.LeftGridNrOfVerticalPoints);
 
+            AssertAreEqual(rightGrid.XLeft, entity.RightGridXLeft);
             AssertAreEqual(rightGrid.XRight, entity.RightGridXRight);
-            AssertAreEqual(rightGrid.XRight, entity.RightGridXRight);
             Assert.AreEqual(rightGrid.NumberOfHorizontalPoints, entity.RightGridNrOfHorizontalPoints);
             AssertAreEqual(rightGrid.ZTop, entity.RightGridZTop);
             AssertAreEqual(rightGrid.ZBottom, entity.RightGridZBottom);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/MacroStabilityInwards/MacroStabilityInwardsCalculationOutputEntityTestHelper.cs
===================================================================
diff -u -r33d8b4610b6bc2979e35aa3e23b881a9933e40b5 -rde4ebfc961abbbcd502b9932f52c21e315a631c3
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/MacroStabilityInwards/MacroStabilityInwardsCalculationOutputEntityTestHelper.cs	(.../MacroStabilityInwardsCalculationOutputEntityTestHelper.cs)	(revision 33d8b4610b6bc2979e35aa3e23b881a9933e40b5)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/MacroStabilityInwards/MacroStabilityInwardsCalculationOutputEntityTestHelper.cs	(.../MacroStabilityInwardsCalculationOutputEntityTestHelper.cs)	(revision de4ebfc961abbbcd502b9932f52c21e315a631c3)
@@ -81,8 +81,8 @@
             Assert.AreEqual(leftGrid.NumberOfVerticalPoints, entity.SlipPlaneLeftGridNrOfVerticalPoints);
 
             MacroStabilityInwardsGrid rightGrid = slipPlane.RightGrid;
+            AssertAreEqual(rightGrid.XLeft, entity.SlipPlaneRightGridXLeft);
             AssertAreEqual(rightGrid.XRight, entity.SlipPlaneRightGridXRight);
-            AssertAreEqual(rightGrid.XRight, entity.SlipPlaneRightGridXRight);
             Assert.AreEqual(rightGrid.NumberOfHorizontalPoints, entity.SlipPlaneRightGridNrOfHorizontalPoints);
             AssertAreEqual(rightGrid.ZTop, entity.SlipPlaneRightGridZTop);
             AssertAreEqual(rightGrid.ZBottom, entity.SlipPlaneRightGridZBottom);