Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r409352706e7ed14c76bb43304d262fa22d148160 -r156b46b92a4beaf22dc59e628db19be5536468fc
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs)	(revision 409352706e7ed14c76bb43304d262fa22d148160)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs)	(revision 156b46b92a4beaf22dc59e628db19be5536468fc)
@@ -205,18 +205,24 @@
         #region Overtopping calculations
 
         [Test]
-        public void Run_ValidOvertoppingCalculation_InputPropertiesCorrectlySendToService()
+        [TestCase(BreakWaterType.Caisson)]
+        [TestCase(BreakWaterType.Wall)]
+        [TestCase(BreakWaterType.Dam)]
+        public void Run_ValidOvertoppingCalculation_InputPropertiesCorrectlySendToService(BreakWaterType breakWaterType)
         {
             // Setup
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
             ImportHydraulicBoundaryDatabase(assessmentSection);
 
+            DikeProfile dikeProfile = CreateDikeProfile();
+            dikeProfile.BreakWater.Type = breakWaterType;
+
             var calculation = new GrassCoverErosionInwardsCalculation
             {
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001),
-                    DikeProfile = CreateDikeProfile()
+                    DikeProfile = dikeProfile
                 }
             };
 
@@ -245,7 +251,7 @@
                                                                     calculation.InputParameters.Orientation,
                                                                     calculation.InputParameters.DikeGeometry.Select(roughnessPoint => new HydraRingRoughnessProfilePoint(roughnessPoint.Point.X, roughnessPoint.Point.Y, roughnessPoint.Roughness)),
                                                                     input.ForeshoreGeometry.Select(c => new HydraRingForelandPoint(c.X, c.Y)),
-                                                                    new HydraRingBreakWater((int) input.BreakWater.Type, input.BreakWater.Height),
+                                                                    new HydraRingBreakWater(BreakWaterTypeHelper.GetHydraRingBreakWaterType(breakWaterType), input.BreakWater.Height),
                                                                     calculation.InputParameters.DikeHeight,
                                                                     generalInput.CriticalOvertoppingModelFactor,
                                                                     generalInput.FbFactor.Mean,
@@ -479,9 +485,12 @@
         #region Dike height calculations
 
         [Test]
-        [TestCase(DikeHeightCalculationType.CalculateByAssessmentSectionNorm, TestName = "Run_ValidDikeHeight_InputPropertiesCorrectlySendToService(Norm)")]
-        [TestCase(DikeHeightCalculationType.CalculateByProfileSpecificRequiredProbability, TestName = "Run_ValidDikeHeight_InputPropertiesCorrectlySendToService(RequiredProbability)")]
-        public void Run_ValidDikeHeightCalculation_InputPropertiesCorrectlySendToService(DikeHeightCalculationType dikeHeightCalculationType)
+        public void Run_ValidDikeHeightCalculation_InputPropertiesCorrectlySendToService(
+            [Values(BreakWaterType.Caisson,
+                BreakWaterType.Wall,
+                BreakWaterType.Dam)] BreakWaterType breakWaterType,
+            [Values(DikeHeightCalculationType.CalculateByAssessmentSectionNorm,
+                DikeHeightCalculationType.CalculateByProfileSpecificRequiredProbability)] DikeHeightCalculationType dikeHeightCalculationType)
         {
             // Setup
             var dikeHeightCalculator = new TestHydraulicLoadsCalculator();
@@ -495,12 +504,15 @@
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
             ImportHydraulicBoundaryDatabase(assessmentSection);
 
+            DikeProfile dikeProfile = CreateDikeProfile();
+            dikeProfile.BreakWater.Type = breakWaterType;
+
             var calculation = new GrassCoverErosionInwardsCalculation
             {
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001),
-                    DikeProfile = CreateDikeProfile(),
+                    DikeProfile = dikeProfile,
                     DikeHeightCalculationType = dikeHeightCalculationType
                 }
             };
@@ -533,7 +545,7 @@
                                                                    calculation.InputParameters.Orientation,
                                                                    calculation.InputParameters.DikeGeometry.Select(roughnessPoint => new HydraRingRoughnessProfilePoint(roughnessPoint.Point.X, roughnessPoint.Point.Y, roughnessPoint.Roughness)),
                                                                    input.ForeshoreGeometry.Select(c => new HydraRingForelandPoint(c.X, c.Y)),
-                                                                   new HydraRingBreakWater((int) input.BreakWater.Type, input.BreakWater.Height),
+                                                                   new HydraRingBreakWater(BreakWaterTypeHelper.GetHydraRingBreakWaterType(breakWaterType), input.BreakWater.Height),
                                                                    generalInput.CriticalOvertoppingModelFactor,
                                                                    generalInput.FbFactor.Mean,
                                                                    generalInput.FbFactor.StandardDeviation,
@@ -902,9 +914,12 @@
         #region Overtopping rate calculations
 
         [Test]
-        [TestCase(OvertoppingRateCalculationType.CalculateByAssessmentSectionNorm, TestName = "Run_ValidOvertoppingRate_InputPropertiesCorrectlySendToService(Norm)")]
-        [TestCase(OvertoppingRateCalculationType.CalculateByProfileSpecificRequiredProbability, TestName = "Run_ValidOvertoppingRate_InputPropertiesCorrectlySendToService(RequiredProbability)")]
-        public void Run_ValidOvertoppingRateCalculation_InputPropertiesCorrectlySendToService(OvertoppingRateCalculationType overtoppingRateCalculationType)
+        public void Run_ValidOvertoppingRateCalculation_InputPropertiesCorrectlySendToService(
+            [Values(BreakWaterType.Caisson,
+                BreakWaterType.Wall,
+                BreakWaterType.Dam)] BreakWaterType breakWaterType,
+            [Values(OvertoppingRateCalculationType.CalculateByAssessmentSectionNorm,
+                OvertoppingRateCalculationType.CalculateByProfileSpecificRequiredProbability)] OvertoppingRateCalculationType overtoppingRateCalculationType)
         {
             // Setup
             var overtoppingRateCalculator = new TestHydraulicLoadsCalculator();
@@ -918,12 +933,15 @@
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
             ImportHydraulicBoundaryDatabase(assessmentSection);
 
+            DikeProfile dikeProfile = CreateDikeProfile();
+            dikeProfile.BreakWater.Type = breakWaterType;
+
             var calculation = new GrassCoverErosionInwardsCalculation
             {
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = assessmentSection.HydraulicBoundaryDatabase.Locations.First(hl => hl.Id == 1300001),
-                    DikeProfile = CreateDikeProfile(),
+                    DikeProfile = dikeProfile,
                     OvertoppingRateCalculationType = overtoppingRateCalculationType
                 }
             };
@@ -956,7 +974,7 @@
                                                                         calculation.InputParameters.Orientation,
                                                                         calculation.InputParameters.DikeGeometry.Select(roughnessPoint => new HydraRingRoughnessProfilePoint(roughnessPoint.Point.X, roughnessPoint.Point.Y, roughnessPoint.Roughness)),
                                                                         input.ForeshoreGeometry.Select(c => new HydraRingForelandPoint(c.X, c.Y)),
-                                                                        new HydraRingBreakWater((int) input.BreakWater.Type, input.BreakWater.Height),
+                                                                        new HydraRingBreakWater(BreakWaterTypeHelper.GetHydraRingBreakWaterType(breakWaterType), input.BreakWater.Height),
                                                                         calculation.InputParameters.DikeHeight,
                                                                         generalInput.CriticalOvertoppingModelFactor,
                                                                         generalInput.FbFactor.Mean,