Index: Core/Common/test/Core.Common.TestUtil.Test/TestHelperTest.cs
===================================================================
diff -u -r133ab46a14ee9508c8dd5e4f82381da606076ae0 -r03bb865f66b346c37c91f2cd8a442abbb2952cba
--- Core/Common/test/Core.Common.TestUtil.Test/TestHelperTest.cs	(.../TestHelperTest.cs)	(revision 133ab46a14ee9508c8dd5e4f82381da606076ae0)
+++ Core/Common/test/Core.Common.TestUtil.Test/TestHelperTest.cs	(.../TestHelperTest.cs)	(revision 03bb865f66b346c37c91f2cd8a442abbb2952cba)
@@ -608,7 +608,7 @@
         public void AssertExceptionCustomMessage_NoException_ThrowsAssertionException()
         {
             // Setup
-            TestDelegate t = () => { };
+            TestDelegate t = () => {};
 
             // Call
             TestDelegate call = () => TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(t, string.Empty);
@@ -676,7 +676,7 @@
         }
 
         [Test]
-        public void AssertTypeConverter_PropertyWithoutTypeConverterAttribute_ThrowsAssertionException()
+        public void AssertTypeConverterWithExpression_PropertyWithoutTypeConverterAttribute_ThrowsAssertionException()
         {
             // Call
             TestDelegate test = () => TestHelper.AssertTypeConverter<TestClass, Int32Converter>(nameof(TestClass.PropertyWithoutTypeConverter));
@@ -686,7 +686,7 @@
         }
 
         [Test]
-        public void AssertTypeConverter_PropertyWithDifferentTypeConverterAttribute_ThrowsAssertionException()
+        public void AssertTypeConverterWithExpression_PropertyWithDifferentTypeConverterAttribute_ThrowsAssertionException()
         {
             // Call
             TestDelegate test = () => TestHelper.AssertTypeConverter<TestClass, Int32Converter>(nameof(TestClass.PropertyWithTypeConverter));
@@ -696,7 +696,7 @@
         }
 
         [Test]
-        public void AssertTypeConverter_PropertyWithMatchingTypeConverterAttribute_DoesNotThrowException()
+        public void AssertTypeConverterWithExpression_PropertyWithMatchingTypeConverterAttribute_DoesNotThrowException()
         {
             // Call
             TestDelegate test = () => TestHelper.AssertTypeConverter<TestClass, DoubleConverter>(nameof(TestClass.PropertyWithTypeConverter));
@@ -706,7 +706,7 @@
         }
 
         [Test]
-        public void AssertTypeConverter_TypeConverterAttributeInherited_ReturnTrue()
+        public void AssertTypeConverterWithExpression_TypeConverterAttributeInherited_ReturnTrue()
         {
             // Call
             TestDelegate test = () => TestHelper.AssertTypeConverter<DerivedTestClass, DoubleConverter>(nameof(DerivedTestClass.PropertyWithTypeConverter));
@@ -716,6 +716,46 @@
         }
 
         [Test]
