Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil.Test/TestDuneLocationOutputTest.cs
===================================================================
diff -u -r970ecf30ae3c8548c1ccf020eca22efc2b1bc04c -r5a29e60c7a1f62e5ba864c1d71277e369e0ed18d
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil.Test/TestDuneLocationOutputTest.cs	(.../TestDuneLocationOutputTest.cs)	(revision 970ecf30ae3c8548c1ccf020eca22efc2b1bc04c)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil.Test/TestDuneLocationOutputTest.cs	(.../TestDuneLocationOutputTest.cs)	(revision 5a29e60c7a1f62e5ba864c1d71277e369e0ed18d)
@@ -19,10 +19,8 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Hydraulics;
-using Ringtoets.Common.Data.TestUtil;
 
 namespace Ringtoets.DuneErosion.Data.TestUtil.Test
 {
@@ -46,29 +44,5 @@
             Assert.AreEqual(0, output.CalculatedProbability);
             Assert.AreEqual(CalculationConvergence.CalculatedConverged, output.CalculationConvergence);
         }
-
-        [Test]
-        public void CreateTestDuneLocationOutputForExport_WithParameters_ReturnsWithCorrectValues()
-        {
-            // Setup
-            var random = new Random(21);
-            var waterLevel = random.NextDouble();
-            var wavePeriod = random.NextDouble();
-            var waveHeight = random.NextDouble();
-
-            // Call
-            TestDuneLocationOutput output = TestDuneLocationOutput.CreateDuneLocationOutputForExport(waterLevel, wavePeriod, waveHeight);
-
-            // Assert
-            Assert.AreEqual(waterLevel, output.WaterLevel, output.WaterLevel.GetAccuracy());
-            Assert.AreEqual(wavePeriod, output.WavePeriod, output.WavePeriod.GetAccuracy());
-            Assert.AreEqual(waveHeight, output.WaveHeight, output.WaveHeight.GetAccuracy());
-
-            Assert.AreEqual(0, output.TargetReliability.Value);
-            Assert.AreEqual(0, output.TargetProbability);
-            Assert.AreEqual(0, output.CalculatedReliability.Value);
-            Assert.AreEqual(0, output.CalculatedProbability);
-            Assert.AreEqual(CalculationConvergence.CalculatedConverged, output.CalculationConvergence);
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil.Test/TestDuneLocationTest.cs
===================================================================
diff -u -rac90331e9c1ff9217f04027127082f75a10e8c0a -r5a29e60c7a1f62e5ba864c1d71277e369e0ed18d
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil.Test/TestDuneLocationTest.cs	(.../TestDuneLocationTest.cs)	(revision ac90331e9c1ff9217f04027127082f75a10e8c0a)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil.Test/TestDuneLocationTest.cs	(.../TestDuneLocationTest.cs)	(revision 5a29e60c7a1f62e5ba864c1d71277e369e0ed18d)
@@ -19,9 +19,7 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using NUnit.Framework;
-using Ringtoets.Common.Data.TestUtil;
 
 namespace Ringtoets.DuneErosion.Data.TestUtil.Test
 {
@@ -45,30 +43,5 @@
 
             Assert.IsNull(testLocation.Output);
         }
-
-        [Test]
-        public void CreateTestDuneLocationForExport_WithParameters_ReturnsWithExpectedValues()
-        {
-            // Setup 
-            var random = new Random(21);
-            int coastalAreaId = random.Next();
-            double offset = random.NextDouble();
-            double d50 = random.NextDouble();
-
-            // Call 
-            TestDuneLocation location = TestDuneLocation.CreateDuneLocationForExport(coastalAreaId, offset, d50);
-
-            // Assert
-            Assert.AreEqual(coastalAreaId, location.CoastalAreaId);
-            Assert.AreEqual(offset, location.Offset, location.Offset.GetAccuracy());
-            Assert.AreEqual(d50, location.D50, location.D50.GetAccuracy());
-
-            Assert.AreEqual(string.Empty, location.Name);
-            Assert.AreEqual(0, location.Location.X);
-            Assert.AreEqual(0, location.Location.Y);
-            Assert.AreEqual(0, location.Orientation.Value);
-
-            Assert.IsNull(location.Output);
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil/TestDuneLocation.cs
===================================================================
diff -u -rac90331e9c1ff9217f04027127082f75a10e8c0a -r5a29e60c7a1f62e5ba864c1d71277e369e0ed18d
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil/TestDuneLocation.cs	(.../TestDuneLocation.cs)	(revision ac90331e9c1ff9217f04027127082f75a10e8c0a)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil/TestDuneLocation.cs	(.../TestDuneLocation.cs)	(revision 5a29e60c7a1f62e5ba864c1d71277e369e0ed18d)
@@ -32,29 +32,7 @@
         /// <summary>
         /// Creates a new instance of <see cref="TestDuneLocation"/>.
         /// </summary>
-        public TestDuneLocation(): this(0, 0, 0) {}
-
-        private TestDuneLocation(int coastalAreaId, double offset, double d50)
-            : base(0, string.Empty, new Point2D(0.0, 0.0), new ConstructionProperties
-            {
-                CoastalAreaId = coastalAreaId,
-                Offset = offset,
-                D50 = d50,
-                Orientation = 0
-            }) {}
-
-        /// <summary>
-        /// Creates a <see cref="TestDuneLocation"/> with desired values 
-        /// that are relevant when exporting a <see cref="DuneLocation"/>.
-        /// </summary>
-        /// <param name="coastalAreaId">The coastal area id.</param>
-        /// <param name="offset">The offset.</param>
-        /// <param name="d50">The D50.</param>
-        /// <returns>A <see cref="TestDuneLocation"/> with values
-        /// that are relevant when exporting.</returns>
-        public static TestDuneLocation CreateDuneLocationForExport(int coastalAreaId, double offset, double d50)
-        {
-            return new TestDuneLocation(coastalAreaId, offset, d50);
-        }
+        public TestDuneLocation() : base(0, string.Empty, new Point2D(0.0, 0.0),
+                                         new ConstructionProperties()) {}
     }
 }
