Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/WaternetCalculator.cs
===================================================================
diff -u -rfd823765e022710a4649fb2b22d02882bbec3981 -r3ab5eb5e03ed76e5deeafede59187a5fbc41c31c
--- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/WaternetCalculator.cs	(.../WaternetCalculator.cs)	(revision fd823765e022710a4649fb2b22d02882bbec3981)
+++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Calculators/Waternet/WaternetCalculator.cs	(.../WaternetCalculator.cs)	(revision 3ab5eb5e03ed76e5deeafede59187a5fbc41c31c)
@@ -113,7 +113,7 @@
 
         private void SetInputOnKernel(IWaternetKernel waternetKernel)
         {
-            LayerWithSoil[] layersWithSoil = LayerWithSoilCreator.Create(Input.SoilProfile, out IDictionary<SoilLayer, LayerWithSoil> layerLookup);
+            LayerWithSoil[] layersWithSoil = LayerWithSoilCreator.Create(Input.SoilProfile, out IDictionary<SoilLayer, LayerWithSoil> _);
 
             waternetKernel.SetSoilProfile(SoilProfileCreator.Create(layersWithSoil));
             waternetKernel.SetSurfaceLine(SurfaceLineCreator.Create(Input.SurfaceLine));
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs
===================================================================
diff -u -r5706a65cfb5fa70d760a75b69f6ceb301cd3b140 -r3ab5eb5e03ed76e5deeafede59187a5fbc41c31c
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs	(.../MacroStabilityInwardsInputViewTest.cs)	(revision 5706a65cfb5fa70d760a75b69f6ceb301cd3b140)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs	(.../MacroStabilityInwardsInputViewTest.cs)	(revision 3ab5eb5e03ed76e5deeafede59187a5fbc41c31c)
@@ -997,7 +997,10 @@
                     // Precondition
                     ChartData[] chartData = view.Chart.Data.Collection.ToArray();
                     calculatorStub.Output = WaternetCalculatorResultTestFactory.Create();
-                    Assert.AreEqual(19, chartData.Length);
+                    MacroStabilityInwardsInputViewChartDataAssert.AssertWaternetChartData(DerivedMacroStabilityInwardsInput.GetWaternetDaily(calculation.InputParameters),
+                                                                                          (ChartDataCollection)chartData[waternetZonesDailyIndex]);
+                    MacroStabilityInwardsInputViewChartDataAssert.AssertWaternetChartData(DerivedMacroStabilityInwardsInput.GetWaternetExtreme(calculation.InputParameters, RoundedDouble.NaN),
+                                                                                          (ChartDataCollection) chartData[waternetZonesExtremeIndex]);
 
                     calculatorStub.Output = WaternetCalculatorResultTestFactory.CreateEmptyResult();
 
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/Waternet/Output/WaternetCalculatorResultTestFactoryTest.cs
===================================================================
diff -u -rd6e59cef3f01587e735de2113772ac09d18b3e1a -r3ab5eb5e03ed76e5deeafede59187a5fbc41c31c
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/Waternet/Output/WaternetCalculatorResultTestFactoryTest.cs	(.../WaternetCalculatorResultTestFactoryTest.cs)	(revision d6e59cef3f01587e735de2113772ac09d18b3e1a)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/Waternet/Output/WaternetCalculatorResultTestFactoryTest.cs	(.../WaternetCalculatorResultTestFactoryTest.cs)	(revision 3ab5eb5e03ed76e5deeafede59187a5fbc41c31c)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Base.Geometry;
 using NUnit.Framework;
@@ -60,5 +61,16 @@
             }, waternetLine.Geometry);
             Assert.AreSame(phreaticLine, waternetLine.PhreaticLine);
         }
+
+        [Test]
+        public void CreateEmptyResult_Always_ReturnEmptyCalculatorResult()
+        {
+            // Call
+            WaternetCalculatorResult result = WaternetCalculatorResultTestFactory.CreateEmptyResult();
+
+            // Assert
+            CollectionAssert.AreEqual(new List<WaternetPhreaticLineResult>(), result.PhreaticLines);
+            CollectionAssert.AreEqual(new List<WaternetLineResult>(), result.WaternetLines);
+        }
     }
 }
\ No newline at end of file
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Calculators/Waternet/Output/WaternetCalculatorResultTestFactory.cs
===================================================================
diff -u -rdccd06261ac7704bcdf747ef9fb0765b5662375e -r3ab5eb5e03ed76e5deeafede59187a5fbc41c31c
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Calculators/Waternet/Output/WaternetCalculatorResultTestFactory.cs	(.../WaternetCalculatorResultTestFactory.cs)	(revision dccd06261ac7704bcdf747ef9fb0765b5662375e)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Calculators/Waternet/Output/WaternetCalculatorResultTestFactory.cs	(.../WaternetCalculatorResultTestFactory.cs)	(revision 3ab5eb5e03ed76e5deeafede59187a5fbc41c31c)
@@ -56,7 +56,7 @@
         }
 
         /// <summary>
-        /// Creates a new <see cref="WaternetCalculatorResult"/> with an empty phreatic lines and Waternet lines collections.
+        /// Creates a new <see cref="WaternetCalculatorResult"/> with an empty phreatic lines and Waternet lines collection.
         /// </summary>
         /// <returns>The created <see cref="WaternetCalculatorResult"/>.</returns>
         public static WaternetCalculatorResult CreateEmptyResult()