Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs
===================================================================
diff -u -r686c5eeaad900a6bb627733de8c21bd607f130aa -rb2b200315a083c291be715da833f87b0247a4050
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs	(.../MacroStabilityInwardsChartDataFactory.cs)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs	(.../MacroStabilityInwardsChartDataFactory.cs)	(revision b2b200315a083c291be715da833f87b0247a4050)
@@ -201,15 +201,20 @@
         /// <summary>
         /// Create <see cref="ChartMultipleAreaData"/> for a <see cref="MacroStabilityInwardsSoilLayer2D"/>.
         /// </summary>
-        /// <param name="name">The name of the <see cref="ChartData"/>.</param>
-        /// <param name="fillColor">The fill color of the <see cref="ChartData"/>.</param>
+        /// <param name="layer">The layer to create the <see cref="ChartMultipleAreaData"/> for.</param>
         /// <returns>The created <see cref="ChartMultipleAreaData"/>.</returns>
-        public static ChartMultipleAreaData CreateSoilLayerChartData(string name, Color fillColor)
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="layer"/> is <c>null</c>.</exception>
+        public static ChartMultipleAreaData CreateSoilLayerChartData(MacroStabilityInwardsSoilLayer2D layer)
         {
-            return new ChartMultipleAreaData(name,
+            if (layer == null)
+            {
+                throw new ArgumentNullException(nameof(layer));
+            }
+            MacroStabilityInwardsSoilLayerData data = layer.Data;
+            return new ChartMultipleAreaData(data.MaterialName,
                                              new ChartAreaStyle
                                              {
-                                                 FillColor = fillColor,
+                                                 FillColor = data.Color,
                                                  StrokeColor = Color.Black,
                                                  StrokeThickness = 1
                                              });
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsInputView.cs
===================================================================
diff -u -r03bb865f66b346c37c91f2cd8a442abbb2952cba -rb2b200315a083c291be715da833f87b0247a4050
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsInputView.cs	(.../MacroStabilityInwardsInputView.cs)	(revision 03bb865f66b346c37c91f2cd8a442abbb2952cba)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsInputView.cs	(.../MacroStabilityInwardsInputView.cs)	(revision b2b200315a083c291be715da833f87b0247a4050)
@@ -296,8 +296,7 @@
 
             IEnumerable<MacroStabilityInwardsSoilLayer2D> soilLayers = GetSoilLayers().Reverse();
 
-            soilLayers.Select(layer => MacroStabilityInwardsChartDataFactory.CreateSoilLayerChartData(layer.Data.MaterialName,
-                                                                                                      layer.Data.Color))
+            soilLayers.Select(MacroStabilityInwardsChartDataFactory.CreateSoilLayerChartData)
                       .ForEachElementDo(sl =>
                       {
                           soilProfileChartData.Insert(0, sl);
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsOutputChartControl.cs
===================================================================
diff -u -r03bb865f66b346c37c91f2cd8a442abbb2952cba -rb2b200315a083c291be715da833f87b0247a4050
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsOutputChartControl.cs	(.../MacroStabilityInwardsOutputChartControl.cs)	(revision 03bb865f66b346c37c91f2cd8a442abbb2952cba)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsOutputChartControl.cs	(.../MacroStabilityInwardsOutputChartControl.cs)	(revision b2b200315a083c291be715da833f87b0247a4050)
@@ -215,8 +215,7 @@
 
             IEnumerable<MacroStabilityInwardsSoilLayer2D> soilLayers = GetSoilLayers().Reverse();
 
-            soilLayers.Select(layer => MacroStabilityInwardsChartDataFactory.CreateSoilLayerChartData(layer.Data.MaterialName,
-                                                                                                      layer.Data.Color))
+            soilLayers.Select(MacroStabilityInwardsChartDataFactory.CreateSoilLayerChartData)
                       .ForEachElementDo(sl =>
                       {
                           soilProfileChartData.Insert(0, sl);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/SoilProfile/MacroStabilityInwardsSoilLayer1DTestFactoryTest.cs
===================================================================
diff -u -r9e2f9f7fe2d7daf45c943fc446cd9edc4298290d -rb2b200315a083c291be715da833f87b0247a4050
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/SoilProfile/MacroStabilityInwardsSoilLayer1DTestFactoryTest.cs	(.../MacroStabilityInwardsSoilLayer1DTestFactoryTest.cs)	(revision 9e2f9f7fe2d7daf45c943fc446cd9edc4298290d)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/SoilProfile/MacroStabilityInwardsSoilLayer1DTestFactoryTest.cs	(.../MacroStabilityInwardsSoilLayer1DTestFactoryTest.cs)	(revision b2b200315a083c291be715da833f87b0247a4050)
@@ -37,7 +37,6 @@
 
             // Assert
             Assert.IsNotNull(soilLayer);
-            Assert.AreEqual(typeof(MacroStabilityInwardsSoilLayer1D), soilLayer.GetType());
             Assert.AreEqual(0.0, soilLayer.Top);
             Assert.AreEqual(new MacroStabilityInwardsSoilLayerData
             {
@@ -53,7 +52,6 @@
 
             // Assert
             Assert.IsNotNull(soilLayer);
-            Assert.AreEqual(typeof(MacroStabilityInwardsSoilLayer1D), soilLayer.GetType());
             Assert.AreEqual(4.5, soilLayer.Top);
             Assert.AreEqual(new MacroStabilityInwardsSoilLayerData
             {
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/SoilProfile/MacroStabilityInwardsSoilLayer2DTestFactoryTest.cs
===================================================================
diff -u -r9e2f9f7fe2d7daf45c943fc446cd9edc4298290d -rb2b200315a083c291be715da833f87b0247a4050
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/SoilProfile/MacroStabilityInwardsSoilLayer2DTestFactoryTest.cs	(.../MacroStabilityInwardsSoilLayer2DTestFactoryTest.cs)	(revision 9e2f9f7fe2d7daf45c943fc446cd9edc4298290d)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/SoilProfile/MacroStabilityInwardsSoilLayer2DTestFactoryTest.cs	(.../MacroStabilityInwardsSoilLayer2DTestFactoryTest.cs)	(revision b2b200315a083c291be715da833f87b0247a4050)
@@ -37,7 +37,6 @@
 
             // Assert
             Assert.IsNotNull(soilLayer);
-            Assert.AreEqual(typeof(MacroStabilityInwardsSoilLayer2D), soilLayer.GetType());
             Assert.AreEqual(new Ring(new[]
             {
                 new Point2D(0, 0),
@@ -60,7 +59,6 @@
 
             // Assert
             Assert.IsNotNull(soilLayer);
-            Assert.AreEqual(typeof(MacroStabilityInwardsSoilLayer2D), soilLayer.GetType());
             Assert.AreEqual(new Ring(new[]
             {
                 new Point2D(0, 0),
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/SoilProfile/MacroStabilityInwardsStochasticSoilProfileTestFactoryTest.cs
===================================================================
diff -u -rf1a0220eaafcd55ec39eb0b0c93d5fbd1c65d8c9 -rb2b200315a083c291be715da833f87b0247a4050
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/SoilProfile/MacroStabilityInwardsStochasticSoilProfileTestFactoryTest.cs	(.../MacroStabilityInwardsStochasticSoilProfileTestFactoryTest.cs)	(revision f1a0220eaafcd55ec39eb0b0c93d5fbd1c65d8c9)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/SoilProfile/MacroStabilityInwardsStochasticSoilProfileTestFactoryTest.cs	(.../MacroStabilityInwardsStochasticSoilProfileTestFactoryTest.cs)	(revision b2b200315a083c291be715da833f87b0247a4050)
@@ -115,7 +115,6 @@
 
             Assert.AreEqual(0.5, stochasticSoilProfile.Probability);
 
-            Assert.IsInstanceOf<MacroStabilityInwardsSoilProfile2D>(stochasticSoilProfile.SoilProfile);
             var soilProfile = (MacroStabilityInwardsSoilProfile2D) stochasticSoilProfile.SoilProfile;
             Assert.AreEqual("Profile 2D", soilProfile.Name);
             CollectionAssert.AreEqual(layers, soilProfile.Layers);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs
===================================================================
diff -u -r079488cb80d6e0ae43e0505820c3e554d2c7acb5 -rb2b200315a083c291be715da833f87b0247a4050
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs	(.../MacroStabilityInwardsChartDataFactoryTest.cs)	(revision 079488cb80d6e0ae43e0505820c3e554d2c7acb5)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs	(.../MacroStabilityInwardsChartDataFactoryTest.cs)	(revision b2b200315a083c291be715da833f87b0247a4050)
@@ -25,6 +25,7 @@
 using Core.Components.Chart.Styles;
 using NUnit.Framework;
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
+using Ringtoets.MacroStabilityInwards.Data.TestUtil.SoilProfile;
 using Ringtoets.MacroStabilityInwards.Forms.Factories;
 using Ringtoets.MacroStabilityInwards.Primitives;
 
@@ -204,15 +205,30 @@
         }
 
         [Test]
-        public void CreateSoilLayerChartData_NameAndFillColor_ReturnsEmptyChartDataCollectionWithExpectedStyling()
+        public void CreateSoilLayerChartData_LayerNull_ThrowsArgumentNullException()
         {
+            // Call
+            TestDelegate call = () => MacroStabilityInwardsChartDataFactory.CreateSoilLayerChartData(null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("layer", exception.ParamName);
+        }
+
+        [Test]
+        public void CreateSoilLayerChartData_WithLayer_ReturnsEmptyChartDataCollectionWithExpectedStyling()
+        {
             // Setup
             const string name = "Soil layer test name";
             Color fillColor = Color.Firebrick;
 
             // Call
-            ChartMultipleAreaData data = MacroStabilityInwardsChartDataFactory.CreateSoilLayerChartData(name, fillColor);
+            MacroStabilityInwardsSoilLayer2D layer = MacroStabilityInwardsSoilLayer2DTestFactory.CreateMacroStabilityInwardsSoilLayer2D();
+            layer.Data.MaterialName = name;
+            layer.Data.Color = fillColor;
 
+            ChartMultipleAreaData data = MacroStabilityInwardsChartDataFactory.CreateSoilLayerChartData(layer);
+
             // Assert
             CollectionAssert.IsEmpty(data.Areas);
             Assert.AreEqual(name, data.Name);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputChartControlTest.cs
===================================================================
diff -u -r9e2f9f7fe2d7daf45c943fc446cd9edc4298290d -rb2b200315a083c291be715da833f87b0247a4050
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputChartControlTest.cs	(.../MacroStabilityInwardsOutputChartControlTest.cs)	(revision 9e2f9f7fe2d7daf45c943fc446cd9edc4298290d)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputChartControlTest.cs	(.../MacroStabilityInwardsOutputChartControlTest.cs)	(revision b2b200315a083c291be715da833f87b0247a4050)
@@ -151,9 +151,8 @@
                 {
                     InputParameters =
                     {
-                        SurfaceLine = surfaceLine,
-                    },
-                    Output = MacroStabilityInwardsOutputTestFactory.CreateOutput()
+                        SurfaceLine = surfaceLine
+                    }
                 };
 
                 // Call
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsOutputViewChartDataAssert.cs
===================================================================
diff -u -r9e2f9f7fe2d7daf45c943fc446cd9edc4298290d -rb2b200315a083c291be715da833f87b0247a4050
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsOutputViewChartDataAssert.cs	(.../MacroStabilityInwardsOutputViewChartDataAssert.cs)	(revision 9e2f9f7fe2d7daf45c943fc446cd9edc4298290d)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsOutputViewChartDataAssert.cs	(.../MacroStabilityInwardsOutputViewChartDataAssert.cs)	(revision b2b200315a083c291be715da833f87b0247a4050)
@@ -205,7 +205,6 @@
             Assert.AreEqual(nrOfChartData, chartDataArray.Length);
 
             var surfaceLineData = (ChartLineData) chartDataArray[surfaceLineIndex];
-            //var soilProfileData = (ChartDataCollection) chartDataArray[soilProfileIndex];
             var surfaceLevelInsideData = (ChartPointData) chartDataArray[surfaceLevelInsideIndex];
             var ditchPolderSideData = (ChartPointData) chartDataArray[ditchPolderSideIndex];
             var bottomDitchPolderSideData = (ChartPointData) chartDataArray[bottomDitchPolderSideIndex];
@@ -234,7 +233,6 @@
             CollectionAssert.IsEmpty(surfaceLevelOutsideData.Points);
 
             Assert.AreEqual("Profielschematisatie", surfaceLineData.Name);
-            //Assert.AreEqual("Ondergrondschematisatie", soilProfileData.Name);
             Assert.AreEqual("Maaiveld binnenwaarts", surfaceLevelInsideData.Name);
             Assert.AreEqual("Insteek sloot polderzijde", ditchPolderSideData.Name);
             Assert.AreEqual("Slootbodem polderzijde", bottomDitchPolderSideData.Name);
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingChartDataFactory.cs
===================================================================
diff -u -rf1a0220eaafcd55ec39eb0b0c93d5fbd1c65d8c9 -rb2b200315a083c291be715da833f87b0247a4050
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingChartDataFactory.cs	(.../PipingChartDataFactory.cs)	(revision f1a0220eaafcd55ec39eb0b0c93d5fbd1c65d8c9)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Factories/PipingChartDataFactory.cs	(.../PipingChartDataFactory.cs)	(revision b2b200315a083c291be715da833f87b0247a4050)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using System.Drawing;
 using Core.Components.Chart.Data;
 using Core.Components.Chart.Styles;
@@ -57,15 +58,19 @@
         /// Create <see cref="ChartMultipleAreaData"/> for a <see cref="PipingSoilLayer"/> based
         /// on its name and fill color.
         /// </summary>
-        /// <param name="name">The name of the <see cref="ChartData"/>.</param>
-        /// <param name="fillColor">The fill color of the <see cref="ChartData"/>.</param>
+        /// <param name="layer">The layer to create the <see cref="ChartMultipleAreaData"/> for.</param>
         /// <returns>The created <see cref="ChartMultipleAreaData"/>.</returns>
-        public static ChartMultipleAreaData CreateSoilLayerChartData(string name, Color fillColor)
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="layer"/> is <c>null</c>.</exception>
+        public static ChartMultipleAreaData CreateSoilLayerChartData(PipingSoilLayer layer)
         {
-            return new ChartMultipleAreaData(name,
+            if (layer == null)
+            {
+                throw new ArgumentNullException(nameof(layer));
+            }
+            return new ChartMultipleAreaData(layer.MaterialName,
                                              new ChartAreaStyle
                                              {
-                                                 FillColor = fillColor,
+                                                 FillColor = layer.Color,
                                                  StrokeColor = Color.Black,
                                                  StrokeThickness = 1
                                              });
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingInputView.cs
===================================================================
diff -u -rf1a0220eaafcd55ec39eb0b0c93d5fbd1c65d8c9 -rb2b200315a083c291be715da833f87b0247a4050
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingInputView.cs	(.../PipingInputView.cs)	(revision f1a0220eaafcd55ec39eb0b0c93d5fbd1c65d8c9)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingInputView.cs	(.../PipingInputView.cs)	(revision b2b200315a083c291be715da833f87b0247a4050)
@@ -200,8 +200,7 @@
 
                 soilProfileChartData.Clear();
                 soilLayerChartDataLookup.Clear();
-                GetSoilLayers().Select(layer => PipingChartDataFactory.CreateSoilLayerChartData(layer.MaterialName,
-                                                                                                layer.Color))
+                GetSoilLayers().Select(PipingChartDataFactory.CreateSoilLayerChartData)
                                .ForEachElementDo(sl =>
                                {
                                    soilProfileChartData.Insert(0, sl);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingChartDataFactoryTest.cs
===================================================================
diff -u -rf1a0220eaafcd55ec39eb0b0c93d5fbd1c65d8c9 -rb2b200315a083c291be715da833f87b0247a4050
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingChartDataFactoryTest.cs	(.../PipingChartDataFactoryTest.cs)	(revision f1a0220eaafcd55ec39eb0b0c93d5fbd1c65d8c9)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingChartDataFactoryTest.cs	(.../PipingChartDataFactoryTest.cs)	(revision b2b200315a083c291be715da833f87b0247a4050)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using System.Drawing;
 using Core.Components.Chart.Data;
 using Core.Components.Chart.Styles;
@@ -56,14 +57,29 @@
         }
 
         [Test]
-        public void CreateSoilLayerChartData_NameAndFillColor_ReturnsEmptyChartDataCollectionWithExpectedStyling()
+        public void CreateSoilLayerChartData_LayerNull_ThrowsArgumentNullException()
         {
+            // Call
+            TestDelegate call = () => PipingChartDataFactory.CreateSoilLayerChartData(null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("layer", exception.ParamName);
+        }
+
+        [Test]
+        public void CreateSoilLayerChartData_WithLayer_ReturnsEmptyChartDataCollectionWithExpectedStyling()
+        {
             // Setup
             const string name = "Soil layer test name";
             Color fillColor = Color.Firebrick;
 
             // Call
-            ChartMultipleAreaData data = PipingChartDataFactory.CreateSoilLayerChartData(name, fillColor);
+            ChartMultipleAreaData data = PipingChartDataFactory.CreateSoilLayerChartData(new PipingSoilLayer(0)
+            {
+                MaterialName = name,
+                Color = fillColor
+            });
 
             // Assert
             CollectionAssert.IsEmpty(data.Areas);