Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/UpliftVanDrainageConstructionConverterTest.cs
===================================================================
diff -u -r82014e97419537804be86264d0ed501637ccd10f -r1d5845d450b7e2cf891e7a6314927410561e8792
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/UpliftVanDrainageConstructionConverterTest.cs	(.../UpliftVanDrainageConstructionConverterTest.cs)	(revision 82014e97419537804be86264d0ed501637ccd10f)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/UpliftVanDrainageConstructionConverterTest.cs	(.../UpliftVanDrainageConstructionConverterTest.cs)	(revision 1d5845d450b7e2cf891e7a6314927410561e8792)
@@ -24,6 +24,7 @@
 using NUnit.Framework;
 using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Input;
+using Ringtoets.MacroStabilityInwards.Primitives;
 using Ringtoets.MacroStabilityInwards.Service.Converters;
 
 namespace Ringtoets.MacroStabilityInwards.Service.Test.Converters
@@ -42,15 +43,19 @@
             Assert.AreEqual("input", exception.ParamName);
         }
 
-        [Test]
-        public void Convert_DrainageConsructionPresentFalse_ReturnUpliftVanDrainageConstruction()
+        [TestCase(MacroStabilityInwardsDikeSoilScenario.ClayDikeOnSand)]
+        [TestCase(MacroStabilityInwardsDikeSoilScenario.ClayDikeOnClay)]
+        [TestCase(MacroStabilityInwardsDikeSoilScenario.SandDikeOnSand)]
+        [TestCase(MacroStabilityInwardsDikeSoilScenario.SandDikeOnClay)]
+        public void Convert_DrainageConstructionPresentFalse_ReturnUpliftVanDrainageConstruction(MacroStabilityInwardsDikeSoilScenario soilScenario)
         {
             // Setup
             var input = new MacroStabilityInwardsInput
             {
                 DrainageConstructionPresent = false,
                 XCoordinateDrainageConstruction = (RoundedDouble) 2,
-                ZCoordinateDrainageConstruction = (RoundedDouble) 4
+                ZCoordinateDrainageConstruction = (RoundedDouble) 4,
+                DikeSoilScenario = soilScenario
             };
 
             // Call
@@ -63,14 +68,17 @@
         }
 
         [Test]
-        public void Convert_DrainageConsructionPresentTrue_ReturnUpliftVanDrainageConstruction()
+        [TestCase(MacroStabilityInwardsDikeSoilScenario.SandDikeOnSand)]
+        [TestCase(MacroStabilityInwardsDikeSoilScenario.SandDikeOnClay)]
+        public void Convert_SandDikeAndDrainageConstructionPresentTrue_ReturnUpliftVanDrainageConstruction(MacroStabilityInwardsDikeSoilScenario soilScenario)
         {
             // Setup
             var input = new MacroStabilityInwardsInput
             {
                 DrainageConstructionPresent = true,
                 XCoordinateDrainageConstruction = (RoundedDouble) 2,
-                ZCoordinateDrainageConstruction = (RoundedDouble) 4
+                ZCoordinateDrainageConstruction = (RoundedDouble) 4,
+                DikeSoilScenario = soilScenario
             };
 
             // Call
@@ -81,5 +89,27 @@
             Assert.AreEqual(input.XCoordinateDrainageConstruction, drainageConstruction.XCoordinate);
             Assert.AreEqual(input.ZCoordinateDrainageConstruction, drainageConstruction.ZCoordinate);
         }
+
+        [TestCase(MacroStabilityInwardsDikeSoilScenario.ClayDikeOnSand)]
+        [TestCase(MacroStabilityInwardsDikeSoilScenario.ClayDikeOnClay)]
+        public void Convert_ClayDikeAndDrainageConstructionPresentTrue_ReturnUpliftVanDrainageConstruction(MacroStabilityInwardsDikeSoilScenario soilScenario)
+        {
+            // Setup
+            var input = new MacroStabilityInwardsInput
+            {
+                DrainageConstructionPresent = true,
+                XCoordinateDrainageConstruction = (RoundedDouble) 2,
+                ZCoordinateDrainageConstruction = (RoundedDouble) 4,
+                DikeSoilScenario = soilScenario
+            };
+
+            // Call
+            UpliftVanDrainageConstruction drainageConstruction = UpliftVanDrainageConstructionConverter.Convert(input);
+
+            // Assert
+            Assert.IsFalse(drainageConstruction.IsPresent);
+            Assert.IsNaN(drainageConstruction.XCoordinate);
+            Assert.IsNaN(drainageConstruction.ZCoordinate);
+        }
     }
 }
\ No newline at end of file