Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationsWriterTest.cs
===================================================================
diff -u -r970ecf30ae3c8548c1ccf020eca22efc2b1bc04c -r5a29e60c7a1f62e5ba864c1d71277e369e0ed18d
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationsWriterTest.cs	(.../DuneLocationsWriterTest.cs)	(revision 970ecf30ae3c8548c1ccf020eca22efc2b1bc04c)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationsWriterTest.cs	(.../DuneLocationsWriterTest.cs)	(revision 5a29e60c7a1f62e5ba864c1d71277e369e0ed18d)
@@ -23,11 +23,12 @@
 using System.IO;
 using System.Linq;
 using System.Security.AccessControl;
+using Core.Common.Base.Geometry;
 using Core.Common.IO.Exceptions;
 using Core.Common.TestUtil;
 using NUnit.Framework;
+using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.DuneErosion.Data;
-using Ringtoets.DuneErosion.Data.TestUtil;
 
 namespace Ringtoets.DuneErosion.IO.Test
 {
@@ -118,13 +119,13 @@
         public void WriteDuneLocations_ValidData_ValidFile()
         {
             // Setup
-            var locationNoOutput = TestDuneLocation.CreateDuneLocationForExport(9, 9740, 1.9583e-4);
+            var locationNoOutput = CreateDuneLocationForExport(9, 9740, 1.9583e-4);
 
-            var locationUncalculatedOutput = TestDuneLocation.CreateDuneLocationForExport(10, 9770.1, 1.9583e-4);
-            locationUncalculatedOutput.Output = TestDuneLocationOutput.CreateDuneLocationOutputForExport(double.NaN, double.NaN, double.NaN);
+            var locationUncalculatedOutput = CreateDuneLocationForExport(10, 9770.1, 1.9583e-4);
+            locationUncalculatedOutput.Output = CreateDuneLocationOutputForExport(double.NaN, double.NaN, double.NaN);
 
-            var locationCalculatedOutput = TestDuneLocation.CreateDuneLocationForExport(11, 9771.34, 1.337e-4);
-            locationCalculatedOutput.Output = TestDuneLocationOutput.CreateDuneLocationOutputForExport(5.89, 14.11, 8.53);
+            var locationCalculatedOutput = CreateDuneLocationForExport(11, 9771.34, 1.337e-4);
+            locationCalculatedOutput.Output = CreateDuneLocationOutputForExport(5.89, 14.11, 8.53);
 
             DuneLocation[] duneLocations =
             {
@@ -147,7 +148,7 @@
                 Assert.IsTrue(File.Exists(filePath));
                 string fileContent = File.ReadAllText(filePath);
                 Assert.AreEqual("Kv\tNr\tRp\tHs\tTp\tTm-1,0\tD50\r\n" +
-                                 "9\t9740\t*\t*\t*\t*\t0.000196\r\n" +
+                                "9\t9740\t*\t*\t*\t*\t0.000196\r\n" +
                                 "10\t9770.1\t*\t*\t*\t*\t0.000196\r\n" +
                                 "11\t9771.3\t5.89\t8.53\t14.11\t*\t0.000134\r\n",
                                 fileContent);
@@ -157,5 +158,25 @@
                 Directory.Delete(directoryPath, true);
             }
         }
+
+        private static DuneLocationOutput CreateDuneLocationOutputForExport(double waterLevel, double wavePeriod, double waveHeight)
+        {
+            return new DuneLocationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationOutput.ConstructionProperties
+            {
+                WaterLevel = waterLevel,
+                WavePeriod = wavePeriod,
+                WaveHeight = waveHeight
+            });
+        }
+
+        private static DuneLocation CreateDuneLocationForExport(int coastalAreaId, double offset, double d50)
+        {
+            return new DuneLocation(0, string.Empty, new Point2D(0.0, 0.0), new DuneLocation.ConstructionProperties
+            {
+                CoastalAreaId = coastalAreaId,
+                Offset = offset,
+                D50 = d50
+            });
+        }
     }
 }
\ No newline at end of file