Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/HydraulicBoundaryLocationCalculationPropertiesTest.cs
===================================================================
diff -u -rb35c3714b3f46e83b4b37b9f4cd641930cefc404 -r7e856a043295f1db377b4cdc63ecb4be7d5aa341
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/HydraulicBoundaryLocationCalculationPropertiesTest.cs	(.../HydraulicBoundaryLocationCalculationPropertiesTest.cs)	(revision b35c3714b3f46e83b4b37b9f4cd641930cefc404)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/HydraulicBoundaryLocationCalculationPropertiesTest.cs	(.../HydraulicBoundaryLocationCalculationPropertiesTest.cs)	(revision 7e856a043295f1db377b4cdc63ecb4be7d5aa341)
@@ -76,9 +76,7 @@
 
             // Assert
             Assert.IsInstanceOf<ObjectProperties<HydraulicBoundaryLocationCalculation>>(properties);
-
             Assert.IsInstanceOf<ExpandableObjectConverter>(TypeDescriptor.GetConverter(properties, true));
-
             TestHelper.AssertTypeConverter<HydraulicBoundaryLocationCalculationProperties, NoProbabilityValueDoubleConverter>(
                 nameof(HydraulicBoundaryLocationCalculationProperties.TargetProbability));
             TestHelper.AssertTypeConverter<HydraulicBoundaryLocationCalculationProperties, NoValueRoundedDoubleConverter>(
@@ -87,7 +85,6 @@
                 nameof(HydraulicBoundaryLocationCalculationProperties.CalculatedProbability));
             TestHelper.AssertTypeConverter<HydraulicBoundaryLocationCalculationProperties, NoValueRoundedDoubleConverter>(
                 nameof(HydraulicBoundaryLocationCalculationProperties.CalculatedReliability));
-
             TestHelper.AssertTypeConverter<HydraulicBoundaryLocationCalculationProperties, KeyValueExpandableArrayConverter>(
                 nameof(HydraulicBoundaryLocationCalculationProperties.AlphaValues));
             TestHelper.AssertTypeConverter<HydraulicBoundaryLocationCalculationProperties, KeyValueExpandableArrayConverter>(
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelCalculationPropertiesTest.cs
===================================================================
diff -u -rb35c3714b3f46e83b4b37b9f4cd641930cefc404 -r7e856a043295f1db377b4cdc63ecb4be7d5aa341
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelCalculationPropertiesTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationPropertiesTest.cs)	(revision b35c3714b3f46e83b4b37b9f4cd641930cefc404)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelCalculationPropertiesTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationPropertiesTest.cs)	(revision 7e856a043295f1db377b4cdc63ecb4be7d5aa341)
@@ -295,7 +295,7 @@
             var properties = new GrassCoverErosionOutwardsDesignWaterLevelCalculationProperties(hydraulicBoundaryLocationCalculation);
 
             // Assert
-            Assert.AreEqual(hydraulicBoundaryLocationCalculation.Output.Result, properties.DesignWaterLevel, hydraulicBoundaryLocationCalculation.Output.Result.GetAccuracy());
+            Assert.AreEqual(hydraulicBoundaryLocationCalculation.Output.Result, properties.DesignWaterLevel);
 
             string convergenceValue = new EnumDisplayWrapper<CalculationConvergence>(convergence).DisplayName;
             Assert.AreEqual(convergenceValue, properties.Convergence);
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelCalculationsPropertiesTest.cs
===================================================================
diff -u -r4af6152d2f30f63f9ed8a4bd2349640738ca2401 -r7e856a043295f1db377b4cdc63ecb4be7d5aa341
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelCalculationsPropertiesTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsPropertiesTest.cs)	(revision 4af6152d2f30f63f9ed8a4bd2349640738ca2401)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsDesignWaterLevelCalculationsPropertiesTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsPropertiesTest.cs)	(revision 7e856a043295f1db377b4cdc63ecb4be7d5aa341)
@@ -23,7 +23,6 @@
 using Core.Common.Base;
 using Core.Common.Base.Data;
 using Core.Common.Gui.Converters;
-using Core.Common.Gui.PropertyBag;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Hydraulics;
@@ -51,23 +50,9 @@
             Assert.IsInstanceOf<HydraulicBoundaryLocationCalculationsProperties>(properties);
             Assert.AreSame(hydraulicBoundaryLocationCalculations, properties.Data);
 
-            var dynamicPropertyBag = new DynamicPropertyBag(properties);
-            const string expectedLocationsDisplayName = "Locaties";
-            const string expectedLocationsDescription = "Locaties uit de hydraulische randvoorwaardendatabase.";
-            const string expectedLocationsCategory = "Algemeen";
-            TypeConverter classTypeConverter = TypeDescriptor.GetConverter(properties, true);
-
-            PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties();
-            PropertyDescriptor locationsProperty = dynamicProperties.Find("Calculations", false);
-
-            Assert.IsInstanceOf<TypeConverter>(classTypeConverter);
-            Assert.IsNotNull(locationsProperty);
-            Assert.IsInstanceOf<ExpandableArrayConverter>(locationsProperty.Converter);
-            Assert.IsTrue(locationsProperty.IsReadOnly);
-            Assert.IsTrue(locationsProperty.IsBrowsable);
-            Assert.AreEqual(expectedLocationsDisplayName, locationsProperty.DisplayName);
-            Assert.AreEqual(expectedLocationsDescription, locationsProperty.Description);
-            Assert.AreEqual(expectedLocationsCategory, locationsProperty.Category);
+            Assert.IsInstanceOf<TypeConverter>(TypeDescriptor.GetConverter(properties, true));
+            TestHelper.AssertTypeConverter<GrassCoverErosionOutwardsDesignWaterLevelCalculationsProperties, ExpandableArrayConverter>(
+                nameof(GrassCoverErosionOutwardsDesignWaterLevelCalculationsProperties.Calculations));
         }
 
         [Test]
@@ -77,14 +62,10 @@
             var properties = new GrassCoverErosionOutwardsDesignWaterLevelCalculationsProperties(new ObservableList<HydraulicBoundaryLocationCalculation>());
 
             // Assert
-            TypeConverter classTypeConverter = TypeDescriptor.GetConverter(properties, true);
-            Assert.IsInstanceOf<TypeConverter>(classTypeConverter);
-
             PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
             Assert.AreEqual(1, dynamicProperties.Count);
 
             PropertyDescriptor locationsProperty = dynamicProperties[requiredLocationsPropertyIndex];
-            Assert.IsInstanceOf<ExpandableArrayConverter>(locationsProperty.Converter);
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(locationsProperty,
                                                                             "Algemeen",
                                                                             "Locaties",
@@ -110,8 +91,6 @@
 
             // Assert
             Assert.AreEqual(1, properties.Calculations.Length);
-            TestHelper.AssertTypeConverter<GrassCoverErosionOutwardsDesignWaterLevelCalculationsProperties, ExpandableArrayConverter>(
-                nameof(GrassCoverErosionOutwardsDesignWaterLevelCalculationsProperties.Calculations));
             GrassCoverErosionOutwardsDesignWaterLevelCalculationProperties calculationProperties = properties.Calculations[0];
             Assert.AreEqual(hydraulicBoundaryLocation.Name, calculationProperties.Name);
             Assert.AreEqual(hydraulicBoundaryLocation.Id, calculationProperties.Id);
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightCalculationPropertiesTest.cs
===================================================================
diff -u -rb35c3714b3f46e83b4b37b9f4cd641930cefc404 -r7e856a043295f1db377b4cdc63ecb4be7d5aa341
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightCalculationPropertiesTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationPropertiesTest.cs)	(revision b35c3714b3f46e83b4b37b9f4cd641930cefc404)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightCalculationPropertiesTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationPropertiesTest.cs)	(revision 7e856a043295f1db377b4cdc63ecb4be7d5aa341)
@@ -295,7 +295,7 @@
             var properties = new GrassCoverErosionOutwardsWaveHeightCalculationProperties(hydraulicBoundaryLocationCalculation);
 
             // Assert
-            Assert.AreEqual(hydraulicBoundaryLocationCalculation.Output.Result, properties.WaveHeight, hydraulicBoundaryLocationCalculation.Output.Result.GetAccuracy());
+            Assert.AreEqual(hydraulicBoundaryLocationCalculation.Output.Result, properties.WaveHeight);
 
             string convergenceValue = new EnumDisplayWrapper<CalculationConvergence>(convergence).DisplayName;
             Assert.AreEqual(convergenceValue, properties.Convergence);
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightCalculationsPropertiesTest.cs
===================================================================
diff -u -r4af6152d2f30f63f9ed8a4bd2349640738ca2401 -r7e856a043295f1db377b4cdc63ecb4be7d5aa341
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightCalculationsPropertiesTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsPropertiesTest.cs)	(revision 4af6152d2f30f63f9ed8a4bd2349640738ca2401)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveHeightCalculationsPropertiesTest.cs	(.../GrassCoverErosionOutwardsWaveHeightCalculationsPropertiesTest.cs)	(revision 7e856a043295f1db377b4cdc63ecb4be7d5aa341)
@@ -24,7 +24,6 @@
 using Core.Common.Base;
 using Core.Common.Base.Data;
 using Core.Common.Gui.Converters;
-using Core.Common.Gui.PropertyBag;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Hydraulics;
@@ -52,23 +51,9 @@
             Assert.IsInstanceOf<HydraulicBoundaryLocationCalculationsProperties>(properties);
             Assert.AreSame(hydraulicBoundaryLocationCalculations, properties.Data);
 
-            var dynamicPropertyBag = new DynamicPropertyBag(properties);
-            const string expectedLocationsDisplayName = "Locaties";
-            const string expectedLocationsDescription = "Locaties uit de hydraulische randvoorwaardendatabase.";
-            const string expectedLocationsCategory = "Algemeen";
-            TypeConverter classTypeConverter = TypeDescriptor.GetConverter(properties, true);
-
-            PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties();
-            PropertyDescriptor locationsProperty = dynamicProperties.Find("Calculations", false);
-
-            Assert.IsInstanceOf<TypeConverter>(classTypeConverter);
-            Assert.IsNotNull(locationsProperty);
-            Assert.IsInstanceOf<ExpandableArrayConverter>(locationsProperty.Converter);
-            Assert.IsTrue(locationsProperty.IsReadOnly);
-            Assert.IsTrue(locationsProperty.IsBrowsable);
-            Assert.AreEqual(expectedLocationsDisplayName, locationsProperty.DisplayName);
-            Assert.AreEqual(expectedLocationsDescription, locationsProperty.Description);
-            Assert.AreEqual(expectedLocationsCategory, locationsProperty.Category);
+            Assert.IsInstanceOf<TypeConverter>(TypeDescriptor.GetConverter(properties, true));
+            TestHelper.AssertTypeConverter<GrassCoverErosionOutwardsWaveHeightCalculationsProperties, ExpandableArrayConverter>(
+                nameof(GrassCoverErosionOutwardsWaveHeightCalculationsProperties.Calculations));
         }
 
         [Test]
@@ -78,14 +63,10 @@
             var properties = new GrassCoverErosionOutwardsWaveHeightCalculationsProperties(new ObservableList<HydraulicBoundaryLocationCalculation>());
 
             // Assert
-            TypeConverter classTypeConverter = TypeDescriptor.GetConverter(properties, true);
-            Assert.IsInstanceOf<TypeConverter>(classTypeConverter);
-
             PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
             Assert.AreEqual(1, dynamicProperties.Count);
 
             PropertyDescriptor locationsProperty = dynamicProperties[requiredLocationsPropertyIndex];
-            Assert.IsInstanceOf<ExpandableArrayConverter>(locationsProperty.Converter);
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(locationsProperty,
                                                                             "Algemeen",
                                                                             "Locaties",
@@ -111,8 +92,6 @@
 
             // Assert
             Assert.AreEqual(1, properties.Calculations.Length);
-            TestHelper.AssertTypeConverter<GrassCoverErosionOutwardsWaveHeightCalculationsProperties, ExpandableArrayConverter>(
-                nameof(GrassCoverErosionOutwardsWaveHeightCalculationsProperties.Calculations));
             GrassCoverErosionOutwardsWaveHeightCalculationProperties calculationProperties = properties.Calculations.First();
             Assert.AreEqual(hydraulicBoundaryLocation.Name, calculationProperties.Name);
             Assert.AreEqual(hydraulicBoundaryLocation.Id, calculationProperties.Id);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelCalculationPropertiesTest.cs
===================================================================
diff -u -rb35c3714b3f46e83b4b37b9f4cd641930cefc404 -r7e856a043295f1db377b4cdc63ecb4be7d5aa341
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelCalculationPropertiesTest.cs	(.../DesignWaterLevelCalculationPropertiesTest.cs)	(revision b35c3714b3f46e83b4b37b9f4cd641930cefc404)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelCalculationPropertiesTest.cs	(.../DesignWaterLevelCalculationPropertiesTest.cs)	(revision 7e856a043295f1db377b4cdc63ecb4be7d5aa341)
@@ -295,7 +295,7 @@
             var properties = new DesignWaterLevelCalculationProperties(hydraulicBoundaryLocationCalculation);
 
             // Assert
-            Assert.AreEqual(hydraulicBoundaryLocationCalculation.Output.Result, properties.DesignWaterLevel, hydraulicBoundaryLocationCalculation.Output.Result.GetAccuracy());
+            Assert.AreEqual(hydraulicBoundaryLocationCalculation.Output.Result, properties.DesignWaterLevel);
 
             string convergenceValue = new EnumDisplayWrapper<CalculationConvergence>(convergence).DisplayName;
             Assert.AreEqual(convergenceValue, properties.Convergence);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelCalculationsPropertiesTest.cs
===================================================================
diff -u -r46813455904b4f3292777b0e05458bbf3640d1a8 -r7e856a043295f1db377b4cdc63ecb4be7d5aa341
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelCalculationsPropertiesTest.cs	(.../DesignWaterLevelCalculationsPropertiesTest.cs)	(revision 46813455904b4f3292777b0e05458bbf3640d1a8)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelCalculationsPropertiesTest.cs	(.../DesignWaterLevelCalculationsPropertiesTest.cs)	(revision 7e856a043295f1db377b4cdc63ecb4be7d5aa341)
@@ -50,6 +50,10 @@
             // Assert
             Assert.IsInstanceOf<HydraulicBoundaryLocationCalculationsProperties>(properties);
             Assert.AreSame(hydraulicBoundaryLocationCalculations, properties.Data);
+
+            Assert.IsInstanceOf<TypeConverter>(TypeDescriptor.GetConverter(properties, true));
+            TestHelper.AssertTypeConverter<DesignWaterLevelCalculationsProperties, ExpandableArrayConverter>(
+                nameof(DesignWaterLevelCalculationsProperties.Calculations));
         }
 
         [Test]
@@ -59,14 +63,10 @@
             var properties = new DesignWaterLevelCalculationsProperties(new ObservableList<HydraulicBoundaryLocationCalculation>());
 
             // Assert
-            TypeConverter classTypeConverter = TypeDescriptor.GetConverter(properties, true);
-            Assert.IsInstanceOf<TypeConverter>(classTypeConverter);
-
             PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
             Assert.AreEqual(1, dynamicProperties.Count);
 
             PropertyDescriptor locationsProperty = dynamicProperties[requiredLocationsPropertyIndex];
-            Assert.IsInstanceOf<ExpandableArrayConverter>(locationsProperty.Converter);
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(locationsProperty,
                                                                             "Algemeen",
                                                                             "Locaties",
@@ -93,7 +93,6 @@
             // Assert
             CollectionAssert.AllItemsAreInstancesOfType(properties.Calculations, typeof(DesignWaterLevelCalculationProperties));
             Assert.AreEqual(1, properties.Calculations.Length);
-            TestHelper.AssertTypeConverter<DesignWaterLevelCalculationsProperties, ExpandableArrayConverter>(nameof(DesignWaterLevelCalculationsProperties.Calculations));
 
             DesignWaterLevelCalculationProperties designWaterLevelCalculationProperties = properties.Calculations.First();
             Assert.AreEqual(hydraulicBoundaryLocation.Name, designWaterLevelCalculationProperties.Name);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightCalculationPropertiesTest.cs
===================================================================
diff -u -rb35c3714b3f46e83b4b37b9f4cd641930cefc404 -r7e856a043295f1db377b4cdc63ecb4be7d5aa341
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightCalculationPropertiesTest.cs	(.../WaveHeightCalculationPropertiesTest.cs)	(revision b35c3714b3f46e83b4b37b9f4cd641930cefc404)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightCalculationPropertiesTest.cs	(.../WaveHeightCalculationPropertiesTest.cs)	(revision 7e856a043295f1db377b4cdc63ecb4be7d5aa341)
@@ -295,7 +295,7 @@
             var properties = new WaveHeightCalculationProperties(hydraulicBoundaryLocationCalculation);
 
             // Assert
-            Assert.AreEqual(hydraulicBoundaryLocationCalculation.Output.Result, properties.WaveHeight, hydraulicBoundaryLocationCalculation.Output.Result.GetAccuracy());
+            Assert.AreEqual(hydraulicBoundaryLocationCalculation.Output.Result, properties.WaveHeight);
 
             string convergenceValue = new EnumDisplayWrapper<CalculationConvergence>(convergence).DisplayName;
             Assert.AreEqual(convergenceValue, properties.Convergence);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightCalculationsPropertiesTest.cs
===================================================================
diff -u -r46813455904b4f3292777b0e05458bbf3640d1a8 -r7e856a043295f1db377b4cdc63ecb4be7d5aa341
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightCalculationsPropertiesTest.cs	(.../WaveHeightCalculationsPropertiesTest.cs)	(revision 46813455904b4f3292777b0e05458bbf3640d1a8)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightCalculationsPropertiesTest.cs	(.../WaveHeightCalculationsPropertiesTest.cs)	(revision 7e856a043295f1db377b4cdc63ecb4be7d5aa341)
@@ -50,6 +50,10 @@
             // Assert
             Assert.IsInstanceOf<HydraulicBoundaryLocationCalculationsProperties>(properties);
             Assert.AreSame(hydraulicBoundaryLocationCalculations, properties.Data);
+
+            Assert.IsInstanceOf<TypeConverter>(TypeDescriptor.GetConverter(properties, true));
+            TestHelper.AssertTypeConverter<WaveHeightCalculationsProperties, ExpandableArrayConverter>(
+                nameof(WaveHeightCalculationsProperties.Calculations));
         }
 
         [Test]
@@ -59,14 +63,10 @@
             var properties = new WaveHeightCalculationsProperties(new ObservableList<HydraulicBoundaryLocationCalculation>());
 
             // Assert
-            TypeConverter classTypeConverter = TypeDescriptor.GetConverter(properties, true);
-            Assert.IsInstanceOf<TypeConverter>(classTypeConverter);
-
             PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
             Assert.AreEqual(1, dynamicProperties.Count);
 
             PropertyDescriptor locationsProperty = dynamicProperties[requiredLocationsPropertyIndex];
-            Assert.IsInstanceOf<ExpandableArrayConverter>(locationsProperty.Converter);
             PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(locationsProperty,
                                                                             "Algemeen",
                                                                             "Locaties",
@@ -93,7 +93,6 @@
             // Assert
             CollectionAssert.AllItemsAreInstancesOfType(properties.Calculations, typeof(WaveHeightCalculationProperties));
             Assert.AreEqual(1, properties.Calculations.Length);
-            TestHelper.AssertTypeConverter<WaveHeightCalculationsProperties, ExpandableArrayConverter>(nameof(WaveHeightCalculationsProperties.Calculations));
 
             WaveHeightCalculationProperties waveHeightCalculationProperties = properties.Calculations.First();
             Assert.AreEqual(hydraulicBoundaryLocation.Name, waveHeightCalculationProperties.Name);