\ No newline at end of file
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil/TestDuneLocationOutput.cs
===================================================================
diff -u -re3c443f1a2564c8937b3a66b82e810affc3aa46a -r5a29e60c7a1f62e5ba864c1d71277e369e0ed18d
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil/TestDuneLocationOutput.cs	(.../TestDuneLocationOutput.cs)	(revision e3c443f1a2564c8937b3a66b82e810affc3aa46a)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil/TestDuneLocationOutput.cs	(.../TestDuneLocationOutput.cs)	(revision 5a29e60c7a1f62e5ba864c1d71277e369e0ed18d)
@@ -32,32 +32,6 @@
         /// <summary>
         /// Creates a new instance of <see cref="TestDuneLocationOutput"/>.
         /// </summary>
-        public TestDuneLocationOutput() : this(0, 0, 0) {}
-
-        private TestDuneLocationOutput(double waterLevel, double wavePeriod, double waveHeight)
-            : base(CalculationConvergence.CalculatedConverged, new ConstructionProperties
-            {
-                WaterLevel = waterLevel,
-                WavePeriod = wavePeriod,
-                WaveHeight = waveHeight,
-                TargetProbability = 0,
-                TargetReliability = 0,
-                CalculatedProbability = 0,
-                CalculatedReliability = 0
-            }) {}
-
-        /// <summary>
-        /// Creates a <see cref="TestDuneLocationOutput"/> with desired values 
-        /// that are relevant when exporting a <see cref="DuneLocationOutput"/>.
-        /// </summary>
-        /// <param name="waterLevel">The water level.</param>
-        /// <param name="wavePeriod">The wave period.</param>
-        /// <param name="waveHeight">The wave height.</param>
-        /// <returns>A <see cref="TestDuneLocationOutput"/>
-        /// with values that are relevant for the export.</returns>
-        public static TestDuneLocationOutput CreateDuneLocationOutputForExport(double waterLevel, double wavePeriod, double waveHeight)
-        {
-            return new TestDuneLocationOutput(waterLevel, wavePeriod, waveHeight);
-        }
+        public TestDuneLocationOutput() : base(CalculationConvergence.CalculatedConverged, new ConstructionProperties()) {}
     }
 }
