Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil.Test/TestDuneLocationOutputTest.cs
===================================================================
diff -u -rac90331e9c1ff9217f04027127082f75a10e8c0a -r970ecf30ae3c8548c1ccf020eca22efc2b1bc04c
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil.Test/TestDuneLocationOutputTest.cs	(.../TestDuneLocationOutputTest.cs)	(revision ac90331e9c1ff9217f04027127082f75a10e8c0a)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil.Test/TestDuneLocationOutputTest.cs	(.../TestDuneLocationOutputTest.cs)	(revision 970ecf30ae3c8548c1ccf020eca22efc2b1bc04c)
@@ -57,7 +57,7 @@
             var waveHeight = random.NextDouble();
 
             // Call
-            TestDuneLocationOutput output = TestDuneLocationOutput.CreateTestDuneLocationOutputForExport(waterLevel, wavePeriod, waveHeight);
+            TestDuneLocationOutput output = TestDuneLocationOutput.CreateDuneLocationOutputForExport(waterLevel, wavePeriod, waveHeight);
 
             // Assert
             Assert.AreEqual(waterLevel, output.WaterLevel, output.WaterLevel.GetAccuracy());
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil/TestDuneLocationOutput.cs
===================================================================
diff -u -rac90331e9c1ff9217f04027127082f75a10e8c0a -r970ecf30ae3c8548c1ccf020eca22efc2b1bc04c
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil/TestDuneLocationOutput.cs	(.../TestDuneLocationOutput.cs)	(revision ac90331e9c1ff9217f04027127082f75a10e8c0a)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil/TestDuneLocationOutput.cs	(.../TestDuneLocationOutput.cs)	(revision 970ecf30ae3c8548c1ccf020eca22efc2b1bc04c)
@@ -55,7 +55,7 @@
         /// <param name="waveHeight">The wave height.</param>
         /// <returns>A <see cref="TestDuneLocation"/>
         /// with values that are relevant for the export.</returns>
-        public static TestDuneLocationOutput CreateTestDuneLocationOutputForExport(double waterLevel, double wavePeriod, double waveHeight)
+        public static TestDuneLocationOutput CreateDuneLocationOutputForExport(double waterLevel, double wavePeriod, double waveHeight)
         {
             return new TestDuneLocationOutput(waterLevel, wavePeriod, waveHeight);
         }
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationsExporterTest.cs
===================================================================
diff -u -r60a6001eab5fc26fcea94dc82912cb7f8dbcbf68 -r970ecf30ae3c8548c1ccf020eca22efc2b1bc04c
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationsExporterTest.cs	(.../DuneLocationsExporterTest.cs)	(revision 60a6001eab5fc26fcea94dc82912cb7f8dbcbf68)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationsExporterTest.cs	(.../DuneLocationsExporterTest.cs)	(revision 970ecf30ae3c8548c1ccf020eca22efc2b1bc04c)
@@ -23,11 +23,9 @@
 using System.IO;
 using System.Linq;
 using System.Security.AccessControl;
-using Core.Common.Base.Geometry;
 using Core.Common.Base.IO;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.DuneErosion.Data;
 using Ringtoets.DuneErosion.Data.TestUtil;
 
@@ -82,46 +80,19 @@
         public void Export_ValidData_ReturnTrueAndWritesFile()
         {
             // 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,
@@ -141,8 +112,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
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
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Integration.Test/DuneErosionBoundaryCalculationActivityIntegrationTest.cs
===================================================================
diff -u -rc60e4a04488fbe3a60d9c2c67c8a687093100775 -r970ecf30ae3c8548c1ccf020eca22efc2b1bc04c
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Integration.Test/DuneErosionBoundaryCalculationActivityIntegrationTest.cs	(.../DuneErosionBoundaryCalculationActivityIntegrationTest.cs)	(revision c60e4a04488fbe3a60d9c2c67c8a687093100775)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Integration.Test/DuneErosionBoundaryCalculationActivityIntegrationTest.cs	(.../DuneErosionBoundaryCalculationActivityIntegrationTest.cs)	(revision 970ecf30ae3c8548c1ccf020eca22efc2b1bc04c)
@@ -192,13 +192,7 @@
                 Contribution = 10
             };
             var initialOutput = new TestDuneLocationOutput();
-            var duneLocation = new DuneLocation(1300001, "test", new Point2D(0, 0), new DuneLocation.ConstructionProperties
-                                                {
-                                                    CoastalAreaId = 3,
-                                                    Offset = 0,
-                                                    Orientation = 0,
-                                                    D50 = 0.000007
-                                                })
+            var duneLocation = new TestDuneLocation
             {
                 Output = initialOutput
             };