Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationContextPropertiesTest.cs
===================================================================
diff -u -r3b31412e43e5ec5fb7f19f1f172a51c85a643455 -rb2f550432173db787e99cf93b0c1db320d129d80
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationContextPropertiesTest.cs	(.../DesignWaterLevelLocationContextPropertiesTest.cs)	(revision 3b31412e43e5ec5fb7f19f1f172a51c85a643455)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelLocationContextPropertiesTest.cs	(.../DesignWaterLevelLocationContextPropertiesTest.cs)	(revision b2f550432173db787e99cf93b0c1db320d129d80)
@@ -28,7 +28,6 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
-using Ringtoets.Common.Forms.Helpers;
 using Ringtoets.Common.Forms.TypeConverters;
 using Ringtoets.Integration.Forms.PresentationObjects;
 using Ringtoets.Integration.Forms.PropertyClasses;
@@ -63,11 +62,7 @@
         public void GetProperties_ValidData_ReturnsExpectedValues()
         {
             // Setup
-            const long id = 1234;
-            const string name = "<some name>";
-            const double x = 567.0;
-            const double y = 890.0;
-            HydraulicBoundaryLocation hydraulicBoundaryLocation = new HydraulicBoundaryLocation(id, name, x, y);
+            HydraulicBoundaryLocation hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
             {
                 Locations =
@@ -77,17 +72,15 @@
             };
 
             // Call
-            DesignWaterLevelLocationContextProperties properties =
-                new DesignWaterLevelLocationContextProperties
-                {
-                    Data = new DesignWaterLevelLocationContext(hydraulicBoundaryDatabase, hydraulicBoundaryLocation)
-                };
+            var properties = new DesignWaterLevelLocationContextProperties
+            {
+                Data = new DesignWaterLevelLocationContext(hydraulicBoundaryDatabase, hydraulicBoundaryLocation)
+            };
 
             // Assert
-            Assert.AreEqual(id, properties.Id);
-            Assert.AreEqual(name, properties.Name);
-            Point2D coordinates = new Point2D(x, y);
-            Assert.AreEqual(coordinates, properties.Location);
+            Assert.AreEqual(hydraulicBoundaryLocation.Id, properties.Id);
+            Assert.AreEqual(hydraulicBoundaryLocation.Name, properties.Name);
+            Assert.AreEqual(hydraulicBoundaryLocation.Location, properties.Location);
             Assert.IsNaN(properties.DesignWaterLevel);
             Assert.IsTrue(TypeUtils.HasTypeConverter<DesignWaterLevelLocationContextProperties,
                               NoValueRoundedDoubleConverter>(p => p.DesignWaterLevel));