Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PropertyClasses/DuneLocationCalculationPropertiesTest.cs
===================================================================
diff -u -r3a373f58d7b900028886c692d07002299eb4bd9b -rc9fe0ccb76e6f14d7a4cb891349402a85c856d8b
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PropertyClasses/DuneLocationCalculationPropertiesTest.cs	(.../DuneLocationCalculationPropertiesTest.cs)	(revision 3a373f58d7b900028886c692d07002299eb4bd9b)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/PropertyClasses/DuneLocationCalculationPropertiesTest.cs	(.../DuneLocationCalculationPropertiesTest.cs)	(revision c9fe0ccb76e6f14d7a4cb891349402a85c856d8b)
@@ -140,7 +140,7 @@
                     CalculatedProbability = calculatedProbability,
                     CalculatedReliability = calculatedReliability
                 });
-            var duneLocation = new DuneLocation(id, name, new Point2D(x, y),
+            var duneLocation = new DuneLocation(name, new HydraulicBoundaryLocation(id, string.Empty, x, y),
                                                 new DuneLocation.ConstructionProperties
                                                 {
                                                     CoastalAreaId = coastalAreaId,
@@ -298,7 +298,7 @@
         [TestCase(3.1, "3.1")]
         public void Offset_Always_FormatToString(double offset, string expectedPropertyValue)
         {
-            var duneLocation = new DuneLocation(1, "test", new Point2D(0, 0),
+            var duneLocation = new DuneLocation("test", new TestHydraulicBoundaryLocation(),
                                                 new DuneLocation.ConstructionProperties
                                                 {
                                                     Offset = offset
@@ -316,12 +316,12 @@
         public void ToString_Always_ExpectedValue()
         {
             // Setup
-            var duneLocation = new DuneLocation(1, "Name", new Point2D(0.0, 1.1), new DuneLocation.ConstructionProperties());
+            var duneLocation = new DuneLocation("Name", new TestHydraulicBoundaryLocation(), new DuneLocation.ConstructionProperties());
             var duneLocationCalculation = new DuneLocationCalculation(duneLocation);
             var properties = new DuneLocationCalculationProperties(duneLocationCalculation);
 
             // Call
-            string result = properties.ToString();
+            var result = properties.ToString();
 
             // Assert
             Assert.AreEqual($"{duneLocation.Name} {duneLocation.Location}", result);
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneLocationCalculationRowTest.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rc9fe0ccb76e6f14d7a4cb891349402a85c856d8b
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneLocationCalculationRowTest.cs	(.../DuneLocationCalculationRowTest.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneLocationCalculationRowTest.cs	(.../DuneLocationCalculationRowTest.cs)	(revision c9fe0ccb76e6f14d7a4cb891349402a85c856d8b)
@@ -20,10 +20,10 @@
 // All rights reserved.
 
 using System.Globalization;
-using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Riskeer.Common.Data.Hydraulics;
+using Riskeer.Common.Data.TestUtil;
 using Riskeer.Common.Forms.TypeConverters;
 using Riskeer.Common.Forms.Views;
 using Riskeer.DuneErosion.Data;
@@ -41,7 +41,7 @@
         public void Constructor_DuneLocationCalculationWithOutput_ExpectedValues(double offSet)
         {
             // Setup
-            var duneLocation = new DuneLocation(1, "test location", new Point2D(3.3, 4.4), new DuneLocation.ConstructionProperties
+            var duneLocation = new DuneLocation("test location", new TestHydraulicBoundaryLocation(), new DuneLocation.ConstructionProperties
             {
                 CoastalAreaId = 2,
                 Offset = offSet,
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewTest.cs
===================================================================
diff -u -rfcb7ebcdbb68ad01d074b09afcce94d5786f29e4 -rc9fe0ccb76e6f14d7a4cb891349402a85c856d8b
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewTest.cs	(.../DuneLocationCalculationsViewTest.cs)	(revision fcb7ebcdbb68ad01d074b09afcce94d5786f29e4)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewTest.cs	(.../DuneLocationCalculationsViewTest.cs)	(revision c9fe0ccb76e6f14d7a4cb891349402a85c856d8b)
@@ -354,20 +354,24 @@
                 Assert.AreEqual(0, rows.Count);
 
                 // When
-                var duneLocation = new DuneLocation(10, "10", new Point2D(10.0, 10.0), new DuneLocation.ConstructionProperties
-                {
-                    CoastalAreaId = 3,
-                    Offset = 80,
-                    D50 = 0.000321
-                });
+                var duneLocation = new DuneLocation(
+                    "10", new HydraulicBoundaryLocation(10, string.Empty, 10.0, 10.0),
+                    new DuneLocation.ConstructionProperties
+                    {
+                        CoastalAreaId = 3,
+                        Offset = 80,
+                        D50 = 0.000321
+                    });
                 var duneLocationCalculation = new DuneLocationCalculation(duneLocation)
                 {
-                    Output = new DuneLocationCalculationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationCalculationOutput.ConstructionProperties
-                    {
-                        WaterLevel = 3.21,
-                        WaveHeight = 4.32,
-                        WavePeriod = 5.43
-                    })
+                    Output = new DuneLocationCalculationOutput(
+                        CalculationConvergence.CalculatedConverged,
+                        new DuneLocationCalculationOutput.ConstructionProperties
+                        {
+                            WaterLevel = 3.21,
+                            WaveHeight = 4.32,
+                            WavePeriod = 5.43
+                        })
                 };
                 calculations.Add(duneLocationCalculation);
                 calculations.NotifyObservers();
@@ -720,13 +724,13 @@
         {
             return new ObservableList<DuneLocationCalculation>
             {
-                new DuneLocationCalculation(new DuneLocation(1, "1", new Point2D(1.0, 1.0), new DuneLocation.ConstructionProperties
+                new DuneLocationCalculation(new DuneLocation("1", new HydraulicBoundaryLocation(1, string.Empty, 1.0, 1.0), new DuneLocation.ConstructionProperties
                 {
                     CoastalAreaId = 50,
                     Offset = 320,
                     D50 = 0.000837
                 })),
-                new DuneLocationCalculation(new DuneLocation(2, "2", new Point2D(2.0, 2.0), new DuneLocation.ConstructionProperties
+                new DuneLocationCalculation(new DuneLocation("2", new HydraulicBoundaryLocation(2, string.Empty, 2.0, 2.0), new DuneLocation.ConstructionProperties
                 {
                     CoastalAreaId = 60,
                     Offset = 230,