Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs
===================================================================
diff -u -rcc27fe12a2d3f982685791389aa68fd6ca25fcd0 -r0300b0de9065853f59deb9264e6a70a9efc832e0
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs	(.../HeightStructuresCalculationServiceTest.cs)	(revision cc27fe12a2d3f982685791389aa68fd6ca25fcd0)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs	(.../HeightStructuresCalculationServiceTest.cs)	(revision 0300b0de9065853f59deb9264e6a70a9efc832e0)
@@ -23,6 +23,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using Application.Ringtoets.Storage.TestUtil;
 using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
 using Core.Common.TestUtil;
@@ -467,7 +468,7 @@
                 {
                     HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 2, 2),
                     Structure = new TestHeightStructure(),
-                    ForeshoreProfile = CreateForeshoreProfile(new BreakWater(BreakWaterType.Dam, breakWaterHeight)),
+                    ForeshoreProfile = new TestForeshoreProfile(new BreakWater(BreakWaterType.Dam, breakWaterHeight)),
                     UseBreakWater = true
                 }
             };
@@ -554,7 +555,7 @@
                 {
                     HydraulicBoundaryLocation = assessmentSectionStub.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001),
                     Structure = new TestHeightStructure(),
-                    ForeshoreProfile = CreateForeshoreProfile(new BreakWater(BreakWaterType.Dam, 10)),
+                    ForeshoreProfile = new TestForeshoreProfile(true),
                     UseBreakWater = true,
                     UseForeshore = true
                 }
@@ -568,7 +569,7 @@
                     calculation.InputParameters.UseBreakWater = false;
                     break;
                 case CalculationType.ForeshoreWithoutBreakWater:
-                    calculation.InputParameters.ForeshoreProfile = CreateForeshoreProfile(null);
+                    calculation.InputParameters.ForeshoreProfile = new TestForeshoreProfile();
                     calculation.InputParameters.UseBreakWater = false;
                     break;
                 case CalculationType.ForeshoreWithValidBreakWater:
@@ -624,7 +625,7 @@
                 {
                     HydraulicBoundaryLocation = assessmentSectionStub.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001),
                     Structure = new TestHeightStructure(),
-                    ForeshoreProfile = CreateForeshoreProfile(new BreakWater(BreakWaterType.Dam, height)),
+                    ForeshoreProfile = new TestForeshoreProfile(true),
                     UseBreakWater = false,
                     UseForeshore = true
                 }
@@ -845,18 +846,6 @@
             }
         }
 
-        private static ForeshoreProfile CreateForeshoreProfile(BreakWater breakWater)
-        {
-            return new ForeshoreProfile(new Point2D(0, 0),
-                                        new[]
-                                        {
-                                            new Point2D(3.3, 4.4),
-                                            new Point2D(5.5, 6.6)
-                                        },
-                                        breakWater,
-                                        new ForeshoreProfile.ConstructionProperties());
-        }
-
         #region Testcases
 
         private static IEnumerable<TestCaseData> NormalDistributionsWithInvalidMean