Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/DikeProfileBreakWaterProperties.cs
===================================================================
diff -u -re5a2da684773aba480a17c214424826ce427147c -r206bdc353661a4e059d3d38f92854ca4760e386d
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/DikeProfileBreakWaterProperties.cs	(.../DikeProfileBreakWaterProperties.cs)	(revision e5a2da684773aba480a17c214424826ce427147c)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/DikeProfileBreakWaterProperties.cs	(.../DikeProfileBreakWaterProperties.cs)	(revision 206bdc353661a4e059d3d38f92854ca4760e386d)
@@ -33,7 +33,6 @@
     /// <summary>
     /// ViewModel of break water of <see cref="DikeProfile"/> for properties panel.
     /// </summary>
-    [TypeConverter(typeof(ExpandableObjectConverter))]
     public class DikeProfileBreakWaterProperties : ObjectProperties<DikeProfile>
     {
         [PropertyOrder(1)]
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/DikeProfileDikeGeometryProperties.cs
===================================================================
diff -u -r94f0e9153131295bf39021c7f0e3f948c64441f3 -r206bdc353661a4e059d3d38f92854ca4760e386d
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/DikeProfileDikeGeometryProperties.cs	(.../DikeProfileDikeGeometryProperties.cs)	(revision 94f0e9153131295bf39021c7f0e3f948c64441f3)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/DikeProfileDikeGeometryProperties.cs	(.../DikeProfileDikeGeometryProperties.cs)	(revision 206bdc353661a4e059d3d38f92854ca4760e386d)
@@ -36,7 +36,6 @@
     /// <summary>
     /// ViewModel of dike geometry of <see cref="DikeProfile"/> for properties panel.
     /// </summary>
-    [TypeConverter(typeof(ExpandableObjectConverter))]
     public class DikeProfileDikeGeometryProperties : ObjectProperties<DikeProfile>
     {
         [PropertyOrder(1)]
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/DikeProfileForeshoreProperties.cs
===================================================================
diff -u -r0c728f2434dd0792f9416ae9418eeb8b56b57e50 -r206bdc353661a4e059d3d38f92854ca4760e386d
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/DikeProfileForeshoreProperties.cs	(.../DikeProfileForeshoreProperties.cs)	(revision 0c728f2434dd0792f9416ae9418eeb8b56b57e50)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/DikeProfileForeshoreProperties.cs	(.../DikeProfileForeshoreProperties.cs)	(revision 206bdc353661a4e059d3d38f92854ca4760e386d)
@@ -34,7 +34,6 @@
     /// <summary>
     /// ViewModel of foreshore of <see cref="DikeProfile"/> for properties panel.
     /// </summary>
-    [TypeConverter(typeof(ExpandableObjectConverter))]
     public class DikeProfileForeshoreProperties : ObjectProperties<DikeProfile>
     {
         [TypeConverter(typeof(ExpandableReadOnlyArrayConverter))]
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/DikeProfileProperties.cs
===================================================================
diff -u -rc6d76d895c5b2f5ae99d3cc29775831f1c7a8593 -r206bdc353661a4e059d3d38f92854ca4760e386d
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/DikeProfileProperties.cs	(.../DikeProfileProperties.cs)	(revision c6d76d895c5b2f5ae99d3cc29775831f1c7a8593)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/DikeProfileProperties.cs	(.../DikeProfileProperties.cs)	(revision 206bdc353661a4e059d3d38f92854ca4760e386d)
@@ -19,6 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System.ComponentModel;
 using Core.Common.Base.Data;
 using Core.Common.Gui.Attributes;
 using Core.Common.Gui.PropertyBag;
@@ -52,6 +53,7 @@
         }
 
         [PropertyOrder(breakWaterPropertyIndex)]
+        [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(Resources), "Categories_Schematisation")]
         [ResourcesDisplayName(typeof(Resources), "BreakWaterProperties_DisplayName")]
         [ResourcesDescription(typeof(Resources), "BreakWaterProperties_Description")]
@@ -67,6 +69,7 @@
         }
 
         [PropertyOrder(foreshorePropertyIndex)]
