Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityReadExtensions.cs
===================================================================
diff -u -r1b7dec5dc5d682b37d0191d99da2ff640cc56022 -ra07b01c421d15a0a1e4933e3967ac1f25d30eccc
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityReadExtensions.cs	(.../MacroStabilityInwardsSoilLayerTwoDEntityReadExtensions.cs)	(revision 1b7dec5dc5d682b37d0191d99da2ff640cc56022)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityReadExtensions.cs	(.../MacroStabilityInwardsSoilLayerTwoDEntityReadExtensions.cs)	(revision a07b01c421d15a0a1e4933e3967ac1f25d30eccc)
@@ -54,7 +54,7 @@
 
             return new MacroStabilityInwardsSoilLayer2D(outerRing, new Ring[0])
             {
-                Data = new MacroStabilityInwardsSoilLayerData
+                Data =
                 {
                     IsAquifer = Convert.ToBoolean(entity.IsAquifer),
                     MaterialName = entity.MaterialName ?? string.Empty,
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSoilLayer2DCreateExtensionsTest.cs
===================================================================
diff -u -r1b7dec5dc5d682b37d0191d99da2ff640cc56022 -ra07b01c421d15a0a1e4933e3967ac1f25d30eccc
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSoilLayer2DCreateExtensionsTest.cs	(.../MacroStabilityInwardsSoilLayer2DCreateExtensionsTest.cs)	(revision 1b7dec5dc5d682b37d0191d99da2ff640cc56022)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSoilLayer2DCreateExtensionsTest.cs	(.../MacroStabilityInwardsSoilLayer2DCreateExtensionsTest.cs)	(revision a07b01c421d15a0a1e4933e3967ac1f25d30eccc)
@@ -58,7 +58,7 @@
                 CreateRandomRing(random)
             })
             {
-                Data = new MacroStabilityInwardsSoilLayerData
+                Data =
                 {
                     IsAquifer = random.NextBoolean(),
                     MaterialName = "MaterialName",
@@ -146,7 +146,7 @@
             var random = new Random(31);
             var soilLayer = new MacroStabilityInwardsSoilLayer2D(CreateRandomRing(random), Enumerable.Empty<Ring>())
             {
-                Data = new MacroStabilityInwardsSoilLayerData
+                Data =
                 {
                     AbovePhreaticLevel =
                     {
@@ -223,7 +223,7 @@
                 CreateRandomRing(random)
             })
             {
-                Data = new MacroStabilityInwardsSoilLayerData
+                Data =
                 {
                     MaterialName = materialName
                 }
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSoilProfile2DCreateExtensionsTest.cs
===================================================================
diff -u -r7585d2fd78627d94d55ffa16423af90a91e4efd4 -ra07b01c421d15a0a1e4933e3967ac1f25d30eccc
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSoilProfile2DCreateExtensionsTest.cs	(.../MacroStabilityInwardsSoilProfile2DCreateExtensionsTest.cs)	(revision 7585d2fd78627d94d55ffa16423af90a91e4efd4)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSoilProfile2DCreateExtensionsTest.cs	(.../MacroStabilityInwardsSoilProfile2DCreateExtensionsTest.cs)	(revision a07b01c421d15a0a1e4933e3967ac1f25d30eccc)
@@ -31,7 +31,6 @@
 using Ringtoets.Common.Data.Probabilistics;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
-using Ringtoets.MacroStabilityInwards.Data.TestUtil;
 using Ringtoets.MacroStabilityInwards.Data.TestUtil.SoilProfile;
 using Ringtoets.MacroStabilityInwards.Primitives;
 
@@ -152,9 +151,6 @@
                     new Point2D(random.NextDouble(), random.NextDouble()),
                     new Point2D(random.NextDouble(), random.NextDouble())
                 }), Enumerable.Empty<Ring>())
-                {
-                    Data = new MacroStabilityInwardsSoilLayerData()
-                }
             };
 
             return new MacroStabilityInwardsSoilProfile2D(name, layers, Enumerable.Empty<MacroStabilityInwardsPreconsolidationStress>());
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
===================================================================
diff -u -rbeb20fbb814f4128b6d7dc7648af798fcccbe24c -ra07b01c421d15a0a1e4933e3967ac1f25d30eccc
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision beb20fbb814f4128b6d7dc7648af798fcccbe24c)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision a07b01c421d15a0a1e4933e3967ac1f25d30eccc)
@@ -1132,7 +1132,7 @@
                 })
             })
             {
-                Data = new MacroStabilityInwardsSoilLayerData
+                Data =
                 {
                     IsAquifer = false,
                     MaterialName = "GainsboroLayer",
Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs
===================================================================
diff -u -rbeb20fbb814f4128b6d7dc7648af798fcccbe24c -ra07b01c421d15a0a1e4933e3967ac1f25d30eccc
--- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs	(.../AddNewDemoAssessmentSectionCommand.cs)	(revision beb20fbb814f4128b6d7dc7648af798fcccbe24c)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs	(.../AddNewDemoAssessmentSectionCommand.cs)	(revision a07b01c421d15a0a1e4933e3967ac1f25d30eccc)
@@ -477,7 +477,7 @@
                                 })
                             })
                         {
-                            Data = new MacroStabilityInwardsSoilLayerData
+                            Data =
                             {
                                 MaterialName = "2D Layer"
                             }
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilLayer2D.cs
===================================================================
diff -u -r7585d2fd78627d94d55ffa16423af90a91e4efd4 -ra07b01c421d15a0a1e4933e3967ac1f25d30eccc
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilLayer2D.cs	(.../MacroStabilityInwardsSoilLayer2D.cs)	(revision 7585d2fd78627d94d55ffa16423af90a91e4efd4)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilLayer2D.cs	(.../MacroStabilityInwardsSoilLayer2D.cs)	(revision a07b01c421d15a0a1e4933e3967ac1f25d30eccc)
@@ -39,18 +39,36 @@
         /// the layer.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public MacroStabilityInwardsSoilLayer2D(Ring outerRing, IEnumerable<Ring> holes)
+            : this(outerRing, holes, new MacroStabilityInwardsSoilLayerData()) {}
+
+        /// <summary>
+        /// Creates a new instance of <see cref="MacroStabilityInwardsSoilLayer2D"/>.
+        /// </summary>
+        /// <param name="outerRing">The ring describing the outer boundaries of the layer.</param>
+        /// <param name="holes">The rings describing the holes within the outer boundaries of 
+        /// the layer.</param>
+        /// <param name="data">The data of the soil layer.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
+        public MacroStabilityInwardsSoilLayer2D(Ring outerRing, IEnumerable<Ring> holes, IMacroStabilityInwardsSoilLayerData data)
         {
             if (outerRing == null)
             {
                 throw new ArgumentNullException(nameof(outerRing));
             }
+
             if (holes == null)
             {
                 throw new ArgumentNullException(nameof(holes));
             }
 
+            if (data == null)
+            {
+                throw new ArgumentNullException(nameof(data));
+            }
+
             OuterRing = outerRing;
             Holes = holes.ToArray();
+            Data = data;
         }
 
         public Ring OuterRing { get; }
@@ -59,7 +77,7 @@
 
         public IEnumerable<IMacroStabilityInwardsSoilLayer2D> NestedLayers { get; set; }
 
-        public IMacroStabilityInwardsSoilLayerData Data { get; set; }
+        public IMacroStabilityInwardsSoilLayerData Data { get; }
 
         public override bool Equals(object obj)
         {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs
===================================================================
diff -u -r7585d2fd78627d94d55ffa16423af90a91e4efd4 -ra07b01c421d15a0a1e4933e3967ac1f25d30eccc
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs	(.../MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs)	(revision 7585d2fd78627d94d55ffa16423af90a91e4efd4)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs	(.../MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs)	(revision a07b01c421d15a0a1e4933e3967ac1f25d30eccc)
@@ -103,9 +103,8 @@
             {
                 foreach (Point2D[] soilLayerArea in GetSoilLayerWithSurfaceLineIntersection(surfaceLineGeometryArray, layer.OuterLoop))
                 {
-                    soilLayers.Add(new MacroStabilityInwardsSoilLayer2D(new Ring(soilLayerArea), Enumerable.Empty<Ring>())
+                    soilLayers.Add(new MacroStabilityInwardsSoilLayer2D(new Ring(soilLayerArea), Enumerable.Empty<Ring>(), layer.Data)
                     {
-                        Data = layer.Data,
                         NestedLayers = Enumerable.Empty<IMacroStabilityInwardsSoilLayer2D>()
                     });
                 }
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfiles/MacroStabilityInwardsSoilLayerTransformer.cs
===================================================================
diff -u -rbeb20fbb814f4128b6d7dc7648af798fcccbe24c -ra07b01c421d15a0a1e4933e3967ac1f25d30eccc
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfiles/MacroStabilityInwardsSoilLayerTransformer.cs	(.../MacroStabilityInwardsSoilLayerTransformer.cs)	(revision beb20fbb814f4128b6d7dc7648af798fcccbe24c)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfiles/MacroStabilityInwardsSoilLayerTransformer.cs	(.../MacroStabilityInwardsSoilLayerTransformer.cs)	(revision a07b01c421d15a0a1e4933e3967ac1f25d30eccc)
@@ -91,9 +91,8 @@
             Ring outerRing = TransformSegmentsToRing(soilLayer.OuterLoop.Segments);
             Ring[] innerRings = soilLayer.InnerLoops.Select(il => TransformSegmentsToRing(il.Segments)).ToArray();
 
-            return new MacroStabilityInwardsSoilLayer2D(outerRing, innerRings)
+            return new MacroStabilityInwardsSoilLayer2D(outerRing, innerRings, ConvertSoilLayerData(soilLayer))
             {
-                Data = ConvertSoilLayerData(soilLayer),
                 NestedLayers = soilLayer.NestedLayers.Select(ConvertLayerRecursively).ToArray()
             };
         }
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/Converters/SoilProfileConverterTest.cs
===================================================================
diff -u -r7585d2fd78627d94d55ffa16423af90a91e4efd4 -ra07b01c421d15a0a1e4933e3967ac1f25d30eccc
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/Converters/SoilProfileConverterTest.cs	(.../SoilProfileConverterTest.cs)	(revision 7585d2fd78627d94d55ffa16423af90a91e4efd4)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/Converters/SoilProfileConverterTest.cs	(.../SoilProfileConverterTest.cs)	(revision a07b01c421d15a0a1e4933e3967ac1f25d30eccc)
@@ -62,7 +62,7 @@
                                                                      CreateRing(22)
                                                                  })
             {
-                Data = new MacroStabilityInwardsSoilLayerData
+                Data =
                 {
                     UsePop = random.NextBoolean(),
                     IsAquifer = random.NextBoolean(),
@@ -139,7 +139,7 @@
             {
                 new MacroStabilityInwardsSoilLayer2D(CreateRing(21), new Ring[0])
                 {
-                    Data = new MacroStabilityInwardsSoilLayerData
+                    Data =
                     {
                         ShearStrengthModel = (MacroStabilityInwardsShearStrengthModel) 99
                     }
@@ -166,7 +166,7 @@
             {
                 new MacroStabilityInwardsSoilLayer2D(CreateRing(21), new Ring[0])
                 {
-                    Data = new MacroStabilityInwardsSoilLayerData
+                    Data =
                     {
                         ShearStrengthModel = originalShearStrengthModel
                     }
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilLayer1DTest.cs
===================================================================
diff -u -rbeb20fbb814f4128b6d7dc7648af798fcccbe24c -ra07b01c421d15a0a1e4933e3967ac1f25d30eccc
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilLayer1DTest.cs	(.../MacroStabilityInwardsSoilLayer1DTest.cs)	(revision beb20fbb814f4128b6d7dc7648af798fcccbe24c)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilLayer1DTest.cs	(.../MacroStabilityInwardsSoilLayer1DTest.cs)	(revision a07b01c421d15a0a1e4933e3967ac1f25d30eccc)
@@ -46,7 +46,7 @@
         }
 
         [Test]
-        public void Constructor_WithTop_ReturnsNewInstanceWithExpectedProperties()
+        public void Constructor_WithTop_ReturnsNewInstance()
         {
             // Setup
             double top = new Random(22).NextDouble();
@@ -61,7 +61,7 @@
         }
 
         [Test]
-        public void Constructor_WithTopAndData_ReturnsNewInstanceWithExpectedProperties()
+        public void Constructor_WithTopAndData_ReturnsNewInstance()
         {
             // Setup
             double top = new Random(22).NextDouble();
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilLayer2DTest.cs
===================================================================
diff -u -r7585d2fd78627d94d55ffa16423af90a91e4efd4 -ra07b01c421d15a0a1e4933e3967ac1f25d30eccc
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilLayer2DTest.cs	(.../MacroStabilityInwardsSoilLayer2DTest.cs)	(revision 7585d2fd78627d94d55ffa16423af90a91e4efd4)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilLayer2DTest.cs	(.../MacroStabilityInwardsSoilLayer2DTest.cs)	(revision a07b01c421d15a0a1e4933e3967ac1f25d30eccc)
@@ -35,7 +35,7 @@
     public class MacroStabilityInwardsSoilLayer2DTest
     {
         [Test]
-        public void Constructor_WithoutOuterRing_ArgumentNullException()
+        public void Constructor_OuterRingNullWithoutData_ThrowsArgumentNullException()
         {
             // Setup
             var holes = new[]
@@ -56,9 +56,30 @@
         }
 
         [Test]
-        public void Constructor_WithoutHoles_ThrowsArgumentNullException()
+        public void Constructor_OuterRingNullWithData_ThrowsArgumentNullException()
         {
             // Setup
+            var holes = new[]
+            {
+                new Ring(new[]
+                {
+                    new Point2D(0, 2),
+                    new Point2D(2, 2)
+                })
+            };
+
+            // Call
+            TestDelegate test = () => new MacroStabilityInwardsSoilLayer2D(null, holes, new MacroStabilityInwardsSoilLayerData());
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("outerRing", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_HolesNullWithoutData_ThrowsArgumentNullException()
+        {
+            // Setup
             var outerRing = new Ring(new[]
             {
                 new Point2D(0, 2),
@@ -74,6 +95,43 @@
         }
 
         [Test]
+        public void Constructor_HolesNullWithData_ThrowsArgumentNullException()
+        {
+            // Setup
+            var outerRing = new Ring(new[]
+            {
+                new Point2D(0, 2),
+                new Point2D(2, 2)
+            });
+
+            // Call
+            TestDelegate test = () => new MacroStabilityInwardsSoilLayer2D(outerRing, null, new MacroStabilityInwardsSoilLayerData());
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("holes", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_DataNull_ThrowsArgumentNullException()
+        {
+            // Setup
+            var random = new Random(39);
+            Ring outerRing = CreateRandomRing(random);
+            var holes = new[]
+            {
+                CreateRandomRing(random)
+            };
+
+            // Call
+            TestDelegate test = () => new MacroStabilityInwardsSoilLayer2D(outerRing, holes, null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("data", exception.ParamName);
+        }
+
+        [Test]
         public void Constructor_WithOuterRingAndHoles_ReturnsNewInstance()
         {
             // Setup
@@ -93,10 +151,34 @@
             Assert.AreSame(outerRing, layer.OuterRing);
             Assert.AreNotSame(holes, layer.Holes);
             TestHelper.AssertCollectionsAreEqual(holes, layer.Holes, new ReferenceEqualityComparer<Ring>());
-            Assert.Null(layer.Data);
+            Assert.IsNotNull(layer.Data);
         }
 
         [Test]
+        public void Constructor_WithOuterRingHolesAndData_ReturnsNewInstance()
+        {
+            // Setup
+            var random = new Random(39);
+            Ring outerRing = CreateRandomRing(random);
+            var holes = new[]
+            {
+                CreateRandomRing(random)
+            };
+            var data = new MacroStabilityInwardsSoilLayerData();
+
+            // Call
+            var layer = new MacroStabilityInwardsSoilLayer2D(outerRing, holes, data);
+
+            // Assert
+            Assert.IsInstanceOf<IMacroStabilityInwardsSoilLayer2D>(layer);
+            Assert.NotNull(layer);
+            Assert.AreSame(outerRing, layer.OuterRing);
+            Assert.AreNotSame(holes, layer.Holes);
+            TestHelper.AssertCollectionsAreEqual(holes, layer.Holes, new ReferenceEqualityComparer<Ring>());
+            Assert.AreSame(data, layer.Data);
+        }
+
+        [Test]
         public void GetHashCode_EqualLayers_AreEqual()
         {
             // Setup
@@ -165,7 +247,7 @@
                     CreateRandomRing(new Random(22))
                 })
             {
-                Data = new MacroStabilityInwardsSoilLayerData
+                Data =
                 {
                     Color = Color.Blue
                 }
@@ -177,7 +259,7 @@
                     CreateRandomRing(new Random(22))
                 })
             {
-                Data = new MacroStabilityInwardsSoilLayerData
+                Data =
                 {
                     Color = Color.Blue
                 }
@@ -189,7 +271,7 @@
                     CreateRandomRing(new Random(32))
                 })
             {
-                Data = new MacroStabilityInwardsSoilLayerData
+                Data =
                 {
                     Color = Color.Blue
                 }
@@ -201,7 +283,7 @@
                     CreateRandomRing(new Random(22))
                 })
             {
-                Data = new MacroStabilityInwardsSoilLayerData
+                Data =
                 {
                     Color = Color.Gold
                 }
@@ -260,7 +342,7 @@
                 CreateRandomRing(random)
             })
             {
-                Data = new MacroStabilityInwardsSoilLayerData
+                Data =
                 {
                     Color = Color.FromKnownColor(random.NextEnumValue<KnownColor>())
                 },
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfile2DTest.cs
===================================================================
diff -u -r7585d2fd78627d94d55ffa16423af90a91e4efd4 -ra07b01c421d15a0a1e4933e3967ac1f25d30eccc
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfile2DTest.cs	(.../MacroStabilityInwardsSoilProfile2DTest.cs)	(revision 7585d2fd78627d94d55ffa16423af90a91e4efd4)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfile2DTest.cs	(.../MacroStabilityInwardsSoilProfile2DTest.cs)	(revision a07b01c421d15a0a1e4933e3967ac1f25d30eccc)
@@ -317,7 +317,7 @@
                 CreateRandomRing(random.Next())
             })
             {
-                Data = new MacroStabilityInwardsSoilLayerData
+                Data =
                 {
                     Color = Color.FromKnownColor(random.NextEnumValue<KnownColor>())
                 },
@@ -332,7 +332,7 @@
                 soilLayer.Holes[0]
             })
             {
-                Data = new MacroStabilityInwardsSoilLayerData
+                Data =
                 {
                     Color = soilLayer.Data.Color
                 }
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/SoilProfile/MacroStabilityInwardsSoilProfile2DTestFactoryTest.cs
===================================================================
diff -u -r7585d2fd78627d94d55ffa16423af90a91e4efd4 -ra07b01c421d15a0a1e4933e3967ac1f25d30eccc
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/SoilProfile/MacroStabilityInwardsSoilProfile2DTestFactoryTest.cs	(.../MacroStabilityInwardsSoilProfile2DTestFactoryTest.cs)	(revision 7585d2fd78627d94d55ffa16423af90a91e4efd4)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/SoilProfile/MacroStabilityInwardsSoilProfile2DTestFactoryTest.cs	(.../MacroStabilityInwardsSoilProfile2DTestFactoryTest.cs)	(revision a07b01c421d15a0a1e4933e3967ac1f25d30eccc)
@@ -49,7 +49,6 @@
                     new Point2D(1, 1)
                 }), new Ring[0])
                 {
-                    Data = new MacroStabilityInwardsSoilLayerData(),
                     NestedLayers = Enumerable.Empty<IMacroStabilityInwardsSoilLayer2D>()
                 },
                 new MacroStabilityInwardsSoilLayer2D(new Ring(new[]
@@ -58,7 +57,6 @@
                     new Point2D(2, 2)
                 }), new Ring[0])
                 {
-                    Data = new MacroStabilityInwardsSoilLayerData(),
                     NestedLayers = Enumerable.Empty<IMacroStabilityInwardsSoilLayer2D>()
                 }
             }, soilProfile.Layers);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/SoilProfile/MacroStabilityInwardsSoilLayer2DTestFactory.cs
===================================================================
diff -u -r7585d2fd78627d94d55ffa16423af90a91e4efd4 -ra07b01c421d15a0a1e4933e3967ac1f25d30eccc
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/SoilProfile/MacroStabilityInwardsSoilLayer2DTestFactory.cs	(.../MacroStabilityInwardsSoilLayer2DTestFactory.cs)	(revision 7585d2fd78627d94d55ffa16423af90a91e4efd4)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/SoilProfile/MacroStabilityInwardsSoilLayer2DTestFactory.cs	(.../MacroStabilityInwardsSoilLayer2DTestFactory.cs)	(revision a07b01c421d15a0a1e4933e3967ac1f25d30eccc)
@@ -41,10 +41,7 @@
             {
                 new Point2D(0, 0),
                 new Point2D(1, 1)
-            }), new Ring[0])
-            {
-                Data = new MacroStabilityInwardsSoilLayerData()
-            };
+            }), new Ring[0]);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/SoilProfile/MacroStabilityInwardsSoilProfile2DTestFactory.cs
===================================================================
diff -u -r7585d2fd78627d94d55ffa16423af90a91e4efd4 -ra07b01c421d15a0a1e4933e3967ac1f25d30eccc
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/SoilProfile/MacroStabilityInwardsSoilProfile2DTestFactory.cs	(.../MacroStabilityInwardsSoilProfile2DTestFactory.cs)	(revision 7585d2fd78627d94d55ffa16423af90a91e4efd4)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/SoilProfile/MacroStabilityInwardsSoilProfile2DTestFactory.cs	(.../MacroStabilityInwardsSoilProfile2DTestFactory.cs)	(revision a07b01c421d15a0a1e4933e3967ac1f25d30eccc)
@@ -46,7 +46,6 @@
                     new Point2D(1, 1)
                 }), new Ring[0])
                 {
-                    Data = new MacroStabilityInwardsSoilLayerData(),
                     NestedLayers = Enumerable.Empty<MacroStabilityInwardsSoilLayer2D>()
                 },
                 new MacroStabilityInwardsSoilLayer2D(new Ring(new[]
@@ -55,7 +54,6 @@
                     new Point2D(2, 2)
                 }), new Ring[0])
                 {
-                    Data = new MacroStabilityInwardsSoilLayerData(),
                     NestedLayers = Enumerable.Empty<MacroStabilityInwardsSoilLayer2D>()
                 }
             }, new MacroStabilityInwardsPreconsolidationStress[0]);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSoilLayer2DBasePropertiesTest.cs
