Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationsContextPropertiesTest.cs
===================================================================
diff -u -r0981b22c56801334d3f71343f1a861070a404e3e -re1d4d3fe987bfa6504703952ea0dbd8a18f5a698
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationsContextPropertiesTest.cs	(.../DesignWaterLevelLocationsContextPropertiesTest.cs)	(revision 0981b22c56801334d3f71343f1a861070a404e3e)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationsContextPropertiesTest.cs	(.../DesignWaterLevelLocationsContextPropertiesTest.cs)	(revision e1d4d3fe987bfa6504703952ea0dbd8a18f5a698)
@@ -21,9 +21,9 @@
 
 using System.ComponentModel;
 using System.Linq;
-using Core.Common.Base.Data;
 using Core.Common.Gui.Converters;
 using Core.Common.Gui.PropertyBag;
+using Core.Common.Utils.Reflection;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
@@ -49,12 +49,15 @@
         public void GetProperties_WithData_ReturnExpectedValues()
         {
             // Setup
-            HydraulicBoundaryDatabase hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
+            HydraulicBoundaryLocation location = TestHydraulicBoundaryLocation.CreateWaveHeightCalculated(1.5);
+            var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
+            {
+                Locations =
+                {
+                    location
+                }
+            };
 
-            RoundedDouble designWaterLevel = (RoundedDouble) 12.34;
-            HydraulicBoundaryLocation hydraulicBoundaryLocation = TestHydraulicBoundaryLocation.CreateDesignWaterLevelCalculated(designWaterLevel);
-            hydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation);
-
             // Call
             DesignWaterLevelLocationsContextProperties properties = new DesignWaterLevelLocationsContextProperties
             {
@@ -64,12 +67,14 @@
             // Assert
             CollectionAssert.AllItemsAreInstancesOfType(properties.Locations, typeof(DesignWaterLevelLocationContextProperties));
             Assert.AreEqual(1, properties.Locations.Length);
+            Assert.IsTrue(TypeUtils.HasTypeConverter<DesignWaterLevelLocationsContextProperties,
+                              ExpandableArrayConverter>(p => p.Locations));
 
             DesignWaterLevelLocationContextProperties designWaterLevelLocationProperties = properties.Locations.First();
-            Assert.AreEqual(hydraulicBoundaryLocation.Name, designWaterLevelLocationProperties.Name);
-            Assert.AreEqual(hydraulicBoundaryLocation.Id, designWaterLevelLocationProperties.Id);
-            Assert.AreEqual(hydraulicBoundaryLocation.Location, designWaterLevelLocationProperties.Location);
-            Assert.AreEqual(designWaterLevel, designWaterLevelLocationProperties.DesignWaterLevel, hydraulicBoundaryLocation.DesignWaterLevel.GetAccuracy());
+            Assert.AreEqual(location.Name, designWaterLevelLocationProperties.Name);
+            Assert.AreEqual(location.Id, designWaterLevelLocationProperties.Id);
+            Assert.AreEqual(location.Location, designWaterLevelLocationProperties.Location);
+            Assert.AreEqual(location.DesignWaterLevel, designWaterLevelLocationProperties.DesignWaterLevel, location.DesignWaterLevel.GetAccuracy());
         }
 
         [Test]