+        [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(Resources), "Categories_Schematisation")]
         [ResourcesDisplayName(typeof(Resources), "ForeshoreProperties_DisplayName")]
         [ResourcesDescription(typeof(Resources), "ForeshoreProperties_Description")]
@@ -82,6 +85,7 @@
         }
 
         [PropertyOrder(dikeGeometryPropertyIndex)]
+        [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(Resources), "Categories_Schematisation")]
         [ResourcesDisplayName(typeof(Resources), "DikeGeometryProperties_DisplayName")]
         [ResourcesDescription(typeof(Resources), "DikeGeometryProperties_Description")]
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextBreakWaterProperties.cs
===================================================================
diff -u -r0c728f2434dd0792f9416ae9418eeb8b56b57e50 -r206bdc353661a4e059d3d38f92854ca4760e386d
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextBreakWaterProperties.cs	(.../GrassCoverErosionInwardsInputContextBreakWaterProperties.cs)	(revision 0c728f2434dd0792f9416ae9418eeb8b56b57e50)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextBreakWaterProperties.cs	(.../GrassCoverErosionInwardsInputContextBreakWaterProperties.cs)	(revision 206bdc353661a4e059d3d38f92854ca4760e386d)
@@ -34,7 +34,6 @@
     /// <summary>
     /// ViewModel of break water of <see cref="GrassCoverErosionInwardsInputContext"/> for properties panel.
     /// </summary>
-    [TypeConverter(typeof(ExpandableObjectConverter))]
     public class GrassCoverErosionInwardsInputContextBreakWaterProperties : ObjectProperties<GrassCoverErosionInwardsInputContext>
     {
         [PropertyOrder(1)]
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextDikeGeometryProperties.cs
===================================================================
diff -u -re5cf2b83dc6e3e2626552bd0b402e7740c548565 -r206bdc353661a4e059d3d38f92854ca4760e386d
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextDikeGeometryProperties.cs	(.../GrassCoverErosionInwardsInputContextDikeGeometryProperties.cs)	(revision e5cf2b83dc6e3e2626552bd0b402e7740c548565)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextDikeGeometryProperties.cs	(.../GrassCoverErosionInwardsInputContextDikeGeometryProperties.cs)	(revision 206bdc353661a4e059d3d38f92854ca4760e386d)
@@ -36,7 +36,6 @@
     /// <summary>
     /// ViewModel of dike geometry of <see cref="GrassCoverErosionInwardsInputContext"/> for properties panel.
     /// </summary>
-    [TypeConverter(typeof(ExpandableObjectConverter))]
     public class GrassCoverErosionInwardsInputContextDikeGeometryProperties : ObjectProperties<GrassCoverErosionInwardsInputContext>
     {
         [PropertyOrder(1)]
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextForeshoreProperties.cs
===================================================================
diff -u -r0c728f2434dd0792f9416ae9418eeb8b56b57e50 -r206bdc353661a4e059d3d38f92854ca4760e386d
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextForeshoreProperties.cs	(.../GrassCoverErosionInwardsInputContextForeshoreProperties.cs)	(revision 0c728f2434dd0792f9416ae9418eeb8b56b57e50)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextForeshoreProperties.cs	(.../GrassCoverErosionInwardsInputContextForeshoreProperties.cs)	(revision 206bdc353661a4e059d3d38f92854ca4760e386d)
@@ -35,7 +35,6 @@
     /// <summary>
     /// ViewModel of foreshore of <see cref="GrassCoverErosionInwardsInputContext"/> for properties panel.
     /// </summary>
-    [TypeConverter(typeof(ExpandableObjectConverter))]
     public class GrassCoverErosionInwardsInputContextForeshoreProperties : ObjectProperties<GrassCoverErosionInwardsInputContext>
     {
         private const int useForeshorePropertyIndex = 1;
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextProperties.cs
===================================================================
diff -u -re5cf2b83dc6e3e2626552bd0b402e7740c548565 -r206bdc353661a4e059d3d38f92854ca4760e386d
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextProperties.cs	(.../GrassCoverErosionInwardsInputContextProperties.cs)	(revision e5cf2b83dc6e3e2626552bd0b402e7740c548565)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextProperties.cs	(.../GrassCoverErosionInwardsInputContextProperties.cs)	(revision 206bdc353661a4e059d3d38f92854ca4760e386d)
@@ -65,6 +65,7 @@
         }
 
         [PropertyOrder(breakWaterPropertyIndex)]
+        [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(Resources), "Categories_Schematisation")]
         [ResourcesDisplayName(typeof(Resources), "BreakWaterProperties_DisplayName")]
         [ResourcesDescription(typeof(Resources), "BreakWaterProperties_Description")]
@@ -80,6 +81,7 @@
         }
 
         [PropertyOrder(foreshorePropertyIndex)]