===================================================================
diff -u -r0950c1a469810e87b914ad0bc0cebbca32850a4e -ra07b01c421d15a0a1e4933e3967ac1f25d30eccc
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSoilLayer2DBasePropertiesTest.cs	(.../MacroStabilityInwardsSoilLayer2DBasePropertiesTest.cs)	(revision 0950c1a469810e87b914ad0bc0cebbca32850a4e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSoilLayer2DBasePropertiesTest.cs	(.../MacroStabilityInwardsSoilLayer2DBasePropertiesTest.cs)	(revision a07b01c421d15a0a1e4933e3967ac1f25d30eccc)
@@ -72,7 +72,7 @@
                                                              }),
                                                              new Ring[0])
             {
-                Data = new MacroStabilityInwardsSoilLayerData
+                Data =
                 {
                     MaterialName = "Test Name",
                     IsAquifer = true
@@ -149,10 +149,7 @@
                                                             new Point2D(20.210230, 26.00001),
                                                             new Point2D(3.830, 1.040506)
                                                         }),
-                                                        new Ring[0])
-            {
-                Data = new MacroStabilityInwardsSoilLayerData()
-            };
+                                                        new Ring[0]);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSoilLayer2DTopLevelPropertiesTest.cs
===================================================================
diff -u -r0950c1a469810e87b914ad0bc0cebbca32850a4e -ra07b01c421d15a0a1e4933e3967ac1f25d30eccc
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSoilLayer2DTopLevelPropertiesTest.cs	(.../MacroStabilityInwardsSoilLayer2DTopLevelPropertiesTest.cs)	(revision 0950c1a469810e87b914ad0bc0cebbca32850a4e)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSoilLayer2DTopLevelPropertiesTest.cs	(.../MacroStabilityInwardsSoilLayer2DTopLevelPropertiesTest.cs)	(revision a07b01c421d15a0a1e4933e3967ac1f25d30eccc)
@@ -60,7 +60,7 @@
                                                              }),
                                                              new Ring[0])
             {
-                Data = new MacroStabilityInwardsSoilLayerData
+                Data =
                 {
                     IsAquifer = true
                 },
@@ -135,10 +135,7 @@
                                                             new Point2D(20.210230, 26.00001),
                                                             new Point2D(3.830, 1.040506)
                                                         }),