+        public void AssertTypeConverterWithoutExpression_ClassWithoutTypeConverterAttribute_ThrowsAssertionException()
+        {
+            // Call
+            TestDelegate test = TestHelper.AssertTypeConverter<TestClassWithoutConverter, Int32Converter>;
+
+            // Assert
+            Assert.Throws<AssertionException>(test);
+        }
+
+        [Test]
+        public void AssertTypeConverterWithoutExpression_ClassWithDifferentTypeConverterAttribute_ThrowsAssertionException()
+        {
+            // Call
+            TestDelegate test = TestHelper.AssertTypeConverter<TestClass, Int32Converter>;
+
+            // Assert
+            Assert.Throws<AssertionException>(test);
+        }
+
+        [Test]
+        public void AssertTypeConverterWithoutExpression_ClassWithMatchingTypeConverterAttribute_DoesNotThrowException()
+        {
+            // Call
+            TestDelegate test = TestHelper.AssertTypeConverter<TestClass, DoubleConverter>;
+
+            // Assert
+            Assert.DoesNotThrow(test);
+        }
+
+        [Test]
+        public void AssertTypeConverterWithoutExpression_TypeConverterAttributeInherited_ReturnTrue()
+        {
+            // Call
+            TestDelegate test = TestHelper.AssertTypeConverter<DerivedTestClass, DoubleConverter>;
+
+            // Assert
+            Assert.DoesNotThrow(test);
+        }
+
+        [Test]
         [TestCaseSource(nameof(AssertAreEqualButNotSameSource))]
         public void AssertAreEqualButNotSame_DifferentObjects_ReturnExpectedValues(object objectA, object objectB, bool shouldSucceed)
         {
@@ -1163,6 +1203,9 @@
 
         private class TestToolStripDropDownItem : ToolStripDropDownItem {}
 
+        private class TestClassWithoutConverter {}
+
+        [TypeConverter(typeof(DoubleConverter))]
         private class TestClass
         {
             public double PropertyWithoutTypeConverter { get; private set; }
Index: Core/Common/test/Core.Common.TestUtil/TestHelper.cs
===================================================================
diff -u -r094cd1436a3bca306b1df6d6b09586bf1a032f0e -r03bb865f66b346c37c91f2cd8a442abbb2952cba
--- Core/Common/test/Core.Common.TestUtil/TestHelper.cs	(.../TestHelper.cs)	(revision 094cd1436a3bca306b1df6d6b09586bf1a032f0e)
+++ Core/Common/test/Core.Common.TestUtil/TestHelper.cs	(.../TestHelper.cs)	(revision 03bb865f66b346c37c91f2cd8a442abbb2952cba)
@@ -394,22 +394,39 @@
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="expression"/> is <c>null</c>.</exception>
         /// <exception cref="ArgumentException">Thrown when <paramref name="expression"/> 
         /// is not an expression with a property, such as an expression calling multiple methods.</exception>
-        /// <exception cref="AmbiguousMatchException">Thrown when more than one property is found with
+        /// <exception cref="AmbiguousMatchException">Thrown when more than one property is found with the
         /// name specified in <paramref name="expression"/>.</exception>
         /// <exception cref="TypeLoadException">Thrown when a custom attribute type cannot be loaded.</exception>
         /// <exception cref="InvalidOperationException">Thrown when the property in <paramref name="expression"/>
         /// belongs to a type that is loaded into the reflection-only context. See How to: 
         /// Load Assemblies into the Reflection-Only Context on MSDN for more information.</exception>
         public static void AssertTypeConverter<TTarget, TTypeConverter>(string expression) where TTypeConverter : TypeConverter
         {
-            var typeConverterAttribute = (TypeConverterAttribute) Attribute.GetCustomAttribute(typeof(TTarget).GetProperty(expression),
-                                                                                               typeof(TypeConverterAttribute),
-                                                                                               true);
-            Assert.NotNull(typeConverterAttribute);
-            Assert.IsTrue(typeConverterAttribute.ConverterTypeName == typeof(TTypeConverter).AssemblyQualifiedName);
+            AssertTypeConverter<TTypeConverter>(typeof(TTarget).GetProperty(expression));
         }
 
         /// <summary>
+        /// Determines whether a class is decorated with a <see cref="TypeConverterAttribute"/>
+        /// of a given type.
+        /// </summary>
+        /// <typeparam name="TTarget">The type of the target.</typeparam>
+        /// <typeparam name="TTypeConverter">The type of <see cref="TypeConverter"/> to check
+        /// for on the type of <typeparamref name="TTarget"/>.</typeparam>
+        /// <exception cref="AssertionException">Thrown when the class wasn't decorated with 
+        /// a <see cref="TypeConverter"/> or with a different <see cref="TypeConverter"/>
+        /// than <typeparamref name="TTypeConverter"/>.</exception>
+        /// <exception cref="AmbiguousMatchException">Thrown when more than one class is found with
+        /// the type specified in <typeparamref name="TTarget"/>.</exception>
+        /// <exception cref="TypeLoadException">Thrown when a custom attribute type cannot be loaded.</exception>
+        /// <exception cref="InvalidOperationException">Thrown when the class belongs to a type
+        /// that is loaded into the reflection-only context. See How to: 
+        /// Load Assemblies into the Reflection-Only Context on MSDN for more information.</exception>
+        public static void AssertTypeConverter<TTarget, TTypeConverter>() where TTypeConverter : TypeConverter
+        {
+            AssertTypeConverter<TTypeConverter>(typeof(TTarget));
+        }
+
+        /// <summary>
         /// Determines whether objects are copies of each other by verifying that they are
         /// equal, but not the same.
         /// </summary>
@@ -520,6 +537,31 @@
             }
         }
 
