Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/DikeProfileBreakWaterProperties.cs
===================================================================
diff -u -r206bdc353661a4e059d3d38f92854ca4760e386d -r780026d643daa908175ea55cf553a33ae1d8f634
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/DikeProfileBreakWaterProperties.cs	(.../DikeProfileBreakWaterProperties.cs)	(revision 206bdc353661a4e059d3d38f92854ca4760e386d)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/DikeProfileBreakWaterProperties.cs	(.../DikeProfileBreakWaterProperties.cs)	(revision 780026d643daa908175ea55cf553a33ae1d8f634)
@@ -31,7 +31,7 @@
 namespace Ringtoets.GrassCoverErosionInwards.Forms.PropertyClasses
 {
     /// <summary>
-    /// ViewModel of break water of <see cref="DikeProfile"/> for properties panel.
+    /// ViewModel of <see cref="DikeProfile.BreakWater"/> for properties panel.
     /// </summary>
     public class DikeProfileBreakWaterProperties : ObjectProperties<DikeProfile>
     {
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/DikeProfileDikeGeometryProperties.cs
===================================================================
diff -u -r400897d6f2b3e914e5cfc5d0c5a5356e4615eb42 -r780026d643daa908175ea55cf553a33ae1d8f634
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/DikeProfileDikeGeometryProperties.cs	(.../DikeProfileDikeGeometryProperties.cs)	(revision 400897d6f2b3e914e5cfc5d0c5a5356e4615eb42)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/DikeProfileDikeGeometryProperties.cs	(.../DikeProfileDikeGeometryProperties.cs)	(revision 780026d643daa908175ea55cf553a33ae1d8f634)
@@ -33,7 +33,7 @@
 namespace Ringtoets.GrassCoverErosionInwards.Forms.PropertyClasses
 {
     /// <summary>
-    /// ViewModel of dike geometry of <see cref="DikeProfile"/> for properties panel.
+    /// ViewModel of <see cref="DikeProfile.DikeGeometry"/> for properties panel.
     /// </summary>
     public class DikeProfileDikeGeometryProperties : ObjectProperties<DikeProfile>
     {
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/DikeProfileForeshoreProperties.cs
===================================================================
diff -u -r30026b56425d53753f03e790e4938a2e7852369a -r780026d643daa908175ea55cf553a33ae1d8f634
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/DikeProfileForeshoreProperties.cs	(.../DikeProfileForeshoreProperties.cs)	(revision 30026b56425d53753f03e790e4938a2e7852369a)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/DikeProfileForeshoreProperties.cs	(.../DikeProfileForeshoreProperties.cs)	(revision 780026d643daa908175ea55cf553a33ae1d8f634)
@@ -31,7 +31,7 @@
 namespace Ringtoets.GrassCoverErosionInwards.Forms.PropertyClasses
 {
     /// <summary>
-    /// ViewModel of foreshore of <see cref="DikeProfile"/> for properties panel.
+    /// ViewModel of <see cref="DikeProfile.ForeshoreGeometry"/> for properties panel.
     /// </summary>
     public class DikeProfileForeshoreProperties : ObjectProperties<DikeProfile>
     {
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextBreakWaterProperties.cs
===================================================================
diff -u -r206bdc353661a4e059d3d38f92854ca4760e386d -r780026d643daa908175ea55cf553a33ae1d8f634
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextBreakWaterProperties.cs	(.../GrassCoverErosionInwardsInputContextBreakWaterProperties.cs)	(revision 206bdc353661a4e059d3d38f92854ca4760e386d)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextBreakWaterProperties.cs	(.../GrassCoverErosionInwardsInputContextBreakWaterProperties.cs)	(revision 780026d643daa908175ea55cf553a33ae1d8f634)
@@ -32,7 +32,7 @@
 namespace Ringtoets.GrassCoverErosionInwards.Forms.PropertyClasses
 {
     /// <summary>
-    /// ViewModel of break water of <see cref="GrassCoverErosionInwardsInputContext"/> for properties panel.
+    /// ViewModel of <see cref="GrassCoverErosionInwardsInput.BreakWater"/> for properties panel.
     /// </summary>
     public class GrassCoverErosionInwardsInputContextBreakWaterProperties : ObjectProperties<GrassCoverErosionInwardsInputContext>
     {
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextDikeGeometryProperties.cs
===================================================================
diff -u -r400897d6f2b3e914e5cfc5d0c5a5356e4615eb42 -r780026d643daa908175ea55cf553a33ae1d8f634
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextDikeGeometryProperties.cs	(.../GrassCoverErosionInwardsInputContextDikeGeometryProperties.cs)	(revision 400897d6f2b3e914e5cfc5d0c5a5356e4615eb42)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextDikeGeometryProperties.cs	(.../GrassCoverErosionInwardsInputContextDikeGeometryProperties.cs)	(revision 780026d643daa908175ea55cf553a33ae1d8f634)
@@ -27,13 +27,14 @@
 using Core.Common.Gui.Converters;
 using Core.Common.Gui.PropertyBag;
 using Core.Common.Utils.Attributes;
+using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionInwards.Forms.Properties;
 
 namespace Ringtoets.GrassCoverErosionInwards.Forms.PropertyClasses
 {
     /// <summary>
-    /// ViewModel of dike geometry of <see cref="GrassCoverErosionInwardsInputContext"/> for properties panel.
+    /// ViewModel of <see cref="GrassCoverErosionInwardsInput.DikeGeometry"/> for properties panel.
     /// </summary>
     public class GrassCoverErosionInwardsInputContextDikeGeometryProperties : ObjectProperties<GrassCoverErosionInwardsInputContext>
     {
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextForeshoreProperties.cs
===================================================================
diff -u -r7f9ffc9e3636023563eedd6cc95bad8c4b158324 -r780026d643daa908175ea55cf553a33ae1d8f634
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextForeshoreProperties.cs	(.../GrassCoverErosionInwardsInputContextForeshoreProperties.cs)	(revision 7f9ffc9e3636023563eedd6cc95bad8c4b158324)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextForeshoreProperties.cs	(.../GrassCoverErosionInwardsInputContextForeshoreProperties.cs)	(revision 780026d643daa908175ea55cf553a33ae1d8f634)
@@ -26,13 +26,14 @@
 using Core.Common.Gui.Converters;
 using Core.Common.Gui.PropertyBag;
 using Core.Common.Utils.Attributes;
+using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionInwards.Forms.Properties;
 
 namespace Ringtoets.GrassCoverErosionInwards.Forms.PropertyClasses
 {
     /// <summary>
-    /// ViewModel of foreshore of <see cref="GrassCoverErosionInwardsInputContext"/> for properties panel.
+    /// ViewModel of <see cref="GrassCoverErosionInwardsInput.ForeshoreGeometry"/> for properties panel.
     /// </summary>
     public class GrassCoverErosionInwardsInputContextForeshoreProperties : ObjectProperties<GrassCoverErosionInwardsInputContext>
     {
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeProfilePropertiesTest.cs
===================================================================
diff -u -r206bdc353661a4e059d3d38f92854ca4760e386d -r780026d643daa908175ea55cf553a33ae1d8f634
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeProfilePropertiesTest.cs	(.../DikeProfilePropertiesTest.cs)	(revision 206bdc353661a4e059d3d38f92854ca4760e386d)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/DikeProfilePropertiesTest.cs	(.../DikeProfilePropertiesTest.cs)	(revision 780026d643daa908175ea55cf553a33ae1d8f634)
@@ -90,23 +90,23 @@
 
             PropertyDescriptor breakWaterProperty = dynamicProperties[breakWaterPropertyIndex];
             Assert.IsNotNull(breakWaterProperty);
-            Assert.IsTrue(breakWaterProperty.Converter is ExpandableObjectConverter);
+            Assert.IsInstanceOf<ExpandableObjectConverter>(breakWaterProperty.Converter);
             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.IsInstanceOf<ExpandableObjectConverter>(foreshoreProperty.Converter);
             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.IsInstanceOf<ExpandableObjectConverter>(dikeGeometryProperty.Converter);
             Assert.IsTrue(dikeGeometryProperty.IsReadOnly);
             Assert.AreEqual("Schematisatie", dikeGeometryProperty.Category);
             Assert.AreEqual("Dijkgeometrie", dikeGeometryProperty.DisplayName);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs
===================================================================
diff -u -r7fc49c4805ff8aad4dc1724ce5b1411ee10a47e0 -r780026d643daa908175ea55cf553a33ae1d8f634
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs	(.../GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs)	(revision 7fc49c4805ff8aad4dc1724ce5b1411ee10a47e0)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs	(.../GrassCoverErosionInwardsFailureMechanismContextPropertiesTest.cs)	(revision 780026d643daa908175ea55cf553a33ae1d8f634)
@@ -156,31 +156,31 @@
 
             PropertyDescriptor frunupModelFactorProperty = dynamicProperties[frunupModelFactorPropertyIndex];
             Assert.IsNotNull(frunupModelFactorProperty);
-            Assert.IsTrue(frunupModelFactorProperty.Converter is ExpandableObjectConverter);
+            Assert.IsInstanceOf<ExpandableObjectConverter>(frunupModelFactorProperty.Converter);
             Assert.IsTrue(frunupModelFactorProperty.IsReadOnly);
             Assert.AreEqual("Modelfactoren", frunupModelFactorProperty.Category);
             Assert.AreEqual("Modelfactor Frunup [-]", frunupModelFactorProperty.DisplayName);
             Assert.AreEqual("De parameter 'Frunup' die gebruikt wordt in de berekening.", frunupModelFactorProperty.Description);
 
             PropertyDescriptor fbModelProperty = dynamicProperties[fbFactorPropertyIndex];
             Assert.IsNotNull(fbModelProperty);
-            Assert.IsTrue(fbModelProperty.Converter is ExpandableObjectConverter);
+            Assert.IsInstanceOf<ExpandableObjectConverter>(fbModelProperty.Converter);
             Assert.IsTrue(fbModelProperty.IsReadOnly);
             Assert.AreEqual("Modelfactoren", fbModelProperty.Category);
             Assert.AreEqual("Modelfactor Fb [-]", fbModelProperty.DisplayName);
             Assert.AreEqual("De parameter 'Fb' die gebruikt wordt in de berekening.", fbModelProperty.Description);
 
             PropertyDescriptor fnFactorProperty = dynamicProperties[fnFactorPropertyIndex];
             Assert.IsNotNull(fnFactorProperty);
-            Assert.IsTrue(fnFactorProperty.Converter is ExpandableObjectConverter);
+            Assert.IsInstanceOf<ExpandableObjectConverter>(fnFactorProperty.Converter);
             Assert.IsTrue(fnFactorProperty.IsReadOnly);
             Assert.AreEqual("Modelfactoren", fnFactorProperty.Category);
             Assert.AreEqual("Modelfactor Fn [-]", fnFactorProperty.DisplayName);
             Assert.AreEqual("De parameter 'Fn' die gebruikt wordt in de berekening.", fnFactorProperty.Description);
 
             PropertyDescriptor fshallowProperty = dynamicProperties[fshallowModelFactorPropertyIndex];
             Assert.IsNotNull(fshallowProperty);
-            Assert.IsTrue(fshallowProperty.Converter is ExpandableObjectConverter);
+            Assert.IsInstanceOf<ExpandableObjectConverter>(fshallowProperty.Converter);
             Assert.IsTrue(fshallowProperty.IsReadOnly);
             Assert.AreEqual("Modelfactoren", fshallowProperty.Category);
             Assert.AreEqual("Modelfactor Fondiep [-]", fshallowProperty.DisplayName);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs
===================================================================
diff -u -r206bdc353661a4e059d3d38f92854ca4760e386d -r780026d643daa908175ea55cf553a33ae1d8f634
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextPropertiesTest.cs)	(revision 206bdc353661a4e059d3d38f92854ca4760e386d)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs	(.../GrassCoverErosionInwardsInputContextPropertiesTest.cs)	(revision 780026d643daa908175ea55cf553a33ae1d8f634)
@@ -154,23 +154,23 @@
 
             PropertyDescriptor breakWaterProperty = dynamicProperties[breakWaterPropertyIndex];
             Assert.IsNotNull(breakWaterProperty);
-            Assert.IsTrue(breakWaterProperty.Converter is ExpandableObjectConverter);
+            Assert.IsInstanceOf<ExpandableObjectConverter>(breakWaterProperty.Converter);
             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.IsInstanceOf<ExpandableObjectConverter>(foreshoreProperty.Converter);
             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.IsInstanceOf<ExpandableObjectConverter>(dikeGeometryProperty.Converter);
             Assert.IsTrue(dikeGeometryProperty.IsReadOnly);
             Assert.AreEqual("Schematisatie", dikeGeometryProperty.Category);
             Assert.AreEqual("Dijkgeometrie", dikeGeometryProperty.DisplayName);
@@ -185,7 +185,7 @@
 
             PropertyDescriptor criticalFlowRateProperty = dynamicProperties[criticalFlowRatePropertyIndex];
             Assert.IsNotNull(criticalFlowRateProperty);
-            Assert.IsTrue(criticalFlowRateProperty.Converter is ExpandableObjectConverter);
+            Assert.IsInstanceOf<ExpandableObjectConverter>(criticalFlowRateProperty.Converter);
             Assert.IsTrue(criticalFlowRateProperty.IsReadOnly);
             Assert.AreEqual("Toetseisen", criticalFlowRateProperty.Category);
             Assert.AreEqual("Kritisch overslagdebiet [m³/s/m]", criticalFlowRateProperty.DisplayName);
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresFailureMechanismContextPropertiesTest.cs
===================================================================
diff -u -r7fc49c4805ff8aad4dc1724ce5b1411ee10a47e0 -r780026d643daa908175ea55cf553a33ae1d8f634
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresFailureMechanismContextPropertiesTest.cs	(.../HeightStructuresFailureMechanismContextPropertiesTest.cs)	(revision 7fc49c4805ff8aad4dc1724ce5b1411ee10a47e0)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresFailureMechanismContextPropertiesTest.cs	(.../HeightStructuresFailureMechanismContextPropertiesTest.cs)	(revision 780026d643daa908175ea55cf553a33ae1d8f634)
@@ -159,15 +159,15 @@
 
             PropertyDescriptor modelfactorOvertoppingFlowProperty = dynamicProperties[modelfactorOvertoppingFlowPropertyIndex];
             Assert.IsNotNull(modelfactorOvertoppingFlowProperty);
-            Assert.IsTrue(modelfactorOvertoppingFlowProperty.Converter is ExpandableObjectConverter);
+            Assert.IsInstanceOf<ExpandableObjectConverter>(modelfactorOvertoppingFlowProperty.Converter);
             Assert.IsTrue(modelfactorOvertoppingFlowProperty.IsReadOnly);
             Assert.AreEqual("Modelfactoren", modelfactorOvertoppingFlowProperty.Category);
             Assert.AreEqual("Modelfactor overslagdebiet [-]", modelfactorOvertoppingFlowProperty.DisplayName);
             Assert.AreEqual("Het modelfactor overslagdebiet.", modelfactorOvertoppingFlowProperty.Description);
 
             PropertyDescriptor modelFactorForStorageVolumeProperty = dynamicProperties[modelFactorForStorageVolumePropertyIndex];
             Assert.IsNotNull(modelFactorForStorageVolumeProperty);
-            Assert.IsTrue(modelFactorForStorageVolumeProperty.Converter is ExpandableObjectConverter);
+            Assert.IsInstanceOf<ExpandableObjectConverter>(modelFactorForStorageVolumeProperty.Converter);
             Assert.IsTrue(modelFactorForStorageVolumeProperty.IsReadOnly);
             Assert.AreEqual("Modelfactoren", modelFactorForStorageVolumeProperty.Category);
             Assert.AreEqual("Modelfactor kombergingsvolume [-]", modelFactorForStorageVolumeProperty.DisplayName);
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs
===================================================================
diff -u -r7fc49c4805ff8aad4dc1724ce5b1411ee10a47e0 -r780026d643daa908175ea55cf553a33ae1d8f634
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision 7fc49c4805ff8aad4dc1724ce5b1411ee10a47e0)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision 780026d643daa908175ea55cf553a33ae1d8f634)
@@ -282,37 +282,37 @@
             Assert.AreEqual("Oriëntatie van het kunstwerk.", orientationOfTheNormalOfTheStructureProperty.Description);
 
             PropertyDescriptor levelOfCrestOfStructureProperty = dynamicProperties[levelOfCrestOfStructurePropertyIndex];
-            Assert.IsTrue(levelOfCrestOfStructureProperty.Converter is ExpandableObjectConverter);
+            Assert.IsInstanceOf<ExpandableObjectConverter>(levelOfCrestOfStructureProperty.Converter);
             Assert.AreEqual("Schematisatie", levelOfCrestOfStructureProperty.Category);
             Assert.AreEqual("Kerende hoogte [m]", levelOfCrestOfStructureProperty.DisplayName);
             Assert.AreEqual("De kerende hoogte van het kunstwerk.", levelOfCrestOfStructureProperty.Description);
 
             PropertyDescriptor allowableIncreaseOfLevelForStorageProperty = dynamicProperties[allowableIncreaseOfLevelForStoragePropertyIndex];
-            Assert.IsTrue(allowableIncreaseOfLevelForStorageProperty.Converter is ExpandableObjectConverter);
+            Assert.IsInstanceOf<ExpandableObjectConverter>(allowableIncreaseOfLevelForStorageProperty.Converter);
             Assert.AreEqual("Schematisatie", allowableIncreaseOfLevelForStorageProperty.Category);
             Assert.AreEqual("Toegestane peilverhoging komberging [m]", allowableIncreaseOfLevelForStorageProperty.DisplayName);
             Assert.AreEqual("De toegestane peilverhoging op het kombergend oppervlak.", allowableIncreaseOfLevelForStorageProperty.Description);
 
             PropertyDescriptor storageStructureAreaProperty = dynamicProperties[storageStructureAreaPropertyIndex];
-            Assert.IsTrue(storageStructureAreaProperty.Converter is ExpandableObjectConverter);
+            Assert.IsInstanceOf<ExpandableObjectConverter>(storageStructureAreaProperty.Converter);
             Assert.AreEqual("Schematisatie", storageStructureAreaProperty.Category);
             Assert.AreEqual("Kombergend oppervlak [m²]", storageStructureAreaProperty.DisplayName);
             Assert.AreEqual("Het kombergend oppervlak.", storageStructureAreaProperty.Description);
 
             PropertyDescriptor flowWidthAtBottomProtectionProperty = dynamicProperties[flowWidthAtBottomProtectionPropertyIndex];
-            Assert.IsTrue(flowWidthAtBottomProtectionProperty.Converter is ExpandableObjectConverter);
+            Assert.IsInstanceOf<ExpandableObjectConverter>(flowWidthAtBottomProtectionProperty.Converter);
             Assert.AreEqual("Schematisatie", flowWidthAtBottomProtectionProperty.Category);
             Assert.AreEqual("Stroomvoerende breedte bij bodembescherming [m]", flowWidthAtBottomProtectionProperty.DisplayName);
             Assert.AreEqual("De stroomvoerende breedte bij bodembescherming.", flowWidthAtBottomProtectionProperty.Description);
 
             PropertyDescriptor widthOfFlowAperturesProperty = dynamicProperties[widthOfFlowAperturesPropertyIndex];
-            Assert.IsTrue(widthOfFlowAperturesProperty.Converter is ExpandableObjectConverter);
+            Assert.IsInstanceOf<ExpandableObjectConverter>(widthOfFlowAperturesProperty.Converter);
             Assert.AreEqual("Schematisatie", widthOfFlowAperturesProperty.Category);
             Assert.AreEqual("Breedte van de kruin van het kunstwerk [m]", widthOfFlowAperturesProperty.DisplayName);
             Assert.AreEqual("De breedte van de kruin van het kunstwerk.", widthOfFlowAperturesProperty.Description);
 
             PropertyDescriptor criticalOvertoppingDischargeProperty = dynamicProperties[criticalOvertoppingDischargePropertyIndex];
-            Assert.IsTrue(criticalOvertoppingDischargeProperty.Converter is ExpandableObjectConverter);
+            Assert.IsInstanceOf<ExpandableObjectConverter>(criticalOvertoppingDischargeProperty.Converter);
             Assert.AreEqual("Schematisatie", criticalOvertoppingDischargeProperty.Category);
             Assert.AreEqual("Kritiek overslagdebiet [m³/s/m]", criticalOvertoppingDischargeProperty.DisplayName);
             Assert.AreEqual("Het kritieke overslagdebiet per strekkende meter.", criticalOvertoppingDischargeProperty.Description);
@@ -324,7 +324,7 @@
             Assert.AreEqual("De faalkans van het kunstwerk gegeven de erosie in de bodem.", failureProbabilityOfStructureGivenErosionProperty.Description);
 
             PropertyDescriptor modelFactorOvertoppingSuperCriticalFlowProperty = dynamicProperties[modelFactorOvertoppingSuperCriticalFlowPropertyIndex];
-            Assert.IsTrue(modelFactorOvertoppingSuperCriticalFlowProperty.Converter is ExpandableObjectConverter);
+            Assert.IsInstanceOf<ExpandableObjectConverter>(modelFactorOvertoppingSuperCriticalFlowProperty.Converter);
             Assert.AreEqual("Modelfactoren", modelFactorOvertoppingSuperCriticalFlowProperty.Category);
             Assert.AreEqual("Modelfactor van overloopdebiet bij superkritische stroming [-]", modelFactorOvertoppingSuperCriticalFlowProperty.DisplayName);
             Assert.AreEqual("Het modelfactor van overloopdebiet bij superkritische stroming.", modelFactorOvertoppingSuperCriticalFlowProperty.Description);
@@ -336,7 +336,7 @@
             Assert.AreEqual("De locatie met hydraulische randvoorwaarden.", hydraulicBoundaryLocationProperty.Description);
 
             PropertyDescriptor stormDurationProperty = dynamicProperties[stormDurationPropertyIndex];
-            Assert.IsTrue(stormDurationProperty.Converter is ExpandableObjectConverter);
+            Assert.IsInstanceOf<ExpandableObjectConverter>(stormDurationProperty.Converter);
             Assert.AreEqual("Hydraulische gegevens", stormDurationProperty.Category);
             Assert.AreEqual("Stormduur [uur]", stormDurationProperty.DisplayName);
             Assert.AreEqual("De duur van de storm.", stormDurationProperty.Description);