Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs
===================================================================
diff -u -rd8c35e5eaf4dc63668ad6f41d921dc022f6c327e -r03b539c0665d4e84abe4e52146c26f3b19fa208c
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs	(.../ClosingStructuresCalculationServiceTest.cs)	(revision d8c35e5eaf4dc63668ad6f41d921dc022f6c327e)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs	(.../ClosingStructuresCalculationServiceTest.cs)	(revision 03b539c0665d4e84abe4e52146c26f3b19fa208c)
@@ -455,10 +455,10 @@
         }
 
         [Test]
-        [TestCase(BreakWaterType.Caisson, 1)]
-        [TestCase(BreakWaterType.Wall, 2)]
-        [TestCase(BreakWaterType.Dam, 3)]
-        public void Calculate_VariousVerticalWallCalculationsWithBreakWater_InputPropertiesCorrectlySentToCalculator(BreakWaterType breakWaterType, int expectedBreakWaterType)
+        [TestCase(BreakWaterType.Caisson)]
+        [TestCase(BreakWaterType.Wall)]
+        [TestCase(BreakWaterType.Dam)]
+        public void Calculate_VariousVerticalWallCalculationsWithBreakWater_InputPropertiesCorrectlySentToCalculator(BreakWaterType breakWaterType)
         {
             // Setup
             var failureMechanism = new ClosingStructuresFailureMechanism();
@@ -508,7 +508,7 @@
                     1300001,
                     input.StructureNormalOrientation,
                     input.ForeshoreGeometry.Select(c => new HydraRingForelandPoint(c.X, c.Y)),
-                    new HydraRingBreakWater(expectedBreakWaterType, input.BreakWater.Height),
+                    new HydraRingBreakWater(BreakWaterTypeHelper.GetHydraRingBreakWaterType(breakWaterType), input.BreakWater.Height),
                     generalInput.GravitationalAcceleration,
                     input.FactorStormDurationOpenStructure,
                     input.FailureProbabilityOpenStructure,
@@ -618,10 +618,10 @@
         }
 
         [Test]
-        [TestCase(BreakWaterType.Caisson, 1)]
-        [TestCase(BreakWaterType.Wall, 2)]
-        [TestCase(BreakWaterType.Dam, 3)]
-        public void Calculate_VariousLowSillCalculationsWithBreakWater_InputPropertiesCorrectlySentToCalculator(BreakWaterType breakWaterType, int expectedBreakWaterType)
+        [TestCase(BreakWaterType.Caisson)]
+        [TestCase(BreakWaterType.Wall)]
+        [TestCase(BreakWaterType.Dam)]
+        public void Calculate_VariousLowSillCalculationsWithBreakWater_InputPropertiesCorrectlySentToCalculator(BreakWaterType breakWaterType)
         {
             // Setup
             var failureMechanism = new ClosingStructuresFailureMechanism();
@@ -672,7 +672,7 @@
                     1300001,
                     input.StructureNormalOrientation,
                     input.ForeshoreGeometry.Select(c => new HydraRingForelandPoint(c.X, c.Y)),
-                    new HydraRingBreakWater(expectedBreakWaterType, input.BreakWater.Height),
+                    new HydraRingBreakWater(BreakWaterTypeHelper.GetHydraRingBreakWaterType(breakWaterType), input.BreakWater.Height),
                     generalInput.GravitationalAcceleration,
                     input.FactorStormDurationOpenStructure,
                     input.FailureProbabilityOpenStructure,
@@ -778,10 +778,10 @@
         }
 
         [Test]
-        [TestCase(BreakWaterType.Caisson, 1)]
-        [TestCase(BreakWaterType.Wall, 2)]
-        [TestCase(BreakWaterType.Dam, 3)]
-        public void Calculate_VariousFloodedCulvertCalculationsWithBreakWater_InputPropertiesCorrectlySentToCalculator(BreakWaterType breakWaterType, int expectedBreakWaterType)
+        [TestCase(BreakWaterType.Caisson)]
+        [TestCase(BreakWaterType.Wall)]
+        [TestCase(BreakWaterType.Dam)]
+        public void Calculate_VariousFloodedCulvertCalculationsWithBreakWater_InputPropertiesCorrectlySentToCalculator(BreakWaterType breakWaterType)
         {
             // Setup
             var failureMechanism = new ClosingStructuresFailureMechanism();
@@ -831,7 +831,7 @@
                     1300001,
                     input.StructureNormalOrientation,
                     input.ForeshoreGeometry.Select(c => new HydraRingForelandPoint(c.X, c.Y)),
-                    new HydraRingBreakWater(expectedBreakWaterType, input.BreakWater.Height),
+                    new HydraRingBreakWater(BreakWaterTypeHelper.GetHydraRingBreakWaterType(breakWaterType), input.BreakWater.Height),
                     generalInput.GravitationalAcceleration,
                     input.FactorStormDurationOpenStructure,
                     input.FailureProbabilityOpenStructure,
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/HydraRingInputParserTest.cs
===================================================================
diff -u -r85cc9b92681253f6e76719840a2fad418e4ba2d4 -r03b539c0665d4e84abe4e52146c26f3b19fa208c
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/HydraRingInputParserTest.cs	(.../HydraRingInputParserTest.cs)	(revision 85cc9b92681253f6e76719840a2fad418e4ba2d4)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/HydraRingInputParserTest.cs	(.../HydraRingInputParserTest.cs)	(revision 03b539c0665d4e84abe4e52146c26f3b19fa208c)
@@ -30,6 +30,7 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Service.TestUtil;
 using Ringtoets.HydraRing.Calculation.Data;
 
 namespace Ringtoets.Common.Service.Test
@@ -85,10 +86,10 @@
         }
 
         [Test]
-        [TestCase(BreakWaterType.Caisson, 1)]
-        [TestCase(BreakWaterType.Wall, 2)]
-        [TestCase(BreakWaterType.Dam, 3)]
-        public void ParseBreakWater_Use_ReturnHydraRingBreakWater(BreakWaterType breakWaterType, int expectedBreakWaterType)
+        [TestCase(BreakWaterType.Caisson)]
+        [TestCase(BreakWaterType.Wall)]
+        [TestCase(BreakWaterType.Dam)]
+        public void ParseBreakWater_Use_ReturnHydraRingBreakWater(BreakWaterType breakWaterType)
         {
             // Setup
             var random = new Random(22);
@@ -105,7 +106,7 @@
             HydraRingBreakWater parsedBreakWater = HydraRingInputParser.ParseBreakWater(breakWater);
 
             // Assert 
-            Assert.AreEqual(expectedBreakWaterType, parsedBreakWater.Type);
+            Assert.AreEqual(BreakWaterTypeHelper.GetHydraRingBreakWaterType(breakWaterType), parsedBreakWater.Type);
             Assert.AreEqual(expectedBreakWater.Height, parsedBreakWater.Height, expectedBreakWater.Height.GetAccuracy());
             mockRepository.VerifyAll();
         }