Index: Core/Common/test/Core.Common.TestUtil.Test/EnumWithDisplayNameTestFixtureTest.cs
===================================================================
diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Core/Common/test/Core.Common.TestUtil.Test/EnumWithDisplayNameTestFixtureTest.cs	(.../EnumWithDisplayNameTestFixtureTest.cs)	(revision ac96d7c315129af851634ed5a4a6800b59ede718)
+++ Core/Common/test/Core.Common.TestUtil.Test/EnumWithDisplayNameTestFixtureTest.cs	(.../EnumWithDisplayNameTestFixtureTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -36,7 +36,7 @@
             var displayNameEnumTest = new DisplayNameEnumTest();
 
             // Assert
-            Assert.IsInstanceOf<EnumValuesTestFixture<EnumDisplayName, byte>>(displayNameEnumTest);
+            Assert.IsInstanceOf<EnumValuesTestFixture<EnumDisplayName, int>>(displayNameEnumTest);
         }
 
         [TestFixture]
@@ -58,11 +58,11 @@
                 }
             }
 
-            protected override IDictionary<EnumDisplayName, byte> ExpectedValueForEnumValues
+            protected override IDictionary<EnumDisplayName, int> ExpectedValueForEnumValues
             {
                 get
                 {
-                    return new Dictionary<EnumDisplayName, byte>
+                    return new Dictionary<EnumDisplayName, int>
                     {
                         {
                             EnumDisplayName.NoDisplayName, 0
Index: Core/Common/test/Core.Common.TestUtil/EnumWithDisplayNameTestFixture.cs
===================================================================
diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Core/Common/test/Core.Common.TestUtil/EnumWithDisplayNameTestFixture.cs	(.../EnumWithDisplayNameTestFixture.cs)	(revision ac96d7c315129af851634ed5a4a6800b59ede718)
+++ Core/Common/test/Core.Common.TestUtil/EnumWithDisplayNameTestFixture.cs	(.../EnumWithDisplayNameTestFixture.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -28,7 +28,7 @@
 namespace Core.Common.TestUtil
 {
     [TestFixture]
-    public abstract class EnumWithDisplayNameTestFixture<TEnum> : EnumValuesTestFixture<TEnum, byte>
+    public abstract class EnumWithDisplayNameTestFixture<TEnum> : EnumValuesTestFixture<TEnum, int>
     {
         protected abstract IDictionary<TEnum, string> ExpectedDisplayNameForEnumValues { get; }
 
Index: Core/Components/test/Core.Components.Chart.Test/Data/ChartPointSymbolTest.cs
===================================================================
diff -u -r38820934a4a3b732c890b5fe1745e89e706d923b -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Core/Components/test/Core.Components.Chart.Test/Data/ChartPointSymbolTest.cs	(.../ChartPointSymbolTest.cs)	(revision 38820934a4a3b732c890b5fe1745e89e706d923b)
+++ Core/Components/test/Core.Components.Chart.Test/Data/ChartPointSymbolTest.cs	(.../ChartPointSymbolTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -60,11 +60,11 @@
             }
         }
 
-        protected override IDictionary<ChartPointSymbol, byte> ExpectedValueForEnumValues
+        protected override IDictionary<ChartPointSymbol, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<ChartPointSymbol, byte>
+                return new Dictionary<ChartPointSymbol, int>
                 {
                     {
                         ChartPointSymbol.Circle, 0
Index: Core/Components/test/Core.Components.Chart.Test/Styles/ChartLineDashStyleTest.cs
===================================================================
diff -u -r38820934a4a3b732c890b5fe1745e89e706d923b -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Core/Components/test/Core.Components.Chart.Test/Styles/ChartLineDashStyleTest.cs	(.../ChartLineDashStyleTest.cs)	(revision 38820934a4a3b732c890b5fe1745e89e706d923b)
+++ Core/Components/test/Core.Components.Chart.Test/Styles/ChartLineDashStyleTest.cs	(.../ChartLineDashStyleTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -54,11 +54,11 @@
             }
         }
 
-        protected override IDictionary<ChartLineDashStyle, byte> ExpectedValueForEnumValues
+        protected override IDictionary<ChartLineDashStyle, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<ChartLineDashStyle, byte>
+                return new Dictionary<ChartLineDashStyle, int>
                 {
                     {
                         ChartLineDashStyle.Solid, 0
Index: Core/Components/test/Core.Components.Gis.Test/Data/WellKnownTileSourceTest.cs
===================================================================
diff -u -r38820934a4a3b732c890b5fe1745e89e706d923b -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Core/Components/test/Core.Components.Gis.Test/Data/WellKnownTileSourceTest.cs	(.../WellKnownTileSourceTest.cs)	(revision 38820934a4a3b732c890b5fe1745e89e706d923b)
+++ Core/Components/test/Core.Components.Gis.Test/Data/WellKnownTileSourceTest.cs	(.../WellKnownTileSourceTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -57,11 +57,11 @@
             }
         }
 
-        protected override IDictionary<WellKnownTileSource, byte> ExpectedValueForEnumValues
+        protected override IDictionary<WellKnownTileSource, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<WellKnownTileSource, byte>
+                return new Dictionary<WellKnownTileSource, int>
                 {
                     {
                         WellKnownTileSource.OpenStreetMap, 1
Index: Core/Components/test/Core.Components.Gis.Test/Style/LineDashStyleTest.cs
===================================================================
diff -u -r38820934a4a3b732c890b5fe1745e89e706d923b -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Core/Components/test/Core.Components.Gis.Test/Style/LineDashStyleTest.cs	(.../LineDashStyleTest.cs)	(revision 38820934a4a3b732c890b5fe1745e89e706d923b)
+++ Core/Components/test/Core.Components.Gis.Test/Style/LineDashStyleTest.cs	(.../LineDashStyleTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -54,11 +54,11 @@
             }
         }
 
-        protected override IDictionary<LineDashStyle, byte> ExpectedValueForEnumValues
+        protected override IDictionary<LineDashStyle, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<LineDashStyle, byte>
+                return new Dictionary<LineDashStyle, int>
                 {
                     {
                         LineDashStyle.Solid, 0
Index: Core/Components/test/Core.Components.Gis.Test/Style/PointSymbolTest.cs
===================================================================
diff -u -r38820934a4a3b732c890b5fe1745e89e706d923b -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Core/Components/test/Core.Components.Gis.Test/Style/PointSymbolTest.cs	(.../PointSymbolTest.cs)	(revision 38820934a4a3b732c890b5fe1745e89e706d923b)
+++ Core/Components/test/Core.Components.Gis.Test/Style/PointSymbolTest.cs	(.../PointSymbolTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -60,11 +60,11 @@
             }
         }
 
-        protected override IDictionary<PointSymbol, byte> ExpectedValueForEnumValues
+        protected override IDictionary<PointSymbol, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<PointSymbol, byte>
+                return new Dictionary<PointSymbol, int>
                 {
                     {
                         PointSymbol.Circle, 0
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Data.Test/AssessmentSectionAssemblyCategoryGroupTest.cs
===================================================================
diff -u -r527932bf6a98d57c829448c0ba1a588848e6b224 -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Data.Test/AssessmentSectionAssemblyCategoryGroupTest.cs	(.../AssessmentSectionAssemblyCategoryGroupTest.cs)	(revision 527932bf6a98d57c829448c0ba1a588848e6b224)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Data.Test/AssessmentSectionAssemblyCategoryGroupTest.cs	(.../AssessmentSectionAssemblyCategoryGroupTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -28,11 +28,11 @@
     [TestFixture]
     public class AssessmentSectionAssemblyCategoryGroupTest : EnumWithDisplayNameTestFixture<AssessmentSectionAssemblyCategoryGroup>
     {
-        protected override IDictionary<AssessmentSectionAssemblyCategoryGroup, byte> ExpectedValueForEnumValues
+        protected override IDictionary<AssessmentSectionAssemblyCategoryGroup, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<AssessmentSectionAssemblyCategoryGroup, byte>
+                return new Dictionary<AssessmentSectionAssemblyCategoryGroup, int>
                 {
                     {
                         AssessmentSectionAssemblyCategoryGroup.None, 1
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Data.Test/FailureMechanismAssemblyCategoryGroupTest.cs
===================================================================
diff -u -re43ccfcc421fc9f2e55ab4257bfb0e53828a7911 -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Data.Test/FailureMechanismAssemblyCategoryGroupTest.cs	(.../FailureMechanismAssemblyCategoryGroupTest.cs)	(revision e43ccfcc421fc9f2e55ab4257bfb0e53828a7911)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Data.Test/FailureMechanismAssemblyCategoryGroupTest.cs	(.../FailureMechanismAssemblyCategoryGroupTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -28,11 +28,11 @@
     [TestFixture]
     public class FailureMechanismAssemblyCategoryGroupTest : EnumWithDisplayNameTestFixture<FailureMechanismAssemblyCategoryGroup>
     {
-        protected override IDictionary<FailureMechanismAssemblyCategoryGroup, byte> ExpectedValueForEnumValues
+        protected override IDictionary<FailureMechanismAssemblyCategoryGroup, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<FailureMechanismAssemblyCategoryGroup, byte>
+                return new Dictionary<FailureMechanismAssemblyCategoryGroup, int>
                 {
                     {
                         FailureMechanismAssemblyCategoryGroup.None, 1
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Forms.Test/DisplayFailureMechanismSectionAssemblyCategoryGroupTest.cs
===================================================================
diff -u -r0c536882ffd5abfd1eaecfa8c8b90dbc9d2a16d8 -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Forms.Test/DisplayFailureMechanismSectionAssemblyCategoryGroupTest.cs	(.../DisplayFailureMechanismSectionAssemblyCategoryGroupTest.cs)	(revision 0c536882ffd5abfd1eaecfa8c8b90dbc9d2a16d8)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Forms.Test/DisplayFailureMechanismSectionAssemblyCategoryGroupTest.cs	(.../DisplayFailureMechanismSectionAssemblyCategoryGroupTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -28,11 +28,11 @@
     [TestFixture]
     public class DisplayFailureMechanismSectionAssemblyCategoryGroupTest : EnumWithDisplayNameTestFixture<DisplayFailureMechanismSectionAssemblyCategoryGroup>
     {
-        protected override IDictionary<DisplayFailureMechanismSectionAssemblyCategoryGroup, byte> ExpectedValueForEnumValues
+        protected override IDictionary<DisplayFailureMechanismSectionAssemblyCategoryGroup, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<DisplayFailureMechanismSectionAssemblyCategoryGroup, byte>
+                return new Dictionary<DisplayFailureMechanismSectionAssemblyCategoryGroup, int>
                 {
                     {
                         DisplayFailureMechanismSectionAssemblyCategoryGroup.None, 1
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Forms.Test/SelectableFailureMechanismSectionAssemblyCategoryGroupTest.cs
===================================================================
diff -u -r77cd65fa92945a8edbc4e7bf15f59459c404b97a -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Forms.Test/SelectableFailureMechanismSectionAssemblyCategoryGroupTest.cs	(.../SelectableFailureMechanismSectionAssemblyCategoryGroupTest.cs)	(revision 77cd65fa92945a8edbc4e7bf15f59459c404b97a)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Forms.Test/SelectableFailureMechanismSectionAssemblyCategoryGroupTest.cs	(.../SelectableFailureMechanismSectionAssemblyCategoryGroupTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -28,11 +28,11 @@
     [TestFixture]
     public class SelectableFailureMechanismSectionAssemblyCategoryGroupTest : EnumWithDisplayNameTestFixture<SelectableFailureMechanismSectionAssemblyCategoryGroup>
     {
-        protected override IDictionary<SelectableFailureMechanismSectionAssemblyCategoryGroup, byte> ExpectedValueForEnumValues
+        protected override IDictionary<SelectableFailureMechanismSectionAssemblyCategoryGroup, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<SelectableFailureMechanismSectionAssemblyCategoryGroup, byte>
+                return new Dictionary<SelectableFailureMechanismSectionAssemblyCategoryGroup, int>
                 {
                     {
                         SelectableFailureMechanismSectionAssemblyCategoryGroup.None, 1
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructureInflowModelTypeTest.cs
===================================================================
diff -u -reb7ec35fde1008ba7e90ae4a11fee8695ba00d03 -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructureInflowModelTypeTest.cs	(.../ClosingStructureInflowModelTypeTest.cs)	(revision eb7ec35fde1008ba7e90ae4a11fee8695ba00d03)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructureInflowModelTypeTest.cs	(.../ClosingStructureInflowModelTypeTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -28,30 +28,42 @@
     [TestFixture]
     public class ClosingStructureInflowModelTypeTest : EnumWithDisplayNameTestFixture<ClosingStructureInflowModelType>
     {
-        protected override IDictionary<ClosingStructureInflowModelType, byte> ExpectedValueForEnumValues => new Dictionary<ClosingStructureInflowModelType, byte>
+        protected override IDictionary<ClosingStructureInflowModelType, int> ExpectedValueForEnumValues
         {
+            get
             {
-                ClosingStructureInflowModelType.VerticalWall, 1
-            },
-            {
-                ClosingStructureInflowModelType.LowSill, 2
-            },
-            {
-                ClosingStructureInflowModelType.FloodedCulvert, 3
+                return new Dictionary<ClosingStructureInflowModelType, int>
+                {
+                    {
+                        ClosingStructureInflowModelType.VerticalWall, 1
+                    },
+                    {
+                        ClosingStructureInflowModelType.LowSill, 2
+                    },
+                    {
+                        ClosingStructureInflowModelType.FloodedCulvert, 3
+                    }
+                };
             }
-        };
+        }
 
-        protected override IDictionary<ClosingStructureInflowModelType, string> ExpectedDisplayNameForEnumValues => new Dictionary<ClosingStructureInflowModelType, string>
+        protected override IDictionary<ClosingStructureInflowModelType, string> ExpectedDisplayNameForEnumValues
         {
+            get
             {
-                ClosingStructureInflowModelType.VerticalWall, "Verticale wand"
-            },
-            {
-                ClosingStructureInflowModelType.LowSill, "Lage drempel"
-            },
-            {
-                ClosingStructureInflowModelType.FloodedCulvert, "Verdronken koker"
+                return new Dictionary<ClosingStructureInflowModelType, string>
+                {
+                    {
+                        ClosingStructureInflowModelType.VerticalWall, "Verticale wand"
+                    },
+                    {
+                        ClosingStructureInflowModelType.LowSill, "Lage drempel"
+                    },
+                    {
+                        ClosingStructureInflowModelType.FloodedCulvert, "Verdronken koker"
+                    }
+                };
             }
-        };
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/AssessmentSectionCompositionTest.cs
===================================================================
diff -u -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44 -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/AssessmentSectionCompositionTest.cs	(.../AssessmentSectionCompositionTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/AssessmentSectionCompositionTest.cs	(.../AssessmentSectionCompositionTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -48,11 +48,11 @@
             }
         }
 
-        protected override IDictionary<AssessmentSectionComposition, byte> ExpectedValueForEnumValues
+        protected override IDictionary<AssessmentSectionComposition, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<AssessmentSectionComposition, byte>
+                return new Dictionary<AssessmentSectionComposition, int>
                 {
                     {
                         AssessmentSectionComposition.Dike, 1
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/RingtoetsWellKnownTileSourceTest.cs
===================================================================
diff -u -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44 -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/RingtoetsWellKnownTileSourceTest.cs	(.../RingtoetsWellKnownTileSourceTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/RingtoetsWellKnownTileSourceTest.cs	(.../RingtoetsWellKnownTileSourceTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -57,11 +57,11 @@
             }
         }
 
-        protected override IDictionary<RingtoetsWellKnownTileSource, byte> ExpectedValueForEnumValues
+        protected override IDictionary<RingtoetsWellKnownTileSource, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<RingtoetsWellKnownTileSource, byte>
+                return new Dictionary<RingtoetsWellKnownTileSource, int>
                 {
                     {
                         RingtoetsWellKnownTileSource.OpenStreetMap, 1
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Contribution/NormTypeTest.cs
===================================================================
diff -u -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44 -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Contribution/NormTypeTest.cs	(.../NormTypeTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Contribution/NormTypeTest.cs	(.../NormTypeTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -45,11 +45,11 @@
             }
         }
 
-        protected override IDictionary<NormType, byte> ExpectedValueForEnumValues
+        protected override IDictionary<NormType, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<NormType, byte>
+                return new Dictionary<NormType, int>
                 {
                     {
                         NormType.LowerLimit, 1
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/BreakWaterTypeTest.cs
===================================================================
diff -u -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44 -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/BreakWaterTypeTest.cs	(.../BreakWaterTypeTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/DikeProfiles/BreakWaterTypeTest.cs	(.../BreakWaterTypeTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -48,11 +48,11 @@
             }
         }
 
-        protected override IDictionary<BreakWaterType, byte> ExpectedValueForEnumValues
+        protected override IDictionary<BreakWaterType, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<BreakWaterType, byte>
+                return new Dictionary<BreakWaterType, int>
                 {
                     {
                         BreakWaterType.Wall, 1
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/AssessmentLayerTwoAResultTest.cs
===================================================================
diff -u -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44 -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/AssessmentLayerTwoAResultTest.cs	(.../AssessmentLayerTwoAResultTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/AssessmentLayerTwoAResultTest.cs	(.../AssessmentLayerTwoAResultTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -48,11 +48,11 @@
             }
         }
 
-        protected override IDictionary<AssessmentLayerTwoAResult, byte> ExpectedValueForEnumValues
+        protected override IDictionary<AssessmentLayerTwoAResult, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<AssessmentLayerTwoAResult, byte>
+                return new Dictionary<AssessmentLayerTwoAResult, int>
                 {
                     {
                         AssessmentLayerTwoAResult.NotCalculated, 1
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/CalculationConvergenceTest.cs
===================================================================
diff -u -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44 -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/CalculationConvergenceTest.cs	(.../CalculationConvergenceTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/CalculationConvergenceTest.cs	(.../CalculationConvergenceTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -48,11 +48,11 @@
             }
         }
 
-        protected override IDictionary<CalculationConvergence, byte> ExpectedValueForEnumValues
+        protected override IDictionary<CalculationConvergence, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<CalculationConvergence, byte>
+                return new Dictionary<CalculationConvergence, int>
                 {
                     {
                         CalculationConvergence.NotCalculated, 1
Index: Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/DetailedAssessmentProbabilityOnlyResultTypeTest.cs
===================================================================
diff -u -r192447bfd98b506637875ed87ed50a805fc568e9 -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/DetailedAssessmentProbabilityOnlyResultTypeTest.cs	(.../DetailedAssessmentProbabilityOnlyResultTypeTest.cs)	(revision 192447bfd98b506637875ed87ed50a805fc568e9)
+++ Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/DetailedAssessmentProbabilityOnlyResultTypeTest.cs	(.../DetailedAssessmentProbabilityOnlyResultTypeTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -28,11 +28,11 @@
     [TestFixture]
     public class DetailedAssessmentProbabilityOnlyResultTypeTest : EnumWithDisplayNameTestFixture<DetailedAssessmentProbabilityOnlyResultType>
     {
-        protected override IDictionary<DetailedAssessmentProbabilityOnlyResultType, byte> ExpectedValueForEnumValues
+        protected override IDictionary<DetailedAssessmentProbabilityOnlyResultType, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<DetailedAssessmentProbabilityOnlyResultType, byte>
+                return new Dictionary<DetailedAssessmentProbabilityOnlyResultType, int>
                 {
                     {
                         DetailedAssessmentProbabilityOnlyResultType.Probability, 1
Index: Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/DetailedAssessmentResultTypeTest.cs
===================================================================
diff -u -r89431ab4a6833f04728b89dcb36e93250eb8d98b -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/DetailedAssessmentResultTypeTest.cs	(.../DetailedAssessmentResultTypeTest.cs)	(revision 89431ab4a6833f04728b89dcb36e93250eb8d98b)
+++ Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/DetailedAssessmentResultTypeTest.cs	(.../DetailedAssessmentResultTypeTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -28,11 +28,11 @@
     [TestFixture]
     public class DetailedAssessmentResultTypeTest : EnumWithDisplayNameTestFixture<DetailedAssessmentResultType>
     {
-        protected override IDictionary<DetailedAssessmentResultType, byte> ExpectedValueForEnumValues
+        protected override IDictionary<DetailedAssessmentResultType, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<DetailedAssessmentResultType, byte>
+                return new Dictionary<DetailedAssessmentResultType, int>
                 {
                     {
                         DetailedAssessmentResultType.None, 1
Index: Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/SimpleAssessmentResultTypeTest.cs
===================================================================
diff -u -rd7696913d8f9239cb80eb2c3bac6cc0ccf23d479 -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/SimpleAssessmentResultTypeTest.cs	(.../SimpleAssessmentResultTypeTest.cs)	(revision d7696913d8f9239cb80eb2c3bac6cc0ccf23d479)
+++ Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/SimpleAssessmentResultTypeTest.cs	(.../SimpleAssessmentResultTypeTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -28,11 +28,11 @@
     [TestFixture]
     public class SimpleAssessmentResultTypeTest : EnumWithDisplayNameTestFixture<SimpleAssessmentResultType>
     {
-        protected override IDictionary<SimpleAssessmentResultType, byte> ExpectedValueForEnumValues
+        protected override IDictionary<SimpleAssessmentResultType, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<SimpleAssessmentResultType, byte>
+                return new Dictionary<SimpleAssessmentResultType, int>
                 {
                     {
                         SimpleAssessmentResultType.None, 1
Index: Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/SimpleAssessmentValidityOnlyResultTypeTest.cs
===================================================================
diff -u -re3f913fddac4cfa598ef5439ce6b832f354d7dd8 -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/SimpleAssessmentValidityOnlyResultTypeTest.cs	(.../SimpleAssessmentValidityOnlyResultTypeTest.cs)	(revision e3f913fddac4cfa598ef5439ce6b832f354d7dd8)
+++ Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/SimpleAssessmentValidityOnlyResultTypeTest.cs	(.../SimpleAssessmentValidityOnlyResultTypeTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -28,11 +28,11 @@
     [TestFixture]
     public class SimpleAssessmentValidityOnlyResultTypeTest : EnumWithDisplayNameTestFixture<SimpleAssessmentValidityOnlyResultType>
     {
-        protected override IDictionary<SimpleAssessmentValidityOnlyResultType, byte> ExpectedValueForEnumValues
+        protected override IDictionary<SimpleAssessmentValidityOnlyResultType, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<SimpleAssessmentValidityOnlyResultType, byte>
+                return new Dictionary<SimpleAssessmentValidityOnlyResultType, int>
                 {
                     {
                         SimpleAssessmentValidityOnlyResultType.None, 1
Index: Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/TailorMadeAssessmentProbabilityAndDetailedCalculationResultTypeTest.cs
===================================================================
diff -u -ra48ca9b4c36f30de172ae7763a6ba832cbcad9c5 -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/TailorMadeAssessmentProbabilityAndDetailedCalculationResultTypeTest.cs	(.../TailorMadeAssessmentProbabilityAndDetailedCalculationResultTypeTest.cs)	(revision a48ca9b4c36f30de172ae7763a6ba832cbcad9c5)
+++ Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/TailorMadeAssessmentProbabilityAndDetailedCalculationResultTypeTest.cs	(.../TailorMadeAssessmentProbabilityAndDetailedCalculationResultTypeTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -28,11 +28,11 @@
     [TestFixture]
     public class TailorMadeAssessmentProbabilityAndDetailedCalculationResultTypeTest : EnumWithDisplayNameTestFixture<TailorMadeAssessmentProbabilityAndDetailedCalculationResultType>
     {
-        protected override IDictionary<TailorMadeAssessmentProbabilityAndDetailedCalculationResultType, byte> ExpectedValueForEnumValues
+        protected override IDictionary<TailorMadeAssessmentProbabilityAndDetailedCalculationResultType, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<TailorMadeAssessmentProbabilityAndDetailedCalculationResultType, byte>
+                return new Dictionary<TailorMadeAssessmentProbabilityAndDetailedCalculationResultType, int>
                 {
                     {
                         TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.None, 1
Index: Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/TailorMadeAssessmentProbabilityCalculationResultTypeTest.cs
===================================================================
diff -u -r712c1aad8e5486980f259491130e4ae07ea48149 -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/TailorMadeAssessmentProbabilityCalculationResultTypeTest.cs	(.../TailorMadeAssessmentProbabilityCalculationResultTypeTest.cs)	(revision 712c1aad8e5486980f259491130e4ae07ea48149)
+++ Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/TailorMadeAssessmentProbabilityCalculationResultTypeTest.cs	(.../TailorMadeAssessmentProbabilityCalculationResultTypeTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -28,11 +28,11 @@
     [TestFixture]
     public class TailorMadeAssessmentProbabilityCalculationResultTypeTest : EnumWithDisplayNameTestFixture<TailorMadeAssessmentProbabilityCalculationResultType>
     {
-        protected override IDictionary<TailorMadeAssessmentProbabilityCalculationResultType, byte> ExpectedValueForEnumValues
+        protected override IDictionary<TailorMadeAssessmentProbabilityCalculationResultType, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<TailorMadeAssessmentProbabilityCalculationResultType, byte>
+                return new Dictionary<TailorMadeAssessmentProbabilityCalculationResultType, int>
                 {
                     {
                         TailorMadeAssessmentProbabilityCalculationResultType.None, 1
Index: Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/TailorMadeAssessmentResultTypeTest.cs
===================================================================
diff -u -r4c3d9408c3bb6f5745d8c49593366df16c6e4129 -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/TailorMadeAssessmentResultTypeTest.cs	(.../TailorMadeAssessmentResultTypeTest.cs)	(revision 4c3d9408c3bb6f5745d8c49593366df16c6e4129)
+++ Ringtoets/Common/test/Ringtoets.Common.Primitives.Test/TailorMadeAssessmentResultTypeTest.cs	(.../TailorMadeAssessmentResultTypeTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -28,11 +28,11 @@
     [TestFixture]
     public class TailorMadeAssessmentResultTypeTest : EnumWithDisplayNameTestFixture<TailorMadeAssessmentResultType>
     {
-        protected override IDictionary<TailorMadeAssessmentResultType, byte> ExpectedValueForEnumValues
+        protected override IDictionary<TailorMadeAssessmentResultType, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<TailorMadeAssessmentResultType, byte>
+                return new Dictionary<TailorMadeAssessmentResultType, int>
                 {
                     {
                         TailorMadeAssessmentResultType.None, 1
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/DikeHeightCalculationTypeTest.cs
===================================================================
diff -u -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44 -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/DikeHeightCalculationTypeTest.cs	(.../DikeHeightCalculationTypeTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/DikeHeightCalculationTypeTest.cs	(.../DikeHeightCalculationTypeTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -47,11 +47,11 @@
             }
         }
 
-        protected override IDictionary<DikeHeightCalculationType, byte> ExpectedValueForEnumValues
+        protected override IDictionary<DikeHeightCalculationType, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<DikeHeightCalculationType, byte>
+                return new Dictionary<DikeHeightCalculationType, int>
                 {
                     {
                         DikeHeightCalculationType.NoCalculation, 1
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/OvertoppingRateCalculationTypeTest.cs
===================================================================
diff -u -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44 -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/OvertoppingRateCalculationTypeTest.cs	(.../OvertoppingRateCalculationTypeTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/OvertoppingRateCalculationTypeTest.cs	(.../OvertoppingRateCalculationTypeTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -47,11 +47,11 @@
             }
         }
 
-        protected override IDictionary<OvertoppingRateCalculationType, byte> ExpectedValueForEnumValues
+        protected override IDictionary<OvertoppingRateCalculationType, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<OvertoppingRateCalculationType, byte>
+                return new Dictionary<OvertoppingRateCalculationType, int>
                 {
                     {
                         OvertoppingRateCalculationType.NoCalculation, 1
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsGridDeterminationTypeTest.cs
===================================================================
diff -u -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44 -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsGridDeterminationTypeTest.cs	(.../MacroStabilityInwardsGridDeterminationTypeTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsGridDeterminationTypeTest.cs	(.../MacroStabilityInwardsGridDeterminationTypeTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -44,11 +44,11 @@
             }
         }
 
-        protected override IDictionary<MacroStabilityInwardsGridDeterminationType, byte> ExpectedValueForEnumValues
+        protected override IDictionary<MacroStabilityInwardsGridDeterminationType, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<MacroStabilityInwardsGridDeterminationType, byte>
+                return new Dictionary<MacroStabilityInwardsGridDeterminationType, int>
                 {
                     {
                         MacroStabilityInwardsGridDeterminationType.Automatic, 1
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsShearStrengthModelTest.cs
===================================================================
diff -u -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44 -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsShearStrengthModelTest.cs	(.../MacroStabilityInwardsShearStrengthModelTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsShearStrengthModelTest.cs	(.../MacroStabilityInwardsShearStrengthModelTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -48,11 +48,11 @@
             }
         }
 
-        protected override IDictionary<MacroStabilityInwardsShearStrengthModel, byte> ExpectedValueForEnumValues
+        protected override IDictionary<MacroStabilityInwardsShearStrengthModel, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<MacroStabilityInwardsShearStrengthModel, byte>
+                return new Dictionary<MacroStabilityInwardsShearStrengthModel, int>
                 {
                     {
                         MacroStabilityInwardsShearStrengthModel.SuCalculated, 1
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsTangentLineDeterminationTypeTest.cs
===================================================================
diff -u -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44 -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsTangentLineDeterminationTypeTest.cs	(.../MacroStabilityInwardsTangentLineDeterminationTypeTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsTangentLineDeterminationTypeTest.cs	(.../MacroStabilityInwardsTangentLineDeterminationTypeTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -44,11 +44,11 @@
             }
         }
 
-        protected override IDictionary<MacroStabilityInwardsTangentLineDeterminationType, byte> ExpectedValueForEnumValues
+        protected override IDictionary<MacroStabilityInwardsTangentLineDeterminationType, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<MacroStabilityInwardsTangentLineDeterminationType, byte>
+                return new Dictionary<MacroStabilityInwardsTangentLineDeterminationType, int>
                 {
                     {
                         MacroStabilityInwardsTangentLineDeterminationType.Specified, 1
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsZoningBoundariesDeterminationTypeTest.cs
===================================================================
diff -u -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44 -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsZoningBoundariesDeterminationTypeTest.cs	(.../MacroStabilityInwardsZoningBoundariesDeterminationTypeTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsZoningBoundariesDeterminationTypeTest.cs	(.../MacroStabilityInwardsZoningBoundariesDeterminationTypeTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -44,11 +44,11 @@
             }
         }
 
-        protected override IDictionary<MacroStabilityInwardsZoningBoundariesDeterminationType, byte> ExpectedValueForEnumValues
+        protected override IDictionary<MacroStabilityInwardsZoningBoundariesDeterminationType, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<MacroStabilityInwardsZoningBoundariesDeterminationType, byte>
+                return new Dictionary<MacroStabilityInwardsZoningBoundariesDeterminationType, int>
                 {
                     {
                         MacroStabilityInwardsZoningBoundariesDeterminationType.Automatic, 1
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsDikeSoilScenarioTest.cs
===================================================================
diff -u -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44 -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsDikeSoilScenarioTest.cs	(.../MacroStabilityInwardsDikeSoilScenarioTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsDikeSoilScenarioTest.cs	(.../MacroStabilityInwardsDikeSoilScenarioTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -50,11 +50,11 @@
             }
         }
 
-        protected override IDictionary<MacroStabilityInwardsDikeSoilScenario, byte> ExpectedValueForEnumValues
+        protected override IDictionary<MacroStabilityInwardsDikeSoilScenario, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<MacroStabilityInwardsDikeSoilScenario, byte>
+                return new Dictionary<MacroStabilityInwardsDikeSoilScenario, int>
                 {
                     {
                         MacroStabilityInwardsDikeSoilScenario.ClayDikeOnClay, 1
Index: Ringtoets/Piping/test/Ringtoets.Piping.Primitives.Test/SoilProfileTypeTest.cs
===================================================================
diff -u -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44 -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Ringtoets/Piping/test/Ringtoets.Piping.Primitives.Test/SoilProfileTypeTest.cs	(.../SoilProfileTypeTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Primitives.Test/SoilProfileTypeTest.cs	(.../SoilProfileTypeTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -44,11 +44,11 @@
             }
         }
 
-        protected override IDictionary<SoilProfileType, byte> ExpectedValueForEnumValues
+        protected override IDictionary<SoilProfileType, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<SoilProfileType, byte>
+                return new Dictionary<SoilProfileType, int>
                 {
                     {
                         SoilProfileType.SoilProfile1D, 1
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputStepSizeTest.cs
===================================================================
diff -u -r203c35ed35a3455f2d09cbb4a15c0f7e824edc44 -racf610ab37ba6b5beb2aad1200e713247d5a094f
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputStepSizeTest.cs	(.../WaveConditionsInputStepSizeTest.cs)	(revision 203c35ed35a3455f2d09cbb4a15c0f7e824edc44)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputStepSizeTest.cs	(.../WaveConditionsInputStepSizeTest.cs)	(revision acf610ab37ba6b5beb2aad1200e713247d5a094f)
@@ -47,11 +47,11 @@
             }
         }
 
-        protected override IDictionary<WaveConditionsInputStepSize, byte> ExpectedValueForEnumValues
+        protected override IDictionary<WaveConditionsInputStepSize, int> ExpectedValueForEnumValues
         {
             get
             {
-                return new Dictionary<WaveConditionsInputStepSize, byte>
+                return new Dictionary<WaveConditionsInputStepSize, int>
                 {
                     {
                         WaveConditionsInputStepSize.Half, 1