Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Kernels/TestMacroStabilityInwardsKernelFactoryTest.cs
===================================================================
diff -u -r870b9a145e270c1ae1879cfadec7ccbf9fade51d -r4036cfca6b11985b19813815a36a321a76ea0120
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Kernels/TestMacroStabilityInwardsKernelFactoryTest.cs	(.../TestMacroStabilityInwardsKernelFactoryTest.cs)	(revision 870b9a145e270c1ae1879cfadec7ccbf9fade51d)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Kernels/TestMacroStabilityInwardsKernelFactoryTest.cs	(.../TestMacroStabilityInwardsKernelFactoryTest.cs)	(revision 4036cfca6b11985b19813815a36a321a76ea0120)
@@ -19,12 +19,12 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using Deltares.MacroStability.WaternetCreator;
+using Deltares.MacroStability.CSharpWrapper.Input;
 using NUnit.Framework;
 using Riskeer.MacroStabilityInwards.KernelWrapper.Kernels;
-using Riskeer.MacroStabilityInwards.KernelWrapper.Kernels.UpliftVan;
-using Riskeer.MacroStabilityInwards.KernelWrapper.Kernels.Waternet;
 using Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Kernels;
+using Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Kernels.UpliftVan;
+using Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Kernels.Waternet;
 
 namespace Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test.Kernels
 {
@@ -48,38 +48,44 @@
         {
             // Setup
             var factory = new TestMacroStabilityInwardsKernelFactory();
+            var input = new MacroStabilityInput();
 
             // Call
-            IUpliftVanKernel upliftVanKernel = factory.CreateUpliftVanKernel();
+            var upliftVanKernel = (UpliftVanKernelStub) factory.CreateUpliftVanKernel(input);
 
             // Assert
             Assert.AreSame(factory.LastCreatedUpliftVanKernel, upliftVanKernel);
+            Assert.AreSame(input, upliftVanKernel.KernelInput);
         }
 
         [Test]
         public void CreateWaternetExtremeKernel_Always_ReturnLastCreatedWaternetKernel()
         {
             // Setup
             var factory = new TestMacroStabilityInwardsKernelFactory();
+            var input = new MacroStabilityInput();
 
             // Call
-            IWaternetKernel waternetKernel = factory.CreateWaternetExtremeKernel(new Location());
+            var waternetKernel = (WaternetKernelStub) factory.CreateWaternetExtremeKernel(input);
 
             // Assert
             Assert.AreSame(factory.LastCreatedWaternetKernel, waternetKernel);
+            Assert.AreSame(input, waternetKernel.KernelInput);
         }
 
         [Test]
         public void CreateWaternetDailyKernel_Always_ReturnLastCreatedWaternetKernel()
         {
             // Setup
             var factory = new TestMacroStabilityInwardsKernelFactory();
+            var input = new MacroStabilityInput();
 
             // Call
-            IWaternetKernel waternetKernel = factory.CreateWaternetDailyKernel(new Location());
+            var waternetKernel = (WaternetKernelStub)factory.CreateWaternetDailyKernel(input);
 
             // Assert
             Assert.AreSame(factory.LastCreatedWaternetKernel, waternetKernel);
+            Assert.AreSame(input, waternetKernel.KernelInput);
         }
     }
 }
\ No newline at end of file