Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -rb9e9b0638b105dcf98416389e149808eaa435f0a -rc05f132aaf13958318f49e821944a19ce0856941
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision b9e9b0638b105dcf98416389e149808eaa435f0a)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs	(.../StorageSqLiteIntegrationTest.cs)	(revision c05f132aaf13958318f49e821944a19ce0856941)
@@ -994,8 +994,6 @@
             Assert.AreEqual(expectedLocation.Location, actualLocation.Location);
             Assert.AreEqual(expectedLocation.CoastalAreaId, actualLocation.CoastalAreaId);
             Assert.AreEqual(expectedLocation.Offset, actualLocation.Offset);
-            Assert.AreEqual(expectedLocation.Orientation, actualLocation.Orientation);
-            Assert.AreEqual(expectedLocation.D50, actualLocation.D50);
         }
 
         private static void AssertDuneLocationCalculation(DuneLocationCalculation expectedCalculation, DuneLocationCalculation actualCalculation)
@@ -1015,6 +1013,9 @@
             Assert.AreEqual(expectedOutput.WaterLevel, actualOutput.WaterLevel);
             Assert.AreEqual(expectedOutput.WaveHeight, actualOutput.WaveHeight);
             Assert.AreEqual(expectedOutput.WavePeriod, actualOutput.WavePeriod);
+            Assert.AreEqual(expectedOutput.MeanTidalAmplitude, actualOutput.MeanTidalAmplitude);
+            Assert.AreEqual(expectedOutput.WaveDirectionalSpread, actualOutput.WaveDirectionalSpread);
+            Assert.AreEqual(expectedOutput.TideSurgePhaseDifference, actualOutput.TideSurgePhaseDifference);
             Assert.AreEqual(expectedOutput.TargetProbability, actualOutput.TargetProbability);
             Assert.AreEqual(expectedOutput.TargetReliability, actualOutput.TargetReliability);
             Assert.AreEqual(expectedOutput.CalculatedProbability, actualOutput.CalculatedProbability);
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs
===================================================================
diff -u -ra4d91c5d1395152e53f463999a1e1cc79723e62e -rc05f132aaf13958318f49e821944a19ce0856941
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision a4d91c5d1395152e53f463999a1e1cc79723e62e)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision c05f132aaf13958318f49e821944a19ce0856941)
@@ -1363,10 +1363,19 @@
         private static void SetDuneLocations(DuneErosionFailureMechanism failureMechanism,
                                              IEnumerable<HydraulicBoundaryLocation> hydraulicBoundaryLocations)
         {
+            var random = new Random(21);
             var locationOne = new DuneLocation("DuneLocation", hydraulicBoundaryLocations.ElementAt(0),
-                                               new DuneLocation.ConstructionProperties());
+                                               new DuneLocation.ConstructionProperties
+                                               {
+                                                   CoastalAreaId = random.Next(),
+                                                   Offset = random.NextDouble()
+                                               });
             var locationTwo = new DuneLocation("DuneLocation", hydraulicBoundaryLocations.ElementAt(1),
-                                               new DuneLocation.ConstructionProperties());
+                                               new DuneLocation.ConstructionProperties
+                                               {
+                                                   CoastalAreaId = random.Next(),
+                                                   Offset = random.NextDouble()
+                                               });
             failureMechanism.SetDuneLocations(new[]
             {
                 locationOne,
@@ -1398,6 +1407,9 @@
                                                                        WaterLevel = 10,
                                                                        WaveHeight = 20,
                                                                        WavePeriod = 30,
+                                                                       MeanTidalAmplitude = 40,
+                                                                       WaveDirectionalSpread = 50,
+                                                                       TideSurgePhaseDifference = 60,
                                                                        TargetProbability = 0.4,
                                                                        TargetReliability = 50,
                                                                        CalculatedProbability = 0.6,