Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs
===================================================================
diff -u -r8737389949c6578649c7788bd3a0550699276eac -r3f08de6c9ea2fce2f5fc15302fda17c119b3798c
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs	(.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs)	(revision 8737389949c6578649c7788bd3a0550699276eac)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs	(.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs)	(revision 3f08de6c9ea2fce2f5fc15302fda17c119b3798c)
@@ -29,6 +29,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.Hydraulics;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.GuiServices;
 using Ringtoets.Common.Service.MessageProviders;
 using Ringtoets.Common.Service.TestUtil;
@@ -43,11 +44,6 @@
         private MockRepository mockRepository;
         private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
 
-        public override void Setup()
-        {
-            mockRepository = new MockRepository();
-        }
-
         [Test]
         public void Constructor_NullMainWindow_ThrowsArgumentNullException()
         {
@@ -260,7 +256,7 @@
                 Action call = () => guiService.CalculateDesignWaterLevels(validDatabasePath,
                                                                           new List<HydraulicBoundaryLocation>
                                                                           {
-                                                                              new HydraulicBoundaryLocation(1, hydraulicLocationName, 2, 3)
+                                                                              new TestHydraulicBoundaryLocation(hydraulicLocationName)
                                                                           },
                                                                           1, calculationMessageProviderMock);
 
@@ -310,7 +306,7 @@
                 bool successfulCalculation = guiService.CalculateDesignWaterLevels(validDatabasePath,
                                                                                    new List<HydraulicBoundaryLocation>
                                                                                    {
-                                                                                       new HydraulicBoundaryLocation(1, hydraulicLocationName, 2, 3)
+                                                                                       new TestHydraulicBoundaryLocation(hydraulicLocationName)
                                                                                    },
                                                                                    1, calculationMessageProviderMock);
 
@@ -508,7 +504,7 @@
                 Action call = () => guiService.CalculateWaveHeights(validDatabasePath,
                                                                     new List<HydraulicBoundaryLocation>
                                                                     {
-                                                                        new HydraulicBoundaryLocation(1, hydraulicLocationName, 2, 3)
+                                                                        new TestHydraulicBoundaryLocation(hydraulicLocationName)
                                                                     },
                                                                     1, calculationMessageProviderMock);
 
@@ -558,7 +554,7 @@
                 bool successfulCalculation = guiService.CalculateWaveHeights(validDatabasePath,
                                                                              new List<HydraulicBoundaryLocation>
                                                                              {
-                                                                                 new HydraulicBoundaryLocation(1, hydraulicLocationName, 2, 3)
+                                                                                 new TestHydraulicBoundaryLocation(hydraulicLocationName)
                                                                              },
                                                                              1, calculationMessageProviderMock);
 
@@ -567,5 +563,10 @@
             }
             mockRepository.VerifyAll();
         }
+
+        public override void Setup()
+        {
+            mockRepository = new MockRepository();
+        }
     }
 }
\ No newline at end of file