+        [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(Resources), "Categories_Schematisation")]
         [ResourcesDisplayName(typeof(Resources), "ForeshoreProperties_DisplayName")]
         [ResourcesDescription(typeof(Resources), "ForeshoreProperties_Description")]
@@ -95,6 +97,7 @@
         }
 
         [PropertyOrder(dikeGeometryPropertyIndex)]
+        [TypeConverter(typeof(ExpandableObjectConverter))]
         [ResourcesCategory(typeof(Resources), "Categories_Schematisation")]
         [ResourcesDisplayName(typeof(Resources), "DikeGeometryProperties_DisplayName")]
         [ResourcesDescription(typeof(Resources), "DikeGeometryProperties_Description")]
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs
===================================================================
diff -u -r135f8519cbb58efd19817d33acaa26241f6cfee1 -r206bdc353661a4e059d3d38f92854ca4760e386d
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs	(.../GrassCoverErosionInwardsGuiPlugin.cs)	(revision 135f8519cbb58efd19817d33acaa26241f6cfee1)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs	(.../GrassCoverErosionInwardsGuiPlugin.cs)	(revision 206bdc353661a4e059d3d38f92854ca4760e386d)
@@ -61,6 +61,7 @@
         public override IEnumerable<PropertyInfo> GetPropertyInfos()
         {
             yield return new PropertyInfo<GrassCoverErosionInwardsFailureMechanismContext, GrassCoverErosionInwardsFailureMechanismContextProperties>();
+            yield return new PropertyInfo<DikeProfile, DikeProfileProperties>();
             yield return new PropertyInfo<GrassCoverErosionInwardsInputContext, GrassCoverErosionInwardsInputContextProperties>();
         }
 
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeProfileBreakWaterPropertiesTest.cs
===================================================================
diff -u -re5a2da684773aba480a17c214424826ce427147c -r206bdc353661a4e059d3d38f92854ca4760e386d
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeProfileBreakWaterPropertiesTest.cs	(.../DikeProfileBreakWaterPropertiesTest.cs)	(revision e5a2da684773aba480a17c214424826ce427147c)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeProfileBreakWaterPropertiesTest.cs	(.../DikeProfileBreakWaterPropertiesTest.cs)	(revision 206bdc353661a4e059d3d38f92854ca4760e386d)
@@ -94,9 +94,6 @@
             };
 
             // Assert
-            TypeConverter classTypeConverter = TypeDescriptor.GetConverter(properties, true);
-            Assert.IsInstanceOf<ExpandableObjectConverter>(classTypeConverter);
-
             var dynamicPropertyBag = new DynamicPropertyBag(properties);
             PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties();
             Assert.AreEqual(4, dynamicProperties.Count);
@@ -135,9 +132,6 @@
             };
 
             // Assert
-            TypeConverter classTypeConverter = TypeDescriptor.GetConverter(properties, true);
-            Assert.IsInstanceOf<ExpandableObjectConverter>(classTypeConverter);
-
             var dynamicPropertyBag = new DynamicPropertyBag(properties);
             PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties();
             Assert.AreEqual(4, dynamicProperties.Count);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeProfileDikeGeometryPropertiesTest.cs