\ No newline at end of file
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationsExporterTest.cs
===================================================================
diff -u -r970ecf30ae3c8548c1ccf020eca22efc2b1bc04c -r5a29e60c7a1f62e5ba864c1d71277e369e0ed18d
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationsExporterTest.cs	(.../DuneLocationsExporterTest.cs)	(revision 970ecf30ae3c8548c1ccf020eca22efc2b1bc04c)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationsExporterTest.cs	(.../DuneLocationsExporterTest.cs)	(revision 5a29e60c7a1f62e5ba864c1d71277e369e0ed18d)
@@ -23,9 +23,11 @@
 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;
 
@@ -80,13 +82,13 @@
         public void Export_ValidData_ReturnTrueAndWritesFile()
         {
             // 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 =
             {
@@ -112,7 +114,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);
@@ -166,5 +168,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
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
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil.Test/TestWaveConditionsOutputTest.cs
===================================================================
diff -u -r2b9a4426759b9ee11ac206e1785657baaa3a8f0f -r5a29e60c7a1f62e5ba864c1d71277e369e0ed18d
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil.Test/TestWaveConditionsOutputTest.cs	(.../TestWaveConditionsOutputTest.cs)	(revision 2b9a4426759b9ee11ac206e1785657baaa3a8f0f)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil.Test/TestWaveConditionsOutputTest.cs	(.../TestWaveConditionsOutputTest.cs)	(revision 5a29e60c7a1f62e5ba864c1d71277e369e0ed18d)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
@@ -51,36 +50,5 @@
             Assert.AreEqual(0.253, output.CalculatedReliability, output.TargetReliability.GetAccuracy());
             Assert.AreEqual(CalculationConvergence.CalculatedConverged, output.CalculationConvergence);
         }
-
-        [Test]
-        public void CreateExportWaveConditionsOutput_WithParameters_ReturnsWithCorrectParameters()
-        {
-            // Setup 
-            var random = new Random(21);
-            double waterLevel = random.NextDouble();
-            double waveHeight = random.NextDouble();
-            double wavePeakPeriod = random.NextDouble();
-            double waveAngle = random.NextDouble();
-            double waveDirection = random.NextDouble();
-
-            // Call
-            TestWaveConditionsOutput output = TestWaveConditionsOutput.CreateWaveConditionsOutputForExport(
-                waterLevel, waveHeight, wavePeakPeriod, waveAngle, waveDirection);
-
-            // Assert
-            Assert.IsInstanceOf<WaveConditionsOutput>(output);
-
-            Assert.AreEqual(waterLevel, output.WaterLevel, output.WaterLevel.GetAccuracy());
-            Assert.AreEqual(waveHeight, output.WaveHeight, output.WaveHeight.GetAccuracy());
-            Assert.AreEqual(wavePeakPeriod, output.WavePeakPeriod, output.WavePeakPeriod.GetAccuracy());
-            Assert.AreEqual(waveAngle, output.WaveAngle, output.WaveAngle.GetAccuracy());
-            Assert.AreEqual(waveDirection, output.WaveDirection, output.WaveDirection.GetAccuracy());
-
-            Assert.AreEqual(0.1, output.TargetProbability);
-            Assert.AreEqual(1.282, output.TargetReliability, output.TargetReliability.GetAccuracy());
-            Assert.AreEqual(0.4, output.CalculatedProbability);
-            Assert.AreEqual(0.253, output.CalculatedReliability, output.TargetReliability.GetAccuracy());
-            Assert.AreEqual(CalculationConvergence.CalculatedConverged, output.CalculationConvergence);
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/TestWaveConditionsOutput.cs
===================================================================
diff -u -r2b9a4426759b9ee11ac206e1785657baaa3a8f0f -r5a29e60c7a1f62e5ba864c1d71277e369e0ed18d
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/TestWaveConditionsOutput.cs	(.../TestWaveConditionsOutput.cs)	(revision 2b9a4426759b9ee11ac206e1785657baaa3a8f0f)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/TestWaveConditionsOutput.cs	(.../TestWaveConditionsOutput.cs)	(revision 5a29e60c7a1f62e5ba864c1d71277e369e0ed18d)
@@ -36,24 +36,7 @@
 
         private TestWaveConditionsOutput(double waterLevel, double waveHeight, double wavePeakPeriod,
                                          double waveAngle, double waveDirection) :
-                                             base(waterLevel, waveHeight, wavePeakPeriod, waveAngle, waveDirection,
-                                                  0.1, 1.282, 0.4, 0.253, CalculationConvergence.CalculatedConverged) {}
-
-        /// <summary>
-        /// Creates a <see cref="TestWaveConditionsOutput"/> with desired values 
-        /// that are relevant for the export of a <see cref="WaveConditionsOutput"/>.
-        /// </summary>
-        /// <param name="waterLevel">The water level.</param>
-        /// <param name="waveHeight">The wave height.</param>
-        /// <param name="wavePeakPeriod">The wave peak period.</param>
-        /// <param name="waveAngle">The wave angle with respect to the dike normal.</param>
-        /// <param name="waveDirection">The wave direction with respect to North.</param>
-        /// <returns>A <see cref="TestWaveConditionsOutput"/> with desired values that are relevant 
-        /// when exporting.</returns>
-        public static TestWaveConditionsOutput CreateWaveConditionsOutputForExport(double waterLevel, double waveHeight,
-                                                                                   double wavePeakPeriod, double waveAngle, double waveDirection)
-        {
-            return new TestWaveConditionsOutput(waterLevel, waveHeight, wavePeakPeriod, waveAngle, waveDirection);
-        }
+            base(waterLevel, waveHeight, wavePeakPeriod, waveAngle, waveDirection,
+                 0.1, 1.282, 0.4, 0.253, CalculationConvergence.CalculatedConverged) {}
     }
 }
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsExporterBaseTest.cs
===================================================================
diff -u -r2b9a4426759b9ee11ac206e1785657baaa3a8f0f -r5a29e60c7a1f62e5ba864c1d71277e369e0ed18d
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsExporterBaseTest.cs	(.../WaveConditionsExporterBaseTest.cs)	(revision 2b9a4426759b9ee11ac206e1785657baaa3a8f0f)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsExporterBaseTest.cs	(.../WaveConditionsExporterBaseTest.cs)	(revision 5a29e60c7a1f62e5ba864c1d71277e369e0ed18d)
@@ -29,7 +29,6 @@
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Revetment.Data;
-using Ringtoets.Revetment.TestUtil;
 
 namespace Ringtoets.Revetment.IO.Test
 {
@@ -120,7 +119,7 @@
             // Setup
             ExportableWaveConditions[] exportableWaveConditions =
             {
-                new ExportableWaveConditions("blocksName", new WaveConditionsInput()
+                new ExportableWaveConditions("blocksName", new WaveConditionsInput
                 {
                     HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0)
                     {
@@ -131,8 +130,8 @@
                     StepSize = WaveConditionsInputStepSize.One,
                     LowerBoundaryWaterLevels = (RoundedDouble) 2.689,
                     UpperBoundaryWaterLevels = (RoundedDouble) 77.8249863247
-                }, TestWaveConditionsOutput.CreateWaveConditionsOutputForExport(1.11111, 2.22222, 3.33333, 4.4, 5.5555555), CoverType.StoneCoverBlocks),
-                new ExportableWaveConditions("columnsName", new WaveConditionsInput()
+                }, CreateWaveConditionsOutputForExport(1.11111, 2.22222, 3.33333, 4.4, 5.5555555), CoverType.StoneCoverBlocks),
+                new ExportableWaveConditions("columnsName", new WaveConditionsInput
                 {
                     HydraulicBoundaryLocation = new HydraulicBoundaryLocation(8, "aLocation", 44, 123.456)
                     {
@@ -143,7 +142,7 @@
                     StepSize = WaveConditionsInputStepSize.Half,
                     LowerBoundaryWaterLevels = (RoundedDouble) 1.98699,
                     UpperBoundaryWaterLevels = (RoundedDouble) 84.26548
-                },TestWaveConditionsOutput.CreateWaveConditionsOutputForExport(3.33333, 1.11111, 4.44444, 2.2, 6.66666), CoverType.StoneCoverColumns)
+                }, CreateWaveConditionsOutputForExport(3.33333, 1.11111, 4.44444, 2.2, 6.66666), CoverType.StoneCoverColumns)
             };
 
             string directoryPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Revetment.IO,
@@ -174,5 +173,14 @@
         {
             public TestWaveConditionsExporter(IEnumerable<ExportableWaveConditions> exportableWaveConditionsCollection, string filePath) : base(exportableWaveConditionsCollection, filePath) {}
         }
+
+        private static WaveConditionsOutput CreateWaveConditionsOutputForExport(double waterLevel, double waveHeight,
+                                                                                double wavePeakPeriod, double waveAngle,
+                                                                                double waveDirection)
+        {
+            return new WaveConditionsOutput(waterLevel, waveHeight, wavePeakPeriod, waveAngle,
+                                            waveDirection, double.NaN, double.NaN, double.NaN,
+                                            double.NaN, CalculationConvergence.CalculatedConverged);
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsWriterTest.cs
===================================================================
diff -u -r2b9a4426759b9ee11ac206e1785657baaa3a8f0f -r5a29e60c7a1f62e5ba864c1d71277e369e0ed18d
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsWriterTest.cs	(.../WaveConditionsWriterTest.cs)	(revision 2b9a4426759b9ee11ac206e1785657baaa3a8f0f)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsWriterTest.cs	(.../WaveConditionsWriterTest.cs)	(revision 5a29e60c7a1f62e5ba864c1d71277e369e0ed18d)
@@ -30,7 +30,6 @@
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Revetment.Data;
-using Ringtoets.Revetment.TestUtil;
 
 namespace Ringtoets.Revetment.IO.Test
 {
@@ -135,7 +134,7 @@
                     LowerBoundaryWaterLevels = (RoundedDouble) 2.689,
                     UpperBoundaryWaterLevels = (RoundedDouble) 77.8249863247,
                     UseBreakWater = true
-                }, TestWaveConditionsOutput.CreateWaveConditionsOutputForExport(1.11111, 2.22222, 3.33333, 4.4, 5.5555555), CoverType.StoneCoverBlocks),
+                }, CreateWaveConditionsOutputForExport(1.11111, 2.22222, 3.33333, 4.4, 5.5555555), CoverType.StoneCoverBlocks),
                 new ExportableWaveConditions("columnsName", new WaveConditionsInput
                 {
                     HydraulicBoundaryLocation = new HydraulicBoundaryLocation(8, "aLocation", 44, 123.456)
@@ -147,7 +146,7 @@
                     StepSize = WaveConditionsInputStepSize.One,
                     LowerBoundaryWaterLevels = (RoundedDouble) 1.98699,
                     UpperBoundaryWaterLevels = (RoundedDouble) 84.26548
-                }, TestWaveConditionsOutput.CreateWaveConditionsOutputForExport(3.33333, 1.11111, 4.44444, 2.2, 6.66666), CoverType.StoneCoverColumns)
+                }, CreateWaveConditionsOutputForExport(3.33333, 1.11111, 4.44444, 2.2, 6.66666), CoverType.StoneCoverColumns)
             };
 
             string directoryPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Revetment.IO,
@@ -173,5 +172,14 @@
                 Directory.Delete(directoryPath, true);
             }
         }
+
+        private static WaveConditionsOutput CreateWaveConditionsOutputForExport(double waterLevel, double waveHeight,
+                                                                                double wavePeakPeriod, double waveAngle,
+                                                                                double waveDirection)
+        {
+            return new WaveConditionsOutput(waterLevel, waveHeight, wavePeakPeriod, waveAngle,
+                                            waveDirection, double.NaN, double.NaN, double.NaN,
+                                            double.NaN, CalculationConvergence.CalculatedConverged);
+        }
     }
 }
\ No newline at end of file