+        /// <summary>
+        /// Determines whether a class is decorated with a <see cref="TypeConverterAttribute"/>
+        /// of a given type.
+        /// </summary>
+        /// <typeparam name="TTypeConverter">The type of <see cref="TypeConverter"/> to check
+        /// for on the <paramref name="expression"/>.</typeparam>
+        /// <exception cref="AssertionException">Thrown when the class wasn't decorated with 
+        /// a <see cref="TypeConverter"/> or with a different <see cref="TypeConverter"/>
+        /// than <typeparamref name="TTypeConverter"/>.</exception>
+        /// <exception cref="AmbiguousMatchException">Thrown when more than one class is found with
+        /// the property specified in <paramref name="expression"/>.</exception>
+        /// <exception cref="TypeLoadException">Thrown when a custom attribute type cannot be loaded.</exception>
+        /// <exception cref="InvalidOperationException">Thrown when the class belongs to a type
+        /// that is loaded into the reflection-only context. See How to: 
+        /// Load Assemblies into the Reflection-Only Context on MSDN for more information.</exception>
+        private static void AssertTypeConverter<TTypeConverter>(MemberInfo expression) where TTypeConverter : TypeConverter
+        {
+            var typeConverterAttribute = (TypeConverterAttribute) Attribute.GetCustomAttribute(expression,
+                                                                                               typeof(TypeConverterAttribute),
+                                                                                               true);
+
+            Assert.NotNull(typeConverterAttribute);
+            Assert.IsTrue(typeConverterAttribute.ConverterTypeName == typeof(TTypeConverter).AssemblyQualifiedName);
+        }
+
         private static void AssertIsFasterThan(float maxMilliseconds, string message, Action action, bool rankHddAccess)
         {
             var stopwatch = new Stopwatch();
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfile2DLayersHelper.cs
===================================================================
diff -u -r686c5eeaad900a6bb627733de8c21bd607f130aa -r03bb865f66b346c37c91f2cd8a442abbb2952cba
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfile2DLayersHelper.cs	(.../MacroStabilityInwardsSoilProfile2DLayersHelper.cs)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfile2DLayersHelper.cs	(.../MacroStabilityInwardsSoilProfile2DLayersHelper.cs)	(revision 03bb865f66b346c37c91f2cd8a442abbb2952cba)
@@ -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 Ringtoets.MacroStabilityInwards.Primitives;
@@ -35,16 +34,10 @@
         /// 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="MacroStabilityInwardsSoilLayer2D"/>.</returns>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="layers"/> is <c>null</c>.</exception>
+        /// <returns>An enumerable with <see cref="MacroStabilityInwardsSoilLayer2D"/>, if there are any.</returns>
         public static IEnumerable<MacroStabilityInwardsSoilLayer2D> GetLayersRecursively(IEnumerable<MacroStabilityInwardsSoilLayer2D> layers)
         {
-            if (layers == null)
-            {
-                throw new ArgumentNullException(nameof(layers));
-            }
-
-            return layers.SelectMany(GetLayersRecursively);
+            return layers?.SelectMany(GetLayersRecursively) ?? Enumerable.Empty<MacroStabilityInwardsSoilLayer2D>();
         }
 
         private static IEnumerable<MacroStabilityInwardsSoilLayer2D> GetLayersRecursively(MacroStabilityInwardsSoilLayer2D layer)
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSoilLayer2DBaseProperties.cs
===================================================================
diff -u -r686c5eeaad900a6bb627733de8c21bd607f130aa -r03bb865f66b346c37c91f2cd8a442abbb2952cba
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSoilLayer2DBaseProperties.cs	(.../MacroStabilityInwardsSoilLayer2DBaseProperties.cs)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSoilLayer2DBaseProperties.cs	(.../MacroStabilityInwardsSoilLayer2DBaseProperties.cs)	(revision 03bb865f66b346c37c91f2cd8a442abbb2952cba)
@@ -68,7 +68,6 @@
         }
 
         [PropertyOrder(2)]
-        [ReadOnly(true)]
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))]
         [TypeConverter(typeof(ExpandableArrayConverter))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.SoilLayer_Geometry_DisplayName))]
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsStochasticSoilProfileProperties.cs
===================================================================
diff -u -r686c5eeaad900a6bb627733de8c21bd607f130aa -r03bb865f66b346c37c91f2cd8a442abbb2952cba
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsStochasticSoilProfileProperties.cs	(.../MacroStabilityInwardsStochasticSoilProfileProperties.cs)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsStochasticSoilProfileProperties.cs	(.../MacroStabilityInwardsStochasticSoilProfileProperties.cs)	(revision 03bb865f66b346c37c91f2cd8a442abbb2952cba)
@@ -108,11 +108,8 @@
             get
             {
                 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];
+                IEnumerable<MacroStabilityInwardsSoilLayer2D> macroStabilityInwardsSoilLayers2D = MacroStabilityInwardsSoilProfile2DLayersHelper.GetLayersRecursively(layers);
+                return macroStabilityInwardsSoilLayers2D.Select(layer => new MacroStabilityInwardsSoilLayer2DTopLevelProperties(layer)).ToArray();
             }
         }
 
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsInputView.cs
===================================================================
diff -u -rf1a0220eaafcd55ec39eb0b0c93d5fbd1c65d8c9 -r03bb865f66b346c37c91f2cd8a442abbb2952cba
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsInputView.cs	(.../MacroStabilityInwardsInputView.cs)	(revision f1a0220eaafcd55ec39eb0b0c93d5fbd1c65d8c9)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsInputView.cs	(.../MacroStabilityInwardsInputView.cs)	(revision 03bb865f66b346c37c91f2cd8a442abbb2952cba)
@@ -319,10 +319,7 @@
 
         private IEnumerable<MacroStabilityInwardsSoilLayer2D> GetSoilLayers()
         {
-            IEnumerable<MacroStabilityInwardsSoilLayer2D> layers = data?.InputParameters.SoilProfileUnderSurfaceLine?.Layers;
-            return layers != null
-                       ? MacroStabilityInwardsSoilProfile2DLayersHelper.GetLayersRecursively(layers)
-                       : new List<MacroStabilityInwardsSoilLayer2D>();
+            return MacroStabilityInwardsSoilProfile2DLayersHelper.GetLayersRecursively(data?.InputParameters.SoilProfileUnderSurfaceLine?.Layers);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsOutputChartControl.cs
===================================================================
diff -u -rf1a0220eaafcd55ec39eb0b0c93d5fbd1c65d8c9 -r03bb865f66b346c37c91f2cd8a442abbb2952cba
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsOutputChartControl.cs	(.../MacroStabilityInwardsOutputChartControl.cs)	(revision f1a0220eaafcd55ec39eb0b0c93d5fbd1c65d8c9)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsOutputChartControl.cs	(.../MacroStabilityInwardsOutputChartControl.cs)	(revision 03bb865f66b346c37c91f2cd8a442abbb2952cba)
@@ -265,10 +265,7 @@
 
         private IEnumerable<MacroStabilityInwardsSoilLayer2D> GetSoilLayers()
         {
-            IEnumerable<MacroStabilityInwardsSoilLayer2D> layers = data?.InputParameters.SoilProfileUnderSurfaceLine?.Layers;
-            return layers != null
-                       ? MacroStabilityInwardsSoilProfile2DLayersHelper.GetLayersRecursively(layers)
-                       : new List<MacroStabilityInwardsSoilLayer2D>();
+            return MacroStabilityInwardsSoilProfile2DLayersHelper.GetLayersRecursively(data.InputParameters.SoilProfileUnderSurfaceLine?.Layers);
         }
 
         private void SetWaternetDatas(MacroStabilityInwardsSurfaceLine surfaceLine)
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfile2DLayersHelperTest.cs
===================================================================
diff -u -r686c5eeaad900a6bb627733de8c21bd607f130aa -r03bb865f66b346c37c91f2cd8a442abbb2952cba
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfile2DLayersHelperTest.cs	(.../MacroStabilityInwardsSoilProfile2DLayersHelperTest.cs)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfile2DLayersHelperTest.cs	(.../MacroStabilityInwardsSoilProfile2DLayersHelperTest.cs)	(revision 03bb865f66b346c37c91f2cd8a442abbb2952cba)
@@ -19,8 +19,8 @@
 // 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 Core.Common.Base.Geometry;
 using NUnit.Framework;
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
@@ -32,66 +32,74 @@
     public class MacroStabilityInwardsSoilProfile2DLayersHelperTest
     {
         [Test]
-        public void GetLayersRecursively_LayersNull_ThrowsArgumentNullException()
+        public void GetLayersRecursively_LayersNull_ReturnsEmptyCollection()
         {
             // Call
-            TestDelegate call = () => MacroStabilityInwardsSoilProfile2DLayersHelper.GetLayersRecursively(null);
+            IEnumerable<MacroStabilityInwardsSoilLayer2D> layers = MacroStabilityInwardsSoilProfile2DLayersHelper.GetLayersRecursively(null);
 
             // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
-            Assert.AreEqual("layers", paramName);
+            CollectionAssert.IsEmpty(layers);
         }
 
         [Test]
-        public void GetLayersRecursively_WithLayers_ReturnsAllTopLevelAndNestedLayers()
+        public void GetLayersRecursively_WithNestedLayers_ReturnsAllTopLevelAndNestedLayers()
         {
             // Setup
-            var nestedLayer1 = new MacroStabilityInwardsSoilLayer2D(new Ring(new List<Point2D>
-            {
-                new Point2D(4.0, 2.0),
-                new Point2D(0.0, 2.5)
-            }), new List<Ring>());
+            var nestedLayer1 = new MacroStabilityInwardsSoilLayer2D(
+                new Ring(new List<Point2D>
+                {
+                    new Point2D(4.0, 2.0),
+                    new Point2D(0.0, 2.5)
+                }),
+                Enumerable.Empty<Ring>());
 
-            var topLevelLayer1 = new MacroStabilityInwardsSoilLayer2D(new Ring(new List<Point2D>
-                                                                      {
-                                                                          new Point2D(0.0, 1.0),
-                                                                          new Point2D(2.0, 4.0)
-                                                                      }),
-                                                                      new List<Ring>(),
-                                                                      new MacroStabilityInwardsSoilLayerData(),
-                                                                      new[]
-                                                                      {
-                                                                          nestedLayer1
-                                                                      });
+            var topLevelLayer1 = new MacroStabilityInwardsSoilLayer2D(
+                new Ring(new List<Point2D>
+                {
+                    new Point2D(0.0, 1.0),
+                    new Point2D(2.0, 4.0)
+                }),
+                Enumerable.Empty<Ring>(),
+                new MacroStabilityInwardsSoilLayerData(),
+                new[]
+                {
+                    nestedLayer1
+                });
 
-            var doubleNestedLayer = new MacroStabilityInwardsSoilLayer2D(new Ring(new List<Point2D>
-            {
-                new Point2D(4.0, 2.0),
-                new Point2D(0.0, 2.5)
-            }), new List<Ring>());
+            var doubleNestedLayer = new MacroStabilityInwardsSoilLayer2D(
+                new Ring(new List<Point2D>
+                {
+                    new Point2D(4.0, 2.0),
+                    new Point2D(0.0, 2.5)
+                }),
+                Enumerable.Empty<Ring>());
 
-            var nestedLayer2 = new MacroStabilityInwardsSoilLayer2D(new Ring(new List<Point2D>
-                                                                    {
-                                                                        new Point2D(4.0, 2.0),
-                                                                        new Point2D(0.0, 2.5)
-                                                                    }),
-                                                                    new List<Ring>(),
-                                                                    new MacroStabilityInwardsSoilLayerData(),
-                                                                    new[]
-                                                                    {
-                                                                        doubleNestedLayer
-                                                                    });
+            var nestedLayer2 = new MacroStabilityInwardsSoilLayer2D(
+                new Ring(new List<Point2D>
+                {
+                    new Point2D(4.0, 2.0),
+                    new Point2D(0.0, 2.5)
+                }),
+                Enumerable.Empty<Ring>(),
+                new MacroStabilityInwardsSoilLayerData(),
+                new[]
+                {
+                    doubleNestedLayer
+                });
 
-            var topLevelLayer2 = new MacroStabilityInwardsSoilLayer2D(new Ring(new List<Point2D>
-                                                                      {
-                                                                          new Point2D(3.0, 1.0),
-                                                                          new Point2D(8.0, 3.0)
-                                                                      }), new List<Ring>(),
-                                                                      new MacroStabilityInwardsSoilLayerData(),
-                                                                      new[]
-                                                                      {
-                                                                          nestedLayer2
-                                                                      });
+            var topLevelLayer2 = new MacroStabilityInwardsSoilLayer2D(
+                new Ring(new List<Point2D>
+                {
+                    new Point2D(3.0, 1.0),
+                    new Point2D(8.0, 3.0)
+                }),
+                Enumerable.Empty<Ring>(),
+                new MacroStabilityInwardsSoilLayerData(),
+                new[]
+                {
+                    nestedLayer2
+                });
+
             var layers = new[]
             {
                 topLevelLayer1,
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSoilLayer2DBasePropertiesTest.cs
===================================================================
diff -u -r686c5eeaad900a6bb627733de8c21bd607f130aa -r03bb865f66b346c37c91f2cd8a442abbb2952cba
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSoilLayer2DBasePropertiesTest.cs	(.../MacroStabilityInwardsSoilLayer2DBasePropertiesTest.cs)	(revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSoilLayer2DBasePropertiesTest.cs	(.../MacroStabilityInwardsSoilLayer2DBasePropertiesTest.cs)	(revision 03bb865f66b346c37c91f2cd8a442abbb2952cba)
@@ -21,11 +21,13 @@
 
 using System;
 using System.ComponentModel;
+using System.Linq;
 using Core.Common.Base.Geometry;
 using Core.Common.Gui.Converters;
 using Core.Common.Gui.PropertyBag;
 using Core.Common.TestUtil;
 using NUnit.Framework;
+using Ringtoets.MacroStabilityInwards.Data.TestUtil.SoilProfile;
 using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses;
 using Ringtoets.MacroStabilityInwards.Primitives;
 
@@ -48,13 +50,14 @@
         public void Constructor_ValidMacroStabilityInwardsSoilLayer2D_ExpectedValues()
         {
             // Setup
-            MacroStabilityInwardsSoilLayer2D soilLayer = CreateMacroStabilityInwardsSoilLayer2D();
+            MacroStabilityInwardsSoilLayer2D soilLayer = MacroStabilityInwardsSoilLayer2DTestFactory.CreateMacroStabilityInwardsSoilLayer2D();
 
             // Call
             var properties = new MacroStabilityInwardsSoilLayer2DBaseProperties(soilLayer);
 
             // Assert
             Assert.IsInstanceOf<ObjectProperties<MacroStabilityInwardsSoilLayer2D>>(properties);
+            TestHelper.AssertTypeConverter<MacroStabilityInwardsSoilLayer2DBaseProperties, ExpandableObjectConverter>();
             TestHelper.AssertTypeConverter<MacroStabilityInwardsSoilLayer2DBaseProperties,
                 ExpandableArrayConverter>(nameof(MacroStabilityInwardsSoilLayer2DBaseProperties.Geometry));
             Assert.AreSame(soilLayer, properties.Data);
@@ -64,25 +67,28 @@
         public void GetProperties_WithData_ReturnExpectedValues()
         {
             // Setup
-            var layer = new MacroStabilityInwardsSoilLayer2D(new Ring(new[]
-                                                             {
-                                                                 new Point2D(20.210230, 26.00001),
-                                                                 new Point2D(3.830, 1.040506)
-                                                             }),
-                                                             new Ring[0],
-                                                             new MacroStabilityInwardsSoilLayerData
-                                                             {
-                                                                 MaterialName = "Test Name",
-                                                                 IsAquifer = true
-                                                             },
-                                                             new[]
-                                                             {
-                                                                 new MacroStabilityInwardsSoilLayer2D(new Ring(new[]
-                                                                 {
-                                                                     new Point2D(12.987, 12.821),
-                                                                     new Point2D(4.23, 1.02)
-                                                                 }), new Ring[0])
-                                                             });
+            var layer = new MacroStabilityInwardsSoilLayer2D(
+                new Ring(new[]
+                {
+                    new Point2D(20.210230, 26.00001),
+                    new Point2D(3.830, 1.040506)
+                }),
+                Enumerable.Empty<Ring>(),
+                new MacroStabilityInwardsSoilLayerData
+                {
+                    MaterialName = "Test Name",
+                    IsAquifer = true
+                },
+                new[]
+                {
+                    new MacroStabilityInwardsSoilLayer2D(
+                        new Ring(new[]
+                        {
+                            new Point2D(12.987, 12.821),
+                            new Point2D(4.23, 1.02)
+                        }),
+                        Enumerable.Empty<Ring>())
+                });
 
             // Call
             var properties = new MacroStabilityInwardsSoilLayer2DBaseProperties(layer);
@@ -96,7 +102,7 @@
         public void ToString_Always_ReturnsMaterialName()
         {
             // Setup
-            MacroStabilityInwardsSoilLayer2D layer = CreateMacroStabilityInwardsSoilLayer2D();
+            MacroStabilityInwardsSoilLayer2D layer = MacroStabilityInwardsSoilLayer2DTestFactory.CreateMacroStabilityInwardsSoilLayer2D();
             layer.Data.MaterialName = "Layer A 2D";
 
             var properties = new MacroStabilityInwardsSoilLayer2DBaseProperties(layer);
@@ -112,7 +118,7 @@
         public void Constructor_ValidData_PropertieshaveExpectedAttributeValues()
         {
             // Setup
-            MacroStabilityInwardsSoilLayer2D layer = CreateMacroStabilityInwardsSoilLayer2D();
+            MacroStabilityInwardsSoilLayer2D layer = MacroStabilityInwardsSoilLayer2DTestFactory.CreateMacroStabilityInwardsSoilLayer2D();
 
             // Call
             var properties = new MacroStabilityInwardsSoilLayer2DBaseProperties(layer);
@@ -138,15 +144,5 @@
                                                                             "De geometrie van de buitenring van deze grondlaag.",
                                                                             true);
         }
-
-        private static MacroStabilityInwardsSoilLayer2D CreateMacroStabilityInwardsSoilLayer2D()
-        {
-            return new MacroStabilityInwardsSoilLayer2D(new Ring(new[]
-                                                        {
-                                                            new Point2D(20.210230, 26.00001),
-                                                            new Point2D(3.830, 1.040506)
-                                                        }),
-                                                        new Ring[0]);
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSoilLayer2DTopLevelPropertiesTest.cs
===================================================================
diff -u -r1a3f904157a3f86e702ea8086bee67e780da7856 -r03bb865f66b346c37c91f2cd8a442abbb2952cba
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSoilLayer2DTopLevelPropertiesTest.cs	(.../MacroStabilityInwardsSoilLayer2DTopLevelPropertiesTest.cs)	(revision 1a3f904157a3f86e702ea8086bee67e780da7856)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSoilLayer2DTopLevelPropertiesTest.cs	(.../MacroStabilityInwardsSoilLayer2DTopLevelPropertiesTest.cs)	(revision 03bb865f66b346c37c91f2cd8a442abbb2952cba)
@@ -25,7 +25,7 @@
 using Core.Common.Gui.Converters;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
+using Ringtoets.MacroStabilityInwards.Data.TestUtil.SoilProfile;
 using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses;
 using Ringtoets.MacroStabilityInwards.Primitives;
 
@@ -37,13 +37,14 @@
         public void Constructor_ValidMacroStabilityInwardsSoilLayer2D_ExpectedValues()
         {
             // Setup
-            MacroStabilityInwardsSoilLayer2D soilLayer = CreateMacroStabilityInwardsSoilLayer2D();
+            MacroStabilityInwardsSoilLayer2D soilLayer = MacroStabilityInwardsSoilLayer2DTestFactory.CreateMacroStabilityInwardsSoilLayer2D();
 
             // Call
             var properties = new MacroStabilityInwardsSoilLayer2DTopLevelProperties(soilLayer);
 
             // Assert
             Assert.IsInstanceOf<MacroStabilityInwardsSoilLayer2DBaseProperties>(properties);
+            TestHelper.AssertTypeConverter<MacroStabilityInwardsSoilLayer2DTopLevelProperties, ExpandableObjectConverter>();
             TestHelper.AssertTypeConverter<MacroStabilityInwardsSoilLayer2DTopLevelProperties,
                 ExpandableArrayConverter>(nameof(MacroStabilityInwardsSoilLayer2DTopLevelProperties.NestedLayers));
             Assert.AreSame(soilLayer, properties.Data);
@@ -85,7 +86,7 @@
         public void Constructor_ValidData_PropertieshaveExpectedAttributeValues()
         {
             // Setup
-            MacroStabilityInwardsSoilLayer2D layer = CreateMacroStabilityInwardsSoilLayer2D();
+            MacroStabilityInwardsSoilLayer2D layer = MacroStabilityInwardsSoilLayer2DTestFactory.CreateMacroStabilityInwardsSoilLayer2D();
 
             // Call
             var properties = new MacroStabilityInwardsSoilLayer2DTopLevelProperties(layer);
@@ -125,15 +126,5 @@
                                                                             "Geeft aan of deze grondlaag een watervoerende laag betreft.",
                                                                             true);
         }
-
-        private static MacroStabilityInwardsSoilLayer2D CreateMacroStabilityInwardsSoilLayer2D()
-        {
-            return new MacroStabilityInwardsSoilLayer2D(new Ring(new[]
-                                                        {
-                                                            new Point2D(20.210230, 26.00001),
-                                                            new Point2D(3.830, 1.040506)
-                                                        }),
-                                                        new Ring[0]);
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsStochasticSoilProfilePropertiesTest.cs
===================================================================
diff -u -r1a3f904157a3f86e702ea8086bee67e780da7856 -r03bb865f66b346c37c91f2cd8a442abbb2952cba
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsStochasticSoilProfilePropertiesTest.cs	(.../MacroStabilityInwardsStochasticSoilProfilePropertiesTest.cs)	(revision 1a3f904157a3f86e702ea8086bee67e780da7856)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsStochasticSoilProfilePropertiesTest.cs	(.../MacroStabilityInwardsStochasticSoilProfilePropertiesTest.cs)	(revision 03bb865f66b346c37c91f2cd8a442abbb2952cba)
@@ -64,6 +64,7 @@
 
             // Assert
             Assert.IsInstanceOf<ObjectProperties<MacroStabilityInwardsStochasticSoilProfile>>(properties);
+            TestHelper.AssertTypeConverter<MacroStabilityInwardsStochasticSoilProfileProperties, ExpandableObjectConverter>();
             TestHelper.AssertTypeConverter<MacroStabilityInwardsStochasticSoilProfileProperties,
                 ExpandableArrayConverter>(nameof(MacroStabilityInwardsStochasticSoilProfileProperties.Layers1D));
             TestHelper.AssertTypeConverter<MacroStabilityInwardsStochasticSoilProfileProperties,
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsInputViewChartDataAssert.cs
===================================================================
diff -u -r7585d2fd78627d94d55ffa16423af90a91e4efd4 -r03bb865f66b346c37c91f2cd8a442abbb2952cba
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsInputViewChartDataAssert.cs	(.../MacroStabilityInwardsInputViewChartDataAssert.cs)	(revision 7585d2fd78627d94d55ffa16423af90a91e4efd4)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsInputViewChartDataAssert.cs	(.../MacroStabilityInwardsInputViewChartDataAssert.cs)	(revision 03bb865f66b346c37c91f2cd8a442abbb2952cba)
@@ -23,8 +23,6 @@
 using Core.Components.Chart.Data;
 using NUnit.Framework;
 using Ringtoets.MacroStabilityInwards.Data;
-using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
-using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Forms.TestUtil
 {
@@ -64,7 +62,8 @@
         public static void AssertChartData(MacroStabilityInwardsCalculationScenario calculationScenario, ChartDataCollection actual)
         {
             Assert.AreEqual(nrOfChartData, actual.Collection.Count());
-            MacroStabilityInwardsViewChartDataAssert.AssertSurfaceLineChartData(calculationScenario.InputParameters.SurfaceLine, actual.Collection.ElementAt(surfaceLineIndex));
+            MacroStabilityInwardsViewChartDataAssert.AssertSurfaceLineChartData(calculationScenario.InputParameters.SurfaceLine,
+                                                                                actual.Collection.ElementAt(surfaceLineIndex));
             MacroStabilityInwardsViewChartDataAssert.AssertSoilProfileChartData(calculationScenario.InputParameters.SoilProfileUnderSurfaceLine,
                                                                                 calculationScenario.InputParameters.StochasticSoilProfile.SoilProfile.Name,
                                                                                 true,
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsViewChartDataAssert.cs
===================================================================
diff -u -r9e2f9f7fe2d7daf45c943fc446cd9edc4298290d -r03bb865f66b346c37c91f2cd8a442abbb2952cba
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsViewChartDataAssert.cs	(.../MacroStabilityInwardsViewChartDataAssert.cs)	(revision 9e2f9f7fe2d7daf45c943fc446cd9edc4298290d)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsViewChartDataAssert.cs	(.../MacroStabilityInwardsViewChartDataAssert.cs)	(revision 03bb865f66b346c37c91f2cd8a442abbb2952cba)
@@ -64,14 +64,15 @@
         /// <exception cref="AssertionException">Thrown when <paramref name="actual"/> does not correspond
         /// to <paramref name="soilProfileUnderSurface"/>, <paramref name="expectedName"/> or
         /// <paramref name="mapDataShouldContainAreas"/>.</exception>
-        public static void AssertSoilProfileChartData(IMacroStabilityInwardsSoilProfileUnderSurfaceLine soilProfileUnderSurface, string expectedName, bool mapDataShouldContainAreas, ChartData actual)
+        public static void AssertSoilProfileChartData(IMacroStabilityInwardsSoilProfileUnderSurfaceLine soilProfileUnderSurface,
+                                                      string expectedName,
+                                                      bool mapDataShouldContainAreas,
+                                                      ChartData actual)
         {
             Assert.IsInstanceOf<ChartDataCollection>(actual);
             var soilProfileChartData = (ChartDataCollection) actual;
 
-            MacroStabilityInwardsSoilLayer2D[] layers = soilProfileUnderSurface?.Layers != null
-                                                            ? MacroStabilityInwardsSoilProfile2DLayersHelper.GetLayersRecursively(soilProfileUnderSurface.Layers).ToArray()
-                                                            : new MacroStabilityInwardsSoilLayer2D[0];
+            MacroStabilityInwardsSoilLayer2D[] layers = MacroStabilityInwardsSoilProfile2DLayersHelper.GetLayersRecursively(soilProfileUnderSurface?.Layers).ToArray();
             int expectedLayerCount = layers.Length;
 
             Assert.AreEqual(expectedLayerCount, soilProfileChartData.Collection.Count());