===================================================================
diff -u -r94f0e9153131295bf39021c7f0e3f948c64441f3 -r206bdc353661a4e059d3d38f92854ca4760e386d
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeProfileDikeGeometryPropertiesTest.cs	(.../DikeProfileDikeGeometryPropertiesTest.cs)	(revision 94f0e9153131295bf39021c7f0e3f948c64441f3)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeProfileDikeGeometryPropertiesTest.cs	(.../DikeProfileDikeGeometryPropertiesTest.cs)	(revision 206bdc353661a4e059d3d38f92854ca4760e386d)
@@ -99,9 +99,6 @@
             };
 
             // Assert
-            TypeConverter classTypeConverter = TypeDescriptor.GetConverter(properties, true);
-            Assert.IsInstanceOf<ExpandableObjectConverter>(classTypeConverter);
-
             var dynamicPropertyBag = new DynamicPropertyBag(properties);
             PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties();
             Assert.AreEqual(3, dynamicProperties.Count);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeProfileForeshorePropertiesTest.cs
===================================================================
diff -u -r13d8e1bc88bd8f552542ccda7e07c3d0c162c74d -r206bdc353661a4e059d3d38f92854ca4760e386d
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeProfileForeshorePropertiesTest.cs	(.../DikeProfileForeshorePropertiesTest.cs)	(revision 13d8e1bc88bd8f552542ccda7e07c3d0c162c74d)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeProfileForeshorePropertiesTest.cs	(.../DikeProfileForeshorePropertiesTest.cs)	(revision 206bdc353661a4e059d3d38f92854ca4760e386d)
@@ -90,9 +90,6 @@
             };
 
             // Assert
-            TypeConverter classTypeConverter = TypeDescriptor.GetConverter(properties, true);
-            Assert.IsInstanceOf<ExpandableObjectConverter>(classTypeConverter);
-
             var dynamicPropertyBag = new DynamicPropertyBag(properties);
             PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties();
             Assert.AreEqual(2, dynamicProperties.Count);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeProfilePropertiesTest.cs
===================================================================
diff -u -rc6d76d895c5b2f5ae99d3cc29775831f1c7a8593 -r206bdc353661a4e059d3d38f92854ca4760e386d
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeProfilePropertiesTest.cs	(.../DikeProfilePropertiesTest.cs)	(revision c6d76d895c5b2f5ae99d3cc29775831f1c7a8593)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeProfilePropertiesTest.cs	(.../DikeProfilePropertiesTest.cs)	(revision 206bdc353661a4e059d3d38f92854ca4760e386d)
@@ -90,20 +90,23 @@
 
             PropertyDescriptor breakWaterProperty = dynamicProperties[breakWaterPropertyIndex];
             Assert.IsNotNull(breakWaterProperty);
+            Assert.IsTrue(breakWaterProperty.Converter is ExpandableObjectConverter);
             Assert.IsTrue(breakWaterProperty.IsReadOnly);
             Assert.AreEqual("Schematisatie", breakWaterProperty.Category);
             Assert.AreEqual("Dam", breakWaterProperty.DisplayName);
             Assert.AreEqual("Eigenschappen van de dam.", breakWaterProperty.Description);
 
             PropertyDescriptor foreshoreProperty = dynamicProperties[foreshorePropertyIndex];
             Assert.IsNotNull(foreshoreProperty);
+            Assert.IsTrue(foreshoreProperty.Converter is ExpandableObjectConverter);
             Assert.IsTrue(foreshoreProperty.IsReadOnly);
             Assert.AreEqual("Schematisatie", foreshoreProperty.Category);
             Assert.AreEqual("Voorlandgeometrie", foreshoreProperty.DisplayName);
             Assert.AreEqual("Eigenschappen van de voorlandgeometrie.", foreshoreProperty.Description);
 
             PropertyDescriptor dikeGeometryProperty = dynamicProperties[dikeGeometryPropertyIndex];
             Assert.IsNotNull(dikeGeometryProperty);
+            Assert.IsTrue(dikeGeometryProperty.Converter is ExpandableObjectConverter);
             Assert.IsTrue(dikeGeometryProperty.IsReadOnly);
             Assert.AreEqual("Schematisatie", dikeGeometryProperty.Category);
             Assert.AreEqual("Dijkgeometrie", dikeGeometryProperty.DisplayName);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextBreakWaterPropertiesTest.cs
===================================================================
diff -u -re5a2da684773aba480a17c214424826ce427147c -r206bdc353661a4e059d3d38f92854ca4760e386d
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextBreakWaterPropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextBreakWaterPropertiesTest.cs)	(revision e5a2da684773aba480a17c214424826ce427147c)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextBreakWaterPropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextBreakWaterPropertiesTest.cs)	(revision 206bdc353661a4e059d3d38f92854ca4760e386d)
@@ -128,9 +128,6 @@
             };
 
             // Assert
-            TypeConverter classTypeConverter = TypeDescriptor.GetConverter(properties, true);
-            Assert.IsInstanceOf<ExpandableObjectConverter>(classTypeConverter);
-
             var dynamicPropertyBag = new DynamicPropertyBag(properties);
             PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties();
             Assert.AreEqual(4, dynamicProperties.Count);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextDikeGeometryPropertiesTest.cs
===================================================================
diff -u -re5cf2b83dc6e3e2626552bd0b402e7740c548565 -r206bdc353661a4e059d3d38f92854ca4760e386d
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextDikeGeometryPropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextDikeGeometryPropertiesTest.cs)	(revision e5cf2b83dc6e3e2626552bd0b402e7740c548565)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextDikeGeometryPropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextDikeGeometryPropertiesTest.cs)	(revision 206bdc353661a4e059d3d38f92854ca4760e386d)
@@ -128,9 +128,6 @@
             };
 
             // Assert
-            TypeConverter classTypeConverter = TypeDescriptor.GetConverter(properties, true);
-            Assert.IsInstanceOf<ExpandableObjectConverter>(classTypeConverter);
-
             var dynamicPropertyBag = new DynamicPropertyBag(properties);
             PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties();
             Assert.AreEqual(3, dynamicProperties.Count);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextForeshorePropertiesTest.cs
===================================================================
diff -u -r13d8e1bc88bd8f552542ccda7e07c3d0c162c74d -r206bdc353661a4e059d3d38f92854ca4760e386d
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextForeshorePropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextForeshorePropertiesTest.cs)	(revision 13d8e1bc88bd8f552542ccda7e07c3d0c162c74d)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextForeshorePropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextForeshorePropertiesTest.cs)	(revision 206bdc353661a4e059d3d38f92854ca4760e386d)
@@ -157,9 +157,6 @@
             };
 
             // Assert
-            TypeConverter classTypeConverter = TypeDescriptor.GetConverter(properties, true);
-            Assert.IsInstanceOf<ExpandableObjectConverter>(classTypeConverter);
-
             var dynamicPropertyBag = new DynamicPropertyBag(properties);
             PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties();
             Assert.AreEqual(3, dynamicProperties.Count);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs
===================================================================
diff -u -rc6d76d895c5b2f5ae99d3cc29775831f1c7a8593 -r206bdc353661a4e059d3d38f92854ca4760e386d
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextPropertiesTest.cs)	(revision c6d76d895c5b2f5ae99d3cc29775831f1c7a8593)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextPropertiesTest.cs)	(revision 206bdc353661a4e059d3d38f92854ca4760e386d)
@@ -154,20 +154,23 @@
 
             PropertyDescriptor breakWaterProperty = dynamicProperties[breakWaterPropertyIndex];
             Assert.IsNotNull(breakWaterProperty);
+            Assert.IsTrue(breakWaterProperty.Converter is ExpandableObjectConverter);
             Assert.IsTrue(breakWaterProperty.IsReadOnly);
             Assert.AreEqual("Schematisatie", breakWaterProperty.Category);
             Assert.AreEqual("Dam", breakWaterProperty.DisplayName);
             Assert.AreEqual("Eigenschappen van de dam.", breakWaterProperty.Description);
 
             PropertyDescriptor foreshoreProperty = dynamicProperties[foreshorePropertyIndex];
             Assert.IsNotNull(foreshoreProperty);
+            Assert.IsTrue(foreshoreProperty.Converter is ExpandableObjectConverter);
             Assert.IsTrue(foreshoreProperty.IsReadOnly);
             Assert.AreEqual("Schematisatie", foreshoreProperty.Category);
             Assert.AreEqual("Voorlandgeometrie", foreshoreProperty.DisplayName);
             Assert.AreEqual("Eigenschappen van de voorlandgeometrie.", foreshoreProperty.Description);
 
             PropertyDescriptor dikeGeometryProperty = dynamicProperties[dikeGeometryPropertyIndex];
             Assert.IsNotNull(dikeGeometryProperty);
+            Assert.IsTrue(dikeGeometryProperty.Converter is ExpandableObjectConverter);
             Assert.IsTrue(dikeGeometryProperty.IsReadOnly);
             Assert.AreEqual("Schematisatie", dikeGeometryProperty.Category);
             Assert.AreEqual("Dijkgeometrie", dikeGeometryProperty.DisplayName);
@@ -182,6 +185,7 @@
 
             PropertyDescriptor criticalFlowRateProperty = dynamicProperties[criticalFlowRatePropertyIndex];
             Assert.IsNotNull(criticalFlowRateProperty);
+            Assert.IsTrue(criticalFlowRateProperty.Converter is ExpandableObjectConverter);
             Assert.IsTrue(criticalFlowRateProperty.IsReadOnly);
             Assert.AreEqual("Toetseisen", criticalFlowRateProperty.Category);
             Assert.AreEqual("Kritisch overslagdebiet [m³/s/m]", criticalFlowRateProperty.DisplayName);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsGuiPluginTest.cs
===================================================================
diff -u -r135f8519cbb58efd19817d33acaa26241f6cfee1 -r206bdc353661a4e059d3d38f92854ca4760e386d
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsGuiPluginTest.cs	(.../GrassCoverErosionInwardsGuiPluginTest.cs)	(revision 135f8519cbb58efd19817d33acaa26241f6cfee1)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsGuiPluginTest.cs	(.../GrassCoverErosionInwardsGuiPluginTest.cs)	(revision 206bdc353661a4e059d3d38f92854ca4760e386d)
@@ -63,14 +63,20 @@
                 PropertyInfo[] propertyInfos = guiPlugin.GetPropertyInfos().ToArray();
 
                 // assert
-                Assert.AreEqual(2, propertyInfos.Length);
+                Assert.AreEqual(3, propertyInfos.Length);
 
                 var failureMechanismContextProperties = propertyInfos.Single(pi => pi.DataType == typeof(GrassCoverErosionInwardsFailureMechanismContext));
                 Assert.AreEqual(typeof(GrassCoverErosionInwardsFailureMechanismContextProperties), failureMechanismContextProperties.PropertyObjectType);
                 Assert.IsNull(failureMechanismContextProperties.AdditionalDataCheck);
                 Assert.IsNull(failureMechanismContextProperties.GetObjectPropertiesData);
                 Assert.IsNull(failureMechanismContextProperties.AfterCreate);
 
+                var dikeProfileProperties = propertyInfos.Single(pi => pi.DataType == typeof(DikeProfile));
+                Assert.AreEqual(typeof(DikeProfileProperties), dikeProfileProperties.PropertyObjectType);
+                Assert.IsNull(dikeProfileProperties.AdditionalDataCheck);
+                Assert.IsNull(dikeProfileProperties.GetObjectPropertiesData);
+                Assert.IsNull(dikeProfileProperties.AfterCreate);
+
                 var inputContextProperties = propertyInfos.Single(pi => pi.DataType == typeof(GrassCoverErosionInwardsInputContext));
                 Assert.AreEqual(typeof(GrassCoverErosionInwardsInputContextProperties), inputContextProperties.PropertyObjectType);
                 Assert.IsNull(inputContextProperties.AdditionalDataCheck);