Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationsWriterTest.cs
===================================================================
diff -u -recf982879e1178c758dcaa7c5a0ed9346b755a4c -r970ecf30ae3c8548c1ccf020eca22efc2b1bc04c
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationsWriterTest.cs	(.../DuneLocationsWriterTest.cs)	(revision ecf982879e1178c758dcaa7c5a0ed9346b755a4c)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationsWriterTest.cs	(.../DuneLocationsWriterTest.cs)	(revision 970ecf30ae3c8548c1ccf020eca22efc2b1bc04c)
@@ -23,12 +23,11 @@
 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
 {
@@ -119,46 +118,19 @@
         public void WriteDuneLocations_ValidData_ValidFile()
         {
             // Setup
+            var locationNoOutput = TestDuneLocation.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 locationCalculatedOutput = TestDuneLocation.CreateDuneLocationForExport(11, 9771.34, 1.337e-4);
+            locationCalculatedOutput.Output = TestDuneLocationOutput.CreateDuneLocationOutputForExport(5.89, 14.11, 8.53);
+
             DuneLocation[] duneLocations =
             {
-                new DuneLocation(1, string.Empty, new Point2D(0, 0), new DuneLocation.ConstructionProperties
-                                 {
-                                     CoastalAreaId = 9,
-                                     Offset = 9740,
-                                     Orientation = 0,
-                                     D50 = 1.9583e-4
-                                 })
-                {
-                    Output = new DuneLocationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationOutput.ConstructionProperties
-                                                    {
-                                                        WaterLevel = 5.89,
-                                                        WaveHeight = 8.54,
-                                                        WavePeriod = 14.11,
-                                                        TargetProbability = 0,
-                                                        TargetReliability = 0,
-                                                        CalculatedProbability = 0,
-                                                        CalculatedReliability = 0
-                                                    })
-                },
-                new DuneLocation(2, string.Empty, new Point2D(0, 0), new DuneLocation.ConstructionProperties
-                                 {
-                                     CoastalAreaId = 9,
-                                     Offset = 9770.1,
-                                     Orientation = 0,
-                                     D50 = 1.9583e-4
-                                 })
-                {
-                    Output = new DuneLocationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationOutput.ConstructionProperties
-                                                    {
-                                                        WaterLevel = 5.89,
-                                                        WaveHeight = 8.53,
-                                                        WavePeriod = 14.09,
-                                                        TargetProbability = 0,
-                                                        TargetReliability = 0,
-                                                        CalculatedProbability = 0,
-                                                        CalculatedReliability = 0
-                                                    })
-                }
+                locationNoOutput,
+                locationUncalculatedOutput,
+                locationCalculatedOutput
             };
 
             string directoryPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.DuneErosion.IO,
@@ -175,8 +147,9 @@
                 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\t5.89\t8.54\t14.11\t*\t0.000196\r\n" +
-                                "9\t9770.1\t5.89\t8.53\t14.09\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);
             }
             finally