-                                                        new Ring[0])
-            {
-                Data = new MacroStabilityInwardsSoilLayerData()
-            };
+                                                        new Ring[0]);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs
===================================================================
diff -u -rda004b349d777118e3fdf7dddca87c7e1fc5b596 -ra07b01c421d15a0a1e4933e3967ac1f25d30eccc
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs	(.../MacroStabilityInwardsInputViewTest.cs)	(revision da004b349d777118e3fdf7dddca87c7e1fc5b596)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsInputViewTest.cs	(.../MacroStabilityInwardsInputViewTest.cs)	(revision a07b01c421d15a0a1e4933e3967ac1f25d30eccc)
@@ -1034,7 +1034,6 @@
                     new Point2D(2.0, 4.0)
                 }), new List<Ring>())
                 {
-                    Data = new MacroStabilityInwardsSoilLayerData(),
                     NestedLayers = Enumerable.Empty<IMacroStabilityInwardsSoilLayer2D>()
                 },
                 new MacroStabilityInwardsSoilLayer2D(new Ring(new List<Point2D>
@@ -1043,7 +1042,6 @@
                     new Point2D(8.0, 3.0)
                 }), new List<Ring>())
                 {
-                    Data = new MacroStabilityInwardsSoilLayerData(),
                     NestedLayers = new[]
                     {
                         new MacroStabilityInwardsSoilLayer2D(new Ring(new List<Point2D>
@@ -1052,7 +1050,6 @@
                             new Point2D(0.0, 2.5)
                         }), new List<Ring>())
                         {
-                            Data = new MacroStabilityInwardsSoilLayerData(),
                             NestedLayers = new[]
                             {
                                 new MacroStabilityInwardsSoilLayer2D(new Ring(new List<Point2D>
@@ -1061,7 +1058,6 @@
                                     new Point2D(0.0, 2.5)
                                 }), new List<Ring>())
                                 {
-                                    Data = new MacroStabilityInwardsSoilLayerData(),
                                     NestedLayers = Enumerable.Empty<IMacroStabilityInwardsSoilLayer2D>()
                                 }
                             }
@@ -1074,7 +1070,6 @@
                     new Point2D(2.0, 8.0)
                 }), new List<Ring>())
                 {
-                    Data = new MacroStabilityInwardsSoilLayerData(),
                     NestedLayers = Enumerable.Empty<IMacroStabilityInwardsSoilLayer2D>()
                 }
             };
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputChartControlTest.cs
===================================================================
diff -u -r0b9a49c38d6a29225f3d5982337d68c03c2d878f -ra07b01c421d15a0a1e4933e3967ac1f25d30eccc
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputChartControlTest.cs	(.../MacroStabilityInwardsOutputChartControlTest.cs)	(revision 0b9a49c38d6a29225f3d5982337d68c03c2d878f)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputChartControlTest.cs	(.../MacroStabilityInwardsOutputChartControlTest.cs)	(revision a07b01c421d15a0a1e4933e3967ac1f25d30eccc)
@@ -267,7 +267,6 @@
                     new Point2D(2.0, 4.0)
                 }), new List<Ring>())
                 {
-                    Data = new MacroStabilityInwardsSoilLayerData(),
                     NestedLayers = Enumerable.Empty<IMacroStabilityInwardsSoilLayer2D>()
                 },
                 new MacroStabilityInwardsSoilLayer2D(new Ring(new List<Point2D>
@@ -276,7 +275,6 @@
                     new Point2D(8.0, 3.0)
                 }), new List<Ring>())
                 {
-                    Data = new MacroStabilityInwardsSoilLayerData(),
                     NestedLayers = new[]
                     {
                         new MacroStabilityInwardsSoilLayer2D(new Ring(new List<Point2D>
@@ -285,7 +283,6 @@
                             new Point2D(0.0, 2.5)
                         }), new List<Ring>())
                         {
-                            Data = new MacroStabilityInwardsSoilLayerData(),
                             NestedLayers = new[]
                             {
                                 new MacroStabilityInwardsSoilLayer2D(new Ring(new List<Point2D>
@@ -294,7 +291,6 @@
                                     new Point2D(0.0, 2.5)
                                 }), new List<Ring>())
                                 {
-                                    Data = new MacroStabilityInwardsSoilLayerData(),
                                     NestedLayers = Enumerable.Empty<IMacroStabilityInwardsSoilLayer2D>()
                                 }
                             }
@@ -307,7 +303,6 @@
                     new Point2D(2.0, 8.0)
                 }), new List<Ring>())
                 {
-                    Data = new MacroStabilityInwardsSoilLayerData(),
                     NestedLayers = Enumerable.Empty<IMacroStabilityInwardsSoilLayer2D>()
                 }
             };
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputViewTest.cs
===================================================================
diff -u -r7585d2fd78627d94d55ffa16423af90a91e4efd4 -ra07b01c421d15a0a1e4933e3967ac1f25d30eccc
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputViewTest.cs	(.../MacroStabilityInwardsOutputViewTest.cs)	(revision 7585d2fd78627d94d55ffa16423af90a91e4efd4)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputViewTest.cs	(.../MacroStabilityInwardsOutputViewTest.cs)	(revision a07b01c421d15a0a1e4933e3967ac1f25d30eccc)
@@ -241,7 +241,6 @@
                     new Point2D(2.0, 4.0)
                 }), new List<Ring>())
                 {
-                    Data = new MacroStabilityInwardsSoilLayerData(),
                     NestedLayers = Enumerable.Empty<IMacroStabilityInwardsSoilLayer2D>()
                 },
                 new MacroStabilityInwardsSoilLayer2D(new Ring(new List<Point2D>
@@ -250,7 +249,6 @@
                     new Point2D(8.0, 3.0)
                 }), new List<Ring>())
                 {
-                    Data = new MacroStabilityInwardsSoilLayerData(),
                     NestedLayers = Enumerable.Empty<IMacroStabilityInwardsSoilLayer2D>()
                 },
                 new MacroStabilityInwardsSoilLayer2D(new Ring(new List<Point2D>
@@ -259,7 +257,6 @@
                     new Point2D(2.0, 8.0)
                 }), new List<Ring>())
                 {
-                    Data = new MacroStabilityInwardsSoilLayerData(),
                     NestedLayers = Enumerable.Empty<IMacroStabilityInwardsSoilLayer2D>()
                 }
             }, new List<MacroStabilityInwardsPreconsolidationStress>()));
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsStochasticSoilModelTransformerTest.cs
===================================================================
diff -u -rbeb20fbb814f4128b6d7dc7648af798fcccbe24c -ra07b01c421d15a0a1e4933e3967ac1f25d30eccc
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsStochasticSoilModelTransformerTest.cs	(.../MacroStabilityInwardsStochasticSoilModelTransformerTest.cs)	(revision beb20fbb814f4128b6d7dc7648af798fcccbe24c)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsStochasticSoilModelTransformerTest.cs	(.../MacroStabilityInwardsStochasticSoilModelTransformerTest.cs)	(revision a07b01c421d15a0a1e4933e3967ac1f25d30eccc)
@@ -181,7 +181,7 @@
                     })
                 })
                 {
-                    Data = new MacroStabilityInwardsSoilLayerData
+                    Data =
                     {
                         UsePop = true,
                         ShearStrengthModel = MacroStabilityInwardsShearStrengthModel.CPhi
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsStochasticSoilModelUpdateDataStrategyTest.cs
===================================================================
diff -u -rbeb20fbb814f4128b6d7dc7648af798fcccbe24c -ra07b01c421d15a0a1e4933e3967ac1f25d30eccc
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsStochasticSoilModelUpdateDataStrategyTest.cs	(.../MacroStabilityInwardsStochasticSoilModelUpdateDataStrategyTest.cs)	(revision beb20fbb814f4128b6d7dc7648af798fcccbe24c)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsStochasticSoilModelUpdateDataStrategyTest.cs	(.../MacroStabilityInwardsStochasticSoilModelUpdateDataStrategyTest.cs)	(revision a07b01c421d15a0a1e4933e3967ac1f25d30eccc)
@@ -572,7 +572,6 @@
                                                                            new Point2D(4, 5)
                                                                        }), Enumerable.Empty<Ring>())
                                                                        {
-                                                                           Data = new MacroStabilityInwardsSoilLayerData(),
                                                                            NestedLayers = Enumerable.Empty<IMacroStabilityInwardsSoilLayer2D>()
                                                                        }
                                                                    }, Enumerable.Empty<MacroStabilityInwardsPreconsolidationStress>()))
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs
===================================================================
diff -u -rbeb20fbb814f4128b6d7dc7648af798fcccbe24c -ra07b01c421d15a0a1e4933e3967ac1f25d30eccc
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs	(.../MacroStabilityInwardsCalculationServiceTest.cs)	(revision beb20fbb814f4128b6d7dc7648af798fcccbe24c)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs	(.../MacroStabilityInwardsCalculationServiceTest.cs)	(revision a07b01c421d15a0a1e4933e3967ac1f25d30eccc)
@@ -996,18 +996,12 @@
                                 new Point2D(0.2, 10),
                                 new Point2D(0.15, -10),
                                 new Point2D(0.1, 20)
-                            }), new Ring[0])
-                            {
-                                Data = new MacroStabilityInwardsSoilLayerData()
-                            },
+                            }), new Ring[0]),
                             new MacroStabilityInwardsSoilLayer2D(new Ring(new[]
                             {
                                 new Point2D(0.0, 10),
                                 new Point2D(0.1, 20)
                             }), new Ring[0])
-                            {
-                                Data = new MacroStabilityInwardsSoilLayerData()
-                            }
                         }, new MacroStabilityInwardsPreconsolidationStress[0]))
                 .SetName("Irrelevant surface line point");
 
@@ -1021,18 +1015,12 @@
                                 new Point2D(0.1, 20),
                                 new Point2D(0.2, 10),
                                 new Point2D(0.1, 20)
-                            }), new Ring[0])
-                            {
-                                Data = new MacroStabilityInwardsSoilLayerData()
-                            },
+                            }), new Ring[0]),
                             new MacroStabilityInwardsSoilLayer2D(new Ring(new[]
                             {
                                 new Point2D(0.0, 10.0049),
                                 new Point2D(0.1, 20)
                             }), new Ring[0])
-                            {
-                                Data = new MacroStabilityInwardsSoilLayerData()
-                            }
                         }, new MacroStabilityInwardsPreconsolidationStress[0]))
                 .SetName("First surface line point within upper limit");
 
@@ -1046,18 +1034,12 @@
                                 new Point2D(0.1, 20),
                                 new Point2D(0.2, 10),
                                 new Point2D(0.1, 20)
-                            }), new Ring[0])
-                            {
-                                Data = new MacroStabilityInwardsSoilLayerData()
-                            },
+                            }), new Ring[0]),
                             new MacroStabilityInwardsSoilLayer2D(new Ring(new[]
                             {
                                 new Point2D(0.0, 10.0 - 0.0049),
                                 new Point2D(0.1, 20)
                             }), new Ring[0])
-                            {
-                                Data = new MacroStabilityInwardsSoilLayerData()
-                            }
                         }, new MacroStabilityInwardsPreconsolidationStress[0]))
                 .SetName("First surface line point within lower limit");
 
@@ -1071,18 +1053,12 @@
                                 new Point2D(0.1, 20),
                                 new Point2D(0.3, 0),
                                 new Point2D(0.1, 20)
-                            }), new Ring[0])
-                            {
-                                Data = new MacroStabilityInwardsSoilLayerData()
-                            },
+                            }), new Ring[0]),
                             new MacroStabilityInwardsSoilLayer2D(new Ring(new[]
                             {
                                 new Point2D(0.0, 10.0),
                                 new Point2D(0.1, 20)
                             }), new Ring[0])
-                            {
-                                Data = new MacroStabilityInwardsSoilLayerData()
-                            }
                         }, new MacroStabilityInwardsPreconsolidationStress[0]))
                 .SetName("X further than x of surfaceLine");
         }