Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsSoilLayer2DCreateExtensions.cs
===================================================================
diff -u -rd9005dfa3b398d70ada0cf03cf408f8bcfc384db -r686c5eeaad900a6bb627733de8c21bd607f130aa
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsSoilLayer2DCreateExtensions.cs	(.../MacroStabilityInwardsSoilLayer2DCreateExtensions.cs)	(revision d9005dfa3b398d70ada0cf03cf408f8bcfc384db)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsSoilLayer2DCreateExtensions.cs	(.../MacroStabilityInwardsSoilLayer2DCreateExtensions.cs)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
@@ -24,7 +24,6 @@
 using Application.Ringtoets.Storage.DbContext;
 using Application.Ringtoets.Storage.Serializers;
 using Core.Common.Utils.Extensions;
-using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
 using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Application.Ringtoets.Storage.Create.MacroStabilityInwards
@@ -85,11 +84,11 @@
         }
 
         private static void AddNestedLayers(MacroStabilityInwardsSoilLayerTwoDEntity entity,
-                                            IMacroStabilityInwardsSoilLayer2D soilLayer)
+                                            MacroStabilityInwardsSoilLayer2D soilLayer)
         {
             for (var i = 0; i < soilLayer.NestedLayers.Count(); i++)
             {
-                entity.MacroStabilityInwardsSoilLayerTwoDEntity1.Add(((MacroStabilityInwardsSoilLayer2D) soilLayer.NestedLayers.ElementAt(i)).Create(i));
+                entity.MacroStabilityInwardsSoilLayerTwoDEntity1.Add(soilLayer.NestedLayers.ElementAt(i).Create(i));
             }
         }
     }
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSoilLayer2DCreateExtensionsTest.cs
===================================================================
diff -u -re71367095373d28854ad69027e17b87b14023d5c -r686c5eeaad900a6bb627733de8c21bd607f130aa
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSoilLayer2DCreateExtensionsTest.cs	(.../MacroStabilityInwardsSoilLayer2DCreateExtensionsTest.cs)	(revision e71367095373d28854ad69027e17b87b14023d5c)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSoilLayer2DCreateExtensionsTest.cs	(.../MacroStabilityInwardsSoilLayer2DCreateExtensionsTest.cs)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
@@ -240,7 +240,7 @@
             };
         }
 
-        private static void AssertMacroStabilityInwardsSoilLayerTwoDEntity(IMacroStabilityInwardsSoilLayer2D soilLayer,
+        private static void AssertMacroStabilityInwardsSoilLayerTwoDEntity(MacroStabilityInwardsSoilLayer2D soilLayer,
                                                                            MacroStabilityInwardsSoilLayerTwoDEntity entity, int order)
         {
             Assert.IsNotNull(entity);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -rd9005dfa3b398d70ada0cf03cf408f8bcfc384db -r686c5eeaad900a6bb627733de8c21bd607f130aa
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision d9005dfa3b398d70ada0cf03cf408f8bcfc384db)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
@@ -1501,15 +1501,13 @@
             AssertMacroStabilityInwardsSoilLayerData(expectedLayer.Data, actualLayer.Data);
         }
 
-        private static void AssertMacroStabilityInwardsSoilLayer(IMacroStabilityInwardsSoilLayer2D expectedLayer,
-                                                                 IMacroStabilityInwardsSoilLayer2D actualLayer)
+        private static void AssertMacroStabilityInwardsSoilLayer(MacroStabilityInwardsSoilLayer2D expectedLayer,
+                                                                 MacroStabilityInwardsSoilLayer2D actualLayer)
         {
             Assert.AreEqual(expectedLayer.OuterRing, actualLayer.OuterRing);
             AssertMacroStabilityInwardsSoilLayerData(expectedLayer.Data, actualLayer.Data);
 
-            AssertCollectionAndItems(expectedLayer.NestedLayers.Cast<MacroStabilityInwardsSoilLayer2D>(),
-                                     actualLayer.NestedLayers.Cast<MacroStabilityInwardsSoilLayer2D>(),
-                                     AssertMacroStabilityInwardsSoilLayer);
+            AssertCollectionAndItems(expectedLayer.NestedLayers, actualLayer.NestedLayers, AssertMacroStabilityInwardsSoilLayer);
         }
 
         private static void AssertMacroStabilityInwardsSoilLayerData(MacroStabilityInwardsSoilLayerData expectedData,
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityReadExtensionsTest.cs
===================================================================
diff -u -rd9005dfa3b398d70ada0cf03cf408f8bcfc384db -r686c5eeaad900a6bb627733de8c21bd607f130aa
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityReadExtensionsTest.cs	(.../MacroStabilityInwardsSoilLayerTwoDEntityReadExtensionsTest.cs)	(revision d9005dfa3b398d70ada0cf03cf408f8bcfc384db)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityReadExtensionsTest.cs	(.../MacroStabilityInwardsSoilLayerTwoDEntityReadExtensionsTest.cs)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
@@ -32,7 +32,6 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.Probabilistics;
 using Ringtoets.Common.Data.TestUtil;
-using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
 using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Application.Ringtoets.Storage.Test.Read.MacroStabilityInwards
@@ -153,7 +152,7 @@
         }
 
         private static void AssertMacroStabilityInwardsSoilLayer2D(MacroStabilityInwardsSoilLayerTwoDEntity entity,
-                                                                   IMacroStabilityInwardsSoilLayer2D layer)
+                                                                   MacroStabilityInwardsSoilLayer2D layer)
         {
             Assert.IsNotNull(layer);
             MacroStabilityInwardsSoilLayerData data = layer.Data;
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/Converters/SoilProfileConverter.cs
===================================================================
diff -u -rd9005dfa3b398d70ada0cf03cf408f8bcfc384db -r686c5eeaad900a6bb627733de8c21bd607f130aa
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/Converters/SoilProfileConverter.cs	(.../SoilProfileConverter.cs)	(revision d9005dfa3b398d70ada0cf03cf408f8bcfc384db)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/Converters/SoilProfileConverter.cs	(.../SoilProfileConverter.cs)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
@@ -63,7 +63,7 @@
         }
 
         /// <summary>
-        /// Converts <see cref="IMacroStabilityInwardsSoilLayer2D"/> objects into <see cref="SoilLayer"/> objects.
+        /// Converts <see cref="MacroStabilityInwardsSoilLayer2D"/> objects into <see cref="SoilLayer"/> objects.
         /// </summary>
         /// <param name="layers">The layers to convert.</param>
         /// <returns>The converted <see cref="SoilLayer"/>.</returns>
@@ -73,7 +73,7 @@
         /// <exception cref="NotSupportedException">Thrown when 
         /// <see cref="MacroStabilityInwardsSoilLayerData.ShearStrengthModel"/>
         /// is a valid value but unsupported.</exception>
-        private static IEnumerable<SoilLayer> ConvertLayers(IEnumerable<IMacroStabilityInwardsSoilLayer2D> layers)
+        private static IEnumerable<SoilLayer> ConvertLayers(IEnumerable<MacroStabilityInwardsSoilLayer2D> layers)
         {
             return layers.Select(l =>
             {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfile2DLayersHelper.cs
===================================================================
diff -u -r66894d34e58e0db658fa3183df8792ed244ccda3 -r686c5eeaad900a6bb627733de8c21bd607f130aa
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfile2DLayersHelper.cs	(.../MacroStabilityInwardsSoilProfile2DLayersHelper.cs)	(revision 66894d34e58e0db658fa3183df8792ed244ccda3)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfile2DLayersHelper.cs	(.../MacroStabilityInwardsSoilProfile2DLayersHelper.cs)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
@@ -32,12 +32,12 @@
     public static class MacroStabilityInwardsSoilProfile2DLayersHelper
     {
         /// <summary>
-        /// Method for obtaining all <see cref="IMacroStabilityInwardsSoilLayer2D"/> in <paramref name="layers"/> recursively.
+        /// Method for obtaining all <see cref="MacroStabilityInwardsSoilLayer2D"/> in <paramref name="layers"/> recursively.
         /// </summary>
         /// <param name="layers">The collection of layers to recursively get the layers from.</param>
-        /// <returns>An enumerable with <see cref="IMacroStabilityInwardsSoilLayer2D"/>.</returns>
+        /// <returns>An enumerable with <see cref="MacroStabilityInwardsSoilLayer2D"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="layers"/> is <c>null</c>.</exception>
-        public static IEnumerable<IMacroStabilityInwardsSoilLayer2D> GetLayersRecursively(IEnumerable<IMacroStabilityInwardsSoilLayer2D> layers)
+        public static IEnumerable<MacroStabilityInwardsSoilLayer2D> GetLayersRecursively(IEnumerable<MacroStabilityInwardsSoilLayer2D> layers)
         {
             if (layers == null)
             {
@@ -47,14 +47,14 @@
             return layers.SelectMany(GetLayersRecursively);
         }
 
-        private static IEnumerable<IMacroStabilityInwardsSoilLayer2D> GetLayersRecursively(IMacroStabilityInwardsSoilLayer2D layer)
+        private static IEnumerable<MacroStabilityInwardsSoilLayer2D> GetLayersRecursively(MacroStabilityInwardsSoilLayer2D layer)
         {
-            var layers = new List<IMacroStabilityInwardsSoilLayer2D>
+            var layers = new List<MacroStabilityInwardsSoilLayer2D>
             {
                 layer
             };
 
-            foreach (IMacroStabilityInwardsSoilLayer2D nestedLayer in layer.NestedLayers)
+            foreach (MacroStabilityInwardsSoilLayer2D nestedLayer in layer.NestedLayers)
             {
                 layers.AddRange(GetLayersRecursively(nestedLayer));
             }
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLine.cs
===================================================================
diff -u -r7585d2fd78627d94d55ffa16423af90a91e4efd4 -r686c5eeaad900a6bb627733de8c21bd607f130aa
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLine.cs	(.../MacroStabilityInwardsSoilProfileUnderSurfaceLine.cs)	(revision 7585d2fd78627d94d55ffa16423af90a91e4efd4)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLine.cs	(.../MacroStabilityInwardsSoilProfileUnderSurfaceLine.cs)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
@@ -36,7 +36,7 @@
         /// <param name="layers">The layers in the profile.</param>
         /// <param name="preconsolidationStresses">The preconsolidation stresses defined for the profile.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public MacroStabilityInwardsSoilProfileUnderSurfaceLine(IEnumerable<IMacroStabilityInwardsSoilLayer2D> layers,
+        public MacroStabilityInwardsSoilProfileUnderSurfaceLine(IEnumerable<MacroStabilityInwardsSoilLayer2D> layers,
                                                                 IEnumerable<IMacroStabilityInwardsPreconsolidationStress> preconsolidationStresses)
         {
             if (layers == null)
@@ -51,7 +51,7 @@
             PreconsolidationStresses = preconsolidationStresses;
         }
 
-        public IEnumerable<IMacroStabilityInwardsSoilLayer2D> Layers { get; }
+        public IEnumerable<MacroStabilityInwardsSoilLayer2D> Layers { get; }
 
         public IEnumerable<IMacroStabilityInwardsPreconsolidationStress> PreconsolidationStresses { get; }
     }
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs
===================================================================
diff -u -rd9005dfa3b398d70ada0cf03cf408f8bcfc384db -r686c5eeaad900a6bb627733de8c21bd607f130aa
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs	(.../MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs)	(revision d9005dfa3b398d70ada0cf03cf408f8bcfc384db)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs	(.../MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
@@ -106,7 +106,7 @@
                     soilLayers.Add(new MacroStabilityInwardsSoilLayer2D(new Ring(soilLayerArea),
                                                                         Enumerable.Empty<Ring>(),
                                                                         layer.Data,
-                                                                        Enumerable.Empty<IMacroStabilityInwardsSoilLayer2D>()));
+                                                                        Enumerable.Empty<MacroStabilityInwardsSoilLayer2D>()));
                 }
             }
 
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs
===================================================================
diff -u -r079488cb80d6e0ae43e0505820c3e554d2c7acb5 -r686c5eeaad900a6bb627733de8c21bd607f130aa
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs	(.../MacroStabilityInwardsChartDataFactory.cs)	(revision 079488cb80d6e0ae43e0505820c3e554d2c7acb5)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataFactory.cs	(.../MacroStabilityInwardsChartDataFactory.cs)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
@@ -199,7 +199,7 @@
         }
 
         /// <summary>
-        /// Create <see cref="ChartMultipleAreaData"/> for a <see cref="IMacroStabilityInwardsSoilLayer2D"/>.
+        /// 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>
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataPointsFactory.cs
===================================================================
diff -u -rabaf857dd9adbb07113b33f4212efb95571ab145 -r686c5eeaad900a6bb627733de8c21bd607f130aa
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataPointsFactory.cs	(.../MacroStabilityInwardsChartDataPointsFactory.cs)	(revision abaf857dd9adbb07113b33f4212efb95571ab145)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsChartDataPointsFactory.cs	(.../MacroStabilityInwardsChartDataPointsFactory.cs)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
@@ -233,7 +233,7 @@
         /// <param name="soilLayer">The soil layer to create the outer ring for.</param>
         /// <returns>A collection containing a single array of points in 2D space 
         /// or an empty collection when <paramref name="soilLayer"/> is <c>null</c>.</returns>
-        public static IEnumerable<Point2D[]> CreateOuterRingArea(IMacroStabilityInwardsSoilLayer2D soilLayer)
+        public static IEnumerable<Point2D[]> CreateOuterRingArea(MacroStabilityInwardsSoilLayer2D soilLayer)
         {
             return soilLayer != null
                        ? new List<Point2D[]>
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSoilLayer2DBaseProperties.cs
===================================================================
diff -u -r0950c1a469810e87b914ad0bc0cebbca32850a4e -r686c5eeaad900a6bb627733de8c21bd607f130aa
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSoilLayer2DBaseProperties.cs	(.../MacroStabilityInwardsSoilLayer2DBaseProperties.cs)	(revision 0950c1a469810e87b914ad0bc0cebbca32850a4e)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSoilLayer2DBaseProperties.cs	(.../MacroStabilityInwardsSoilLayer2DBaseProperties.cs)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
@@ -34,18 +34,18 @@
 namespace Ringtoets.MacroStabilityInwards.Forms.PropertyClasses
 {
     /// <summary>
-    /// Base ViewModel of <see cref="IMacroStabilityInwardsSoilLayer2D"/> for properties panel.
+    /// Base ViewModel of <see cref="MacroStabilityInwardsSoilLayer2D"/> for properties panel.
     /// </summary>
     [TypeConverter(typeof(ExpandableObjectConverter))]
-    public class MacroStabilityInwardsSoilLayer2DBaseProperties : ObjectProperties<IMacroStabilityInwardsSoilLayer2D>
+    public class MacroStabilityInwardsSoilLayer2DBaseProperties : ObjectProperties<MacroStabilityInwardsSoilLayer2D>
     {
         /// <summary>
         /// Creates a new instance of <see cref="MacroStabilityInwardsSoilLayer2DBaseProperties"/>.
         /// </summary>
         /// <param name="soilLayer">The 2D soil layer for which the properties are shown.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="soilLayer"/>
         /// is <c>null</c>.</exception>
-        public MacroStabilityInwardsSoilLayer2DBaseProperties(IMacroStabilityInwardsSoilLayer2D soilLayer)
+        public MacroStabilityInwardsSoilLayer2DBaseProperties(MacroStabilityInwardsSoilLayer2D soilLayer)
         {
             if (soilLayer == null)
             {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSoilLayer2DTopLevelProperties.cs
===================================================================
diff -u -r0950c1a469810e87b914ad0bc0cebbca32850a4e -r686c5eeaad900a6bb627733de8c21bd607f130aa
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSoilLayer2DTopLevelProperties.cs	(.../MacroStabilityInwardsSoilLayer2DTopLevelProperties.cs)	(revision 0950c1a469810e87b914ad0bc0cebbca32850a4e)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSoilLayer2DTopLevelProperties.cs	(.../MacroStabilityInwardsSoilLayer2DTopLevelProperties.cs)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
@@ -32,19 +32,19 @@
 namespace Ringtoets.MacroStabilityInwards.Forms.PropertyClasses
 {
     /// <summary>
-    /// ViewModel of a top level <see cref="IMacroStabilityInwardsSoilLayer2D"/> for properties panel.
+    /// ViewModel of a top level <see cref="MacroStabilityInwardsSoilLayer2D"/> for properties panel.
     /// </summary>
     [TypeConverter(typeof(ExpandableObjectConverter))]
     public class MacroStabilityInwardsSoilLayer2DTopLevelProperties : MacroStabilityInwardsSoilLayer2DBaseProperties
     {
         /// <summary>
         /// Creates a new instance of <see cref="MacroStabilityInwardsSoilLayer2DTopLevelProperties"/> for
-        /// the top level properties of a <see cref="IMacroStabilityInwardsSoilLayer2D"/>.
+        /// the top level properties of a <see cref="MacroStabilityInwardsSoilLayer2D"/>.
         /// </summary>
         /// <param name="soilLayer">The 2D soil layer for which the properties are shown.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="soilLayer"/>
         /// is <c>null</c>.</exception>
-        public MacroStabilityInwardsSoilLayer2DTopLevelProperties(IMacroStabilityInwardsSoilLayer2D soilLayer) : base(soilLayer) {}
+        public MacroStabilityInwardsSoilLayer2DTopLevelProperties(MacroStabilityInwardsSoilLayer2D soilLayer) : base(soilLayer) {}
 
         [PropertyOrder(3)]
         [TypeConverter(typeof(ExpandableArrayConverter))]
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsStochasticSoilProfileProperties.cs
===================================================================
diff -u -r66894d34e58e0db658fa3183df8792ed244ccda3 -r686c5eeaad900a6bb627733de8c21bd607f130aa
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsStochasticSoilProfileProperties.cs	(.../MacroStabilityInwardsStochasticSoilProfileProperties.cs)	(revision 66894d34e58e0db658fa3183df8792ed244ccda3)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsStochasticSoilProfileProperties.cs	(.../MacroStabilityInwardsStochasticSoilProfileProperties.cs)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
@@ -107,10 +107,10 @@
         {
             get
             {
-                IEnumerable<IMacroStabilityInwardsSoilLayer2D> layers = (data.SoilProfile as MacroStabilityInwardsSoilProfile2D)?.Layers;
-                IEnumerable<IMacroStabilityInwardsSoilLayer2D> macroStabilityInwardsSoilLayers2D = layers != null
-                                                                                                       ? MacroStabilityInwardsSoilProfile2DLayersHelper.GetLayersRecursively(layers)
-                                                                                                       : new List<MacroStabilityInwardsSoilLayer2D>();
+                IEnumerable<MacroStabilityInwardsSoilLayer2D> layers = (data.SoilProfile as MacroStabilityInwardsSoilProfile2D)?.Layers;
+                IEnumerable<MacroStabilityInwardsSoilLayer2D> macroStabilityInwardsSoilLayers2D = layers != null
+                                                                                                      ? MacroStabilityInwardsSoilProfile2DLayersHelper.GetLayersRecursively(layers)
+                                                                                                      : new List<MacroStabilityInwardsSoilLayer2D>();
                 return macroStabilityInwardsSoilLayers2D?.Select(layer => new MacroStabilityInwardsSoilLayer2DTopLevelProperties(layer)).ToArray() ??
                        new MacroStabilityInwardsSoilLayer2DTopLevelProperties[0];
             }
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsInputView.cs
===================================================================
diff -u -r66894d34e58e0db658fa3183df8792ed244ccda3 -r686c5eeaad900a6bb627733de8c21bd607f130aa
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsInputView.cs	(.../MacroStabilityInwardsInputView.cs)	(revision 66894d34e58e0db658fa3183df8792ed244ccda3)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsInputView.cs	(.../MacroStabilityInwardsInputView.cs)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
@@ -294,7 +294,7 @@
             soilProfileChartData.Clear();
             soilLayerChartDataLookup.Clear();
 
-            IEnumerable<IMacroStabilityInwardsSoilLayer2D> soilLayers = GetSoilLayers().Reverse();
+            IEnumerable<MacroStabilityInwardsSoilLayer2D> soilLayers = GetSoilLayers().Reverse();
 
             soilLayers.Select((layer, layerIndex) => MacroStabilityInwardsChartDataFactory.CreateSoilLayerChartData(
                                   $"{layerIndex + 1} {layer.Data.MaterialName}",
@@ -311,19 +311,19 @@
         private void SetSoilLayerAreas()
         {
             var i = 0;
-            foreach (IMacroStabilityInwardsSoilLayer2D soilLayer in GetSoilLayers().Reverse())
+            foreach (MacroStabilityInwardsSoilLayer2D soilLayer in GetSoilLayers().Reverse())
             {
                 ChartMultipleAreaData soilLayerData = soilLayerChartDataLookup[i++];
                 soilLayerData.Areas = MacroStabilityInwardsChartDataPointsFactory.CreateOuterRingArea(soilLayer);
             }
         }
 
-        private IEnumerable<IMacroStabilityInwardsSoilLayer2D> GetSoilLayers()
+        private IEnumerable<MacroStabilityInwardsSoilLayer2D> GetSoilLayers()
         {
-            IEnumerable<IMacroStabilityInwardsSoilLayer2D> layers = data?.InputParameters.SoilProfileUnderSurfaceLine?.Layers;
+            IEnumerable<MacroStabilityInwardsSoilLayer2D> layers = data?.InputParameters.SoilProfileUnderSurfaceLine?.Layers;
             return layers != null
                        ? MacroStabilityInwardsSoilProfile2DLayersHelper.GetLayersRecursively(layers)
-                       : new List<IMacroStabilityInwardsSoilLayer2D>();
+                       : new List<MacroStabilityInwardsSoilLayer2D>();
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsOutputChartControl.cs
===================================================================
diff -u -r4acb5ca07c10a411648e4ac3fe6f15109dfca3e0 -r686c5eeaad900a6bb627733de8c21bd607f130aa
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsOutputChartControl.cs	(.../MacroStabilityInwardsOutputChartControl.cs)	(revision 4acb5ca07c10a411648e4ac3fe6f15109dfca3e0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsOutputChartControl.cs	(.../MacroStabilityInwardsOutputChartControl.cs)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
@@ -214,7 +213,7 @@
             soilProfileChartData.Clear();
             soilLayerChartDataLookup.Clear();
 
-            IEnumerable<IMacroStabilityInwardsSoilLayer2D> soilLayers = GetSoilLayers().Reverse();
+            IEnumerable<MacroStabilityInwardsSoilLayer2D> soilLayers = GetSoilLayers().Reverse();
 
             soilLayers.Select((layer, layerIndex) => MacroStabilityInwardsChartDataFactory.CreateSoilLayerChartData(
                                   $"{layerIndex + 1} {layer.Data.MaterialName}",
@@ -250,7 +249,7 @@
         private void SetSoilLayerAreas()
         {
             var i = 0;
-            foreach (IMacroStabilityInwardsSoilLayer2D soilLayer in GetSoilLayers().Reverse())
+            foreach (MacroStabilityInwardsSoilLayer2D soilLayer in GetSoilLayers().Reverse())
             {
                 ChartMultipleAreaData soilLayerData = soilLayerChartDataLookup[i++];
                 soilLayerData.Areas = MacroStabilityInwardsChartDataPointsFactory.CreateOuterRingArea(soilLayer);
@@ -265,12 +264,12 @@
             }
         }
 
-        private IEnumerable<IMacroStabilityInwardsSoilLayer2D> GetSoilLayers()
+        private IEnumerable<MacroStabilityInwardsSoilLayer2D> GetSoilLayers()
         {
-            IEnumerable<IMacroStabilityInwardsSoilLayer2D> layers = data?.InputParameters.SoilProfileUnderSurfaceLine?.Layers;
+            IEnumerable<MacroStabilityInwardsSoilLayer2D> layers = data?.InputParameters.SoilProfileUnderSurfaceLine?.Layers;
             return layers != null
                        ? MacroStabilityInwardsSoilProfile2DLayersHelper.GetLayersRecursively(layers)
-                       : new List<IMacroStabilityInwardsSoilLayer2D>();
+                       : new List<MacroStabilityInwardsSoilLayer2D>();
         }
 
         private void SetWaternetDatas(MacroStabilityInwardsSurfaceLine surfaceLine)
Fisheye: Tag 686c5eeaad900a6bb627733de8c21bd607f130aa refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsSoilLayer2D.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsSoilProfileUnderSurfaceLine.cs
===================================================================
diff -u -r7585d2fd78627d94d55ffa16423af90a91e4efd4 -r686c5eeaad900a6bb627733de8c21bd607f130aa
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsSoilProfileUnderSurfaceLine.cs	(.../IMacroStabilityInwardsSoilProfileUnderSurfaceLine.cs)	(revision 7585d2fd78627d94d55ffa16423af90a91e4efd4)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/IMacroStabilityInwardsSoilProfileUnderSurfaceLine.cs	(.../IMacroStabilityInwardsSoilProfileUnderSurfaceLine.cs)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
@@ -31,7 +31,7 @@
         /// <summary>
         /// Gets the layers in the profile.
         /// </summary>
-        IEnumerable<IMacroStabilityInwardsSoilLayer2D> Layers { get; }
+        IEnumerable<MacroStabilityInwardsSoilLayer2D> Layers { get; }
 
         /// <summary>
         /// Gets the preconsolidation stresses in the profile.
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsSoilLayer2D.cs
===================================================================
diff -u -r81f24a37267276f3169746471998361272d68b4c -r686c5eeaad900a6bb627733de8c21bd607f130aa
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsSoilLayer2D.cs	(.../MacroStabilityInwardsSoilLayer2D.cs)	(revision 81f24a37267276f3169746471998361272d68b4c)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsSoilLayer2D.cs	(.../MacroStabilityInwardsSoilLayer2D.cs)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
@@ -28,7 +28,7 @@
     /// <summary>
     /// This class represents a 2D layer that was imported from D-Soil Model.
     /// </summary>
-    public class MacroStabilityInwardsSoilLayer2D : IMacroStabilityInwardsSoilLayer2D
+    public class MacroStabilityInwardsSoilLayer2D : IMacroStabilityInwardsSoilLayer
     {
         /// <summary>
         /// Creates a new instance of <see cref="MacroStabilityInwardsSoilLayer2D"/>.
@@ -38,7 +38,7 @@
         /// 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(), Enumerable.Empty<IMacroStabilityInwardsSoilLayer2D>()) {}
+            : this(outerRing, holes, new MacroStabilityInwardsSoilLayerData(), Enumerable.Empty<MacroStabilityInwardsSoilLayer2D>()) {}
 
         /// <summary>
         /// Creates a new instance of <see cref="MacroStabilityInwardsSoilLayer2D"/>.
@@ -47,9 +47,9 @@
         /// <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>
-        /// <param name="nestedLayers">The nested <see cref="IMacroStabilityInwardsSoilLayer2D"/>.</param>
+        /// <param name="nestedLayers">The nested <see cref="MacroStabilityInwardsSoilLayer2D"/>.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public MacroStabilityInwardsSoilLayer2D(Ring outerRing, IEnumerable<Ring> holes, MacroStabilityInwardsSoilLayerData data, IEnumerable<IMacroStabilityInwardsSoilLayer2D> nestedLayers)
+        public MacroStabilityInwardsSoilLayer2D(Ring outerRing, IEnumerable<Ring> holes, MacroStabilityInwardsSoilLayerData data, IEnumerable<MacroStabilityInwardsSoilLayer2D> nestedLayers)
         {
             if (outerRing == null)
             {
@@ -77,11 +77,20 @@
             NestedLayers = nestedLayers;
         }
 
+        /// <summary>
+        /// Gets the outer ring of the layer.
+        /// </summary>
         public Ring OuterRing { get; }
 
+        /// <summary>
+        /// Gets the holes of the layer.
+        /// </summary>
         public Ring[] Holes { get; }
 
-        public IEnumerable<IMacroStabilityInwardsSoilLayer2D> NestedLayers { get; }
+        /// <summary>
+        /// Gets any nested layers.
+        /// </summary>
+        public IEnumerable<MacroStabilityInwardsSoilLayer2D> NestedLayers { get; }
 
         public MacroStabilityInwardsSoilLayerData Data { get; }
 
@@ -115,7 +124,7 @@
                     hashCode = (hashCode * 397) ^ hole.GetHashCode();
                 }
 
-                foreach (IMacroStabilityInwardsSoilLayer2D nestedLayer in NestedLayers)
+                foreach (MacroStabilityInwardsSoilLayer2D nestedLayer in NestedLayers)
                 {
                     hashCode = (hashCode * 397) ^ nestedLayer.GetHashCode();
                 }
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Ringtoets.MacroStabilityInwards.Primitives.csproj
===================================================================
diff -u -r81f24a37267276f3169746471998361272d68b4c -r686c5eeaad900a6bb627733de8c21bd607f130aa
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Ringtoets.MacroStabilityInwards.Primitives.csproj	(.../Ringtoets.MacroStabilityInwards.Primitives.csproj)	(revision 81f24a37267276f3169746471998361272d68b4c)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Ringtoets.MacroStabilityInwards.Primitives.csproj	(.../Ringtoets.MacroStabilityInwards.Primitives.csproj)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
@@ -46,7 +46,6 @@
     <Compile Include="IMacroStabilityInwardsLocationInputDaily.cs" />
     <Compile Include="IMacroStabilityInwardsLocationInputExtreme.cs" />
     <Compile Include="IMacroStabilityInwardsSoilLayer.cs" />
-    <Compile Include="IMacroStabilityInwardsSoilLayer2D.cs" />
     <Compile Include="IMacroStabilityInwardsWaternetInput.cs" />
     <Compile Include="IMacroStabilityInwardsPreconsolidationStress.cs" />
     <Compile Include="IMacroStabilityInwardsSoilProfileUnderSurfaceLine.cs" />
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil/CalculatorInputAssert.cs
===================================================================
diff -u -rd9005dfa3b398d70ada0cf03cf408f8bcfc384db -r686c5eeaad900a6bb627733de8c21bd607f130aa
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil/CalculatorInputAssert.cs	(.../CalculatorInputAssert.cs)	(revision d9005dfa3b398d70ada0cf03cf408f8bcfc384db)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.TestUtil/CalculatorInputAssert.cs	(.../CalculatorInputAssert.cs)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
@@ -41,7 +41,7 @@
         /// does not correspond to <paramref name="original"/>.</exception>
         public static void AssertSoilProfile(IMacroStabilityInwardsSoilProfileUnderSurfaceLine original, SoilProfile actual)
         {
-            IMacroStabilityInwardsSoilLayer2D[] expectedLayers = original.Layers.ToArray();
+            MacroStabilityInwardsSoilLayer2D[] expectedLayers = original.Layers.ToArray();
             SoilLayer[] actualLayers = actual.Layers.ToArray();
 
             IMacroStabilityInwardsPreconsolidationStress[] expectedPreconsolidationStresses = original.PreconsolidationStresses.ToArray();
@@ -102,11 +102,11 @@
         /// <summary>
         /// Asserts whether <paramref name="actual"/> corresponds to <paramref name="original"/>.
         /// </summary>
-        /// <param name="original">The original <see cref="IMacroStabilityInwardsSoilLayer2D"/> array.</param>
+        /// <param name="original">The original <see cref="MacroStabilityInwardsSoilLayer2D"/> array.</param>
         /// <param name="actual">The actual <see cref="SoilLayer"/> array.</param>
         /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
         /// does not correspond to <paramref name="original"/>.</exception>
-        private static void AssertLayers(IMacroStabilityInwardsSoilLayer2D[] original, SoilLayer[] actual)
+        private static void AssertLayers(MacroStabilityInwardsSoilLayer2D[] original, SoilLayer[] actual)
         {
             Assert.AreEqual(original.Length, actual.Length);
 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfile2DLayersHelperTest.cs
===================================================================
diff -u -r66894d34e58e0db658fa3183df8792ed244ccda3 -r686c5eeaad900a6bb627733de8c21bd607f130aa
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfile2DLayersHelperTest.cs	(.../MacroStabilityInwardsSoilProfile2DLayersHelperTest.cs)	(revision 66894d34e58e0db658fa3183df8792ed244ccda3)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfile2DLayersHelperTest.cs	(.../MacroStabilityInwardsSoilProfile2DLayersHelperTest.cs)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
@@ -99,7 +99,7 @@
             };
 
             // Call
-            IEnumerable<IMacroStabilityInwardsSoilLayer2D> flatLayers = MacroStabilityInwardsSoilProfile2DLayersHelper.GetLayersRecursively(layers);
+            IEnumerable<MacroStabilityInwardsSoilLayer2D> flatLayers = MacroStabilityInwardsSoilProfile2DLayersHelper.GetLayersRecursively(layers);
 
             // Assert
             CollectionAssert.AreEqual(new[]
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/SoilProfile/MacroStabilityInwardsSoilLayer2DTestFactory.cs
===================================================================
diff -u -rf6dd19ee061fc2754d81eb3677c26fbdb504fc49 -r686c5eeaad900a6bb627733de8c21bd607f130aa
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/SoilProfile/MacroStabilityInwardsSoilLayer2DTestFactory.cs	(.../MacroStabilityInwardsSoilLayer2DTestFactory.cs)	(revision f6dd19ee061fc2754d81eb3677c26fbdb504fc49)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/SoilProfile/MacroStabilityInwardsSoilLayer2DTestFactory.cs	(.../MacroStabilityInwardsSoilLayer2DTestFactory.cs)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
@@ -21,7 +21,6 @@
 
 using System.Collections.Generic;
 using Core.Common.Base.Geometry;
-using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
 using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Data.TestUtil.SoilProfile
@@ -38,15 +37,15 @@
         /// <returns>The created <see cref="MacroStabilityInwardsSoilLayer2D"/>.</returns>
         public static MacroStabilityInwardsSoilLayer2D CreateMacroStabilityInwardsSoilLayer2D()
         {
-            return CreateMacroStabilityInwardsSoilLayer2D(new IMacroStabilityInwardsSoilLayer2D[0]);
+            return CreateMacroStabilityInwardsSoilLayer2D(new MacroStabilityInwardsSoilLayer2D[0]);
         }
 
         /// <summary>
         /// Creates a new instance of <see cref="MacroStabilityInwardsSoilLayer2D"/>.
         /// </summary>
-        /// <param name="nestedLayers">The nested <see cref="IMacroStabilityInwardsSoilLayer2D"/>.</param>
+        /// <param name="nestedLayers">The nested <see cref="MacroStabilityInwardsSoilLayer2D"/>.</param>
         /// <returns>The created <see cref="MacroStabilityInwardsSoilLayer2D"/>.</returns>
-        public static MacroStabilityInwardsSoilLayer2D CreateMacroStabilityInwardsSoilLayer2D(IEnumerable<IMacroStabilityInwardsSoilLayer2D> nestedLayers)
+        public static MacroStabilityInwardsSoilLayer2D CreateMacroStabilityInwardsSoilLayer2D(IEnumerable<MacroStabilityInwardsSoilLayer2D> nestedLayers)
         {
             return new MacroStabilityInwardsSoilLayer2D(new Ring(new[]
                                                         {
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataPointsFactoryTest.cs
===================================================================
diff -u -rabaf857dd9adbb07113b33f4212efb95571ab145 -r686c5eeaad900a6bb627733de8c21bd607f130aa
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataPointsFactoryTest.cs	(.../MacroStabilityInwardsChartDataPointsFactoryTest.cs)	(revision abaf857dd9adbb07113b33f4212efb95571ab145)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataPointsFactoryTest.cs	(.../MacroStabilityInwardsChartDataPointsFactoryTest.cs)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
@@ -707,20 +707,15 @@
         public void CreateOuterRingArea_WithSoilLayer_ReturnsOuterRingArea()
         {
             // Setup
-            var mocks = new MockRepository();
             var outerRing = new Ring(new[]
             {
                 new Point2D(0.0, 10.0),
                 new Point2D(10.0, 10.0),
                 new Point2D(10.0, 0.0),
                 new Point2D(0.0, 0.0)
             });
+            var layer = new MacroStabilityInwardsSoilLayer2D(outerRing, Enumerable.Empty<Ring>());
 
-            var layer = mocks.Stub<IMacroStabilityInwardsSoilLayer2D>();
-            layer.Stub(l => l.OuterRing).Return(outerRing);
-
-            mocks.ReplayAll();
-
             // Call
             IEnumerable<Point2D[]> outerRingChartData = MacroStabilityInwardsChartDataPointsFactory.CreateOuterRingArea(layer);
 
@@ -729,8 +724,6 @@
             {
                 outerRing.Points
             }, outerRingChartData);
-
-            mocks.VerifyAll();
         }
 
         [Test]
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSoilLayer2DBasePropertiesTest.cs
===================================================================
diff -u -r1a3f904157a3f86e702ea8086bee67e780da7856 -r686c5eeaad900a6bb627733de8c21bd607f130aa
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSoilLayer2DBasePropertiesTest.cs	(.../MacroStabilityInwardsSoilLayer2DBasePropertiesTest.cs)	(revision 1a3f904157a3f86e702ea8086bee67e780da7856)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSoilLayer2DBasePropertiesTest.cs	(.../MacroStabilityInwardsSoilLayer2DBasePropertiesTest.cs)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
@@ -26,7 +26,6 @@
 using Core.Common.Gui.PropertyBag;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
 using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses;
 using Ringtoets.MacroStabilityInwards.Primitives;
 
@@ -55,7 +54,7 @@
             var properties = new MacroStabilityInwardsSoilLayer2DBaseProperties(soilLayer);
 
             // Assert
-            Assert.IsInstanceOf<ObjectProperties<IMacroStabilityInwardsSoilLayer2D>>(properties);
+            Assert.IsInstanceOf<ObjectProperties<MacroStabilityInwardsSoilLayer2D>>(properties);
             TestHelper.AssertTypeConverter<MacroStabilityInwardsSoilLayer2DBaseProperties,
                 ExpandableArrayConverter>(nameof(MacroStabilityInwardsSoilLayer2DBaseProperties.Geometry));
             Assert.AreSame(soilLayer, properties.Data);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsViewChartDataAssert.cs
===================================================================
diff -u -r66894d34e58e0db658fa3183df8792ed244ccda3 -r686c5eeaad900a6bb627733de8c21bd607f130aa
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsViewChartDataAssert.cs	(.../MacroStabilityInwardsViewChartDataAssert.cs)	(revision 66894d34e58e0db658fa3183df8792ed244ccda3)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsViewChartDataAssert.cs	(.../MacroStabilityInwardsViewChartDataAssert.cs)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
@@ -69,9 +69,9 @@
             Assert.IsInstanceOf<ChartDataCollection>(actual);
             var soilProfileChartData = (ChartDataCollection) actual;
 
-            IMacroStabilityInwardsSoilLayer2D[] layers = soilProfileUnderSurface?.Layers != null
-                                                             ? MacroStabilityInwardsSoilProfile2DLayersHelper.GetLayersRecursively(soilProfileUnderSurface.Layers).ToArray()
-                                                             : new IMacroStabilityInwardsSoilLayer2D[0];
+            MacroStabilityInwardsSoilLayer2D[] layers = soilProfileUnderSurface?.Layers != null
+                                                            ? MacroStabilityInwardsSoilProfile2DLayersHelper.GetLayersRecursively(soilProfileUnderSurface.Layers).ToArray()
+                                                            : new MacroStabilityInwardsSoilLayer2D[0];
             int expectedLayerCount = layers.Length;
 
             Assert.AreEqual(expectedLayerCount, soilProfileChartData.Collection.Count());
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsSoilLayer2DTest.cs
===================================================================
diff -u -r81f24a37267276f3169746471998361272d68b4c -r686c5eeaad900a6bb627733de8c21bd607f130aa
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsSoilLayer2DTest.cs	(.../MacroStabilityInwardsSoilLayer2DTest.cs)	(revision 81f24a37267276f3169746471998361272d68b4c)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsSoilLayer2DTest.cs	(.../MacroStabilityInwardsSoilLayer2DTest.cs)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
@@ -71,7 +71,7 @@
             TestDelegate test = () => new MacroStabilityInwardsSoilLayer2D(null,
                                                                            holes,
                                                                            new MacroStabilityInwardsSoilLayerData(),
-                                                                           Enumerable.Empty<IMacroStabilityInwardsSoilLayer2D>());
+                                                                           Enumerable.Empty<MacroStabilityInwardsSoilLayer2D>());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -110,7 +110,7 @@
             TestDelegate test = () => new MacroStabilityInwardsSoilLayer2D(outerRing,
                                                                            null,
                                                                            new MacroStabilityInwardsSoilLayerData(),
-                                                                           Enumerable.Empty<IMacroStabilityInwardsSoilLayer2D>());
+                                                                           Enumerable.Empty<MacroStabilityInwardsSoilLayer2D>());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -129,7 +129,7 @@
             };
 
             // Call
-            TestDelegate test = () => new MacroStabilityInwardsSoilLayer2D(outerRing, holes, null, Enumerable.Empty<IMacroStabilityInwardsSoilLayer2D>());
+            TestDelegate test = () => new MacroStabilityInwardsSoilLayer2D(outerRing, holes, null, Enumerable.Empty<MacroStabilityInwardsSoilLayer2D>());
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -170,8 +170,7 @@
             var layer = new MacroStabilityInwardsSoilLayer2D(outerRing, holes);
 
             // Assert
-            Assert.IsInstanceOf<IMacroStabilityInwardsSoilLayer2D>(layer);
-            Assert.NotNull(layer);
+            Assert.IsInstanceOf<IMacroStabilityInwardsSoilLayer>(layer);
             Assert.AreSame(outerRing, layer.OuterRing);
             Assert.AreNotSame(holes, layer.Holes);
             TestHelper.AssertCollectionsAreEqual(holes, layer.Holes, new ReferenceEqualityComparer<Ring>());
@@ -190,14 +189,13 @@
                 CreateRandomRing(random)
             };
             var data = new MacroStabilityInwardsSoilLayerData();
-            IEnumerable<IMacroStabilityInwardsSoilLayer2D> nestedLayers = Enumerable.Empty<IMacroStabilityInwardsSoilLayer2D>();
+            IEnumerable<MacroStabilityInwardsSoilLayer2D> nestedLayers = Enumerable.Empty<MacroStabilityInwardsSoilLayer2D>();
 
             // Call
             var layer = new MacroStabilityInwardsSoilLayer2D(outerRing, holes, data, nestedLayers);
 
             // Assert
-            Assert.IsInstanceOf<IMacroStabilityInwardsSoilLayer2D>(layer);
-            Assert.NotNull(layer);
+            Assert.IsInstanceOf<IMacroStabilityInwardsSoilLayer>(layer);
             Assert.AreSame(outerRing, layer.OuterRing);
             Assert.AreNotSame(holes, layer.Holes);
             TestHelper.AssertCollectionsAreEqual(holes, layer.Holes, new ReferenceEqualityComparer<Ring>());