Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Factories/AggregatedDuneLocationFactoryTest.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r1c207aa5e5e0b61746ecae385b29235d553f00fc
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Factories/AggregatedDuneLocationFactoryTest.cs	(.../AggregatedDuneLocationFactoryTest.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Factories/AggregatedDuneLocationFactoryTest.cs	(.../AggregatedDuneLocationFactoryTest.cs)	(revision 1c207aa5e5e0b61746ecae385b29235d553f00fc)
@@ -23,8 +23,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Base.Data;
-using Core.Common.Base.Geometry;
 using NUnit.Framework;
+using Riskeer.Common.Data.Hydraulics;
 using Riskeer.DuneErosion.Data;
 using Riskeer.DuneErosion.Data.TestUtil;
 using Riskeer.DuneErosion.Forms.Factories;
@@ -64,8 +64,8 @@
             var random = new Random(21);
             var duneLocations = new[]
             {
-                new DuneLocation(1, "location1", new Point2D(1, 1), new DuneLocation.ConstructionProperties()),
-                new DuneLocation(2, "location2", new Point2D(2, 2), new DuneLocation.ConstructionProperties())
+                new DuneLocation("location1", new HydraulicBoundaryLocation(1, string.Empty, 1, 1), new DuneLocation.ConstructionProperties()),
+                new DuneLocation("location2", new HydraulicBoundaryLocation(2, string.Empty, 2, 2), new DuneLocation.ConstructionProperties())
             };
 
             var targetProbabilities = new[]
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Factories/DuneErosionMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -r1c207aa5e5e0b61746ecae385b29235d553f00fc
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Factories/DuneErosionMapDataFeaturesFactoryTest.cs	(.../DuneErosionMapDataFeaturesFactoryTest.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Factories/DuneErosionMapDataFeaturesFactoryTest.cs	(.../DuneErosionMapDataFeaturesFactoryTest.cs)	(revision 1c207aa5e5e0b61746ecae385b29235d553f00fc)
@@ -22,9 +22,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Core.Common.Base.Geometry;
 using Core.Components.Gis.Features;
 using NUnit.Framework;
+using Riskeer.Common.Data.Hydraulics;
 using Riskeer.DuneErosion.Data;
 using Riskeer.DuneErosion.Data.TestUtil;
 using Riskeer.DuneErosion.Forms.Factories;
@@ -98,7 +98,8 @@
             var random = new Random(seed);
 
             int id = random.Next();
-            return new DuneLocation(id, $"Location_{id}", new Point2D(random.NextDouble(), random.NextDouble()), new DuneLocation.ConstructionProperties
+            return new DuneLocation($"Location_{id}", new HydraulicBoundaryLocation(id, string.Empty, random.NextDouble(), random.NextDouble()),
+                                    new DuneLocation.ConstructionProperties
             {
                 CoastalAreaId = random.Next(),
                 D50 = random.NextDouble(),