Index: Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/AssessmentSectionCategoryType.cs
===================================================================
diff -u -r963ad6370ebcf0a87e43e0d40f00332f6326e9c7 -r1e14ee40087ad0c42f889f6ee86c13bf6d7d192b
--- Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/AssessmentSectionCategoryType.cs	(.../AssessmentSectionCategoryType.cs)	(revision 963ad6370ebcf0a87e43e0d40f00332f6326e9c7)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/AssessmentSectionCategoryType.cs	(.../AssessmentSectionCategoryType.cs)	(revision 1e14ee40087ad0c42f889f6ee86c13bf6d7d192b)
@@ -30,15 +30,15 @@
     public enum AssessmentSectionCategoryType
     {
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionCategoryType_FactorizedSignalingNorm_DisplayName))]
-        FactorizedSignalingNorm,
+        FactorizedSignalingNorm = 1,
 
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionCategoryType_SignalingNorm_DisplayName))]
-        SignalingNorm,
+        SignalingNorm = 2,
 
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionCategoryType_LowerLimitNorm_DisplayName))]
-        LowerLimitNorm,
+        LowerLimitNorm = 3,
 
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.AssessmentSectionCategoryType_FactorizedLowerLimitNorm_DisplayName))]
-        FactorizedLowerLimitNorm
+        FactorizedLowerLimitNorm = 4
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/AssessmentSectionExtensions.cs
===================================================================
diff -u -r56b15dc5a50c0a36b0a8949a35f8dd20437e6cda -r1e14ee40087ad0c42f889f6ee86c13bf6d7d192b
--- Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/AssessmentSectionExtensions.cs	(.../AssessmentSectionExtensions.cs)	(revision 56b15dc5a50c0a36b0a8949a35f8dd20437e6cda)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/AssessmentSection/AssessmentSectionExtensions.cs	(.../AssessmentSectionExtensions.cs)	(revision 1e14ee40087ad0c42f889f6ee86c13bf6d7d192b)
@@ -196,7 +196,8 @@
             }
         }
 
-        private static RoundedDouble GetAssessmentLevelFromCalculations(HydraulicBoundaryLocation hydraulicBoundaryLocation, IEnumerable<HydraulicBoundaryLocationCalculation> calculations)
+        private static RoundedDouble GetAssessmentLevelFromCalculations(HydraulicBoundaryLocation hydraulicBoundaryLocation,
+                                                                        IEnumerable<HydraulicBoundaryLocationCalculation> calculations)
         {
             return calculations.FirstOrDefault(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation))?.Output?.Result
                    ?? RoundedDouble.NaN;
Index: Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/FailureMechanismCategoryType.cs
===================================================================
diff -u -r3514dda97fee1a5e5178020b2a06780840075e82 -r1e14ee40087ad0c42f889f6ee86c13bf6d7d192b
--- Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/FailureMechanismCategoryType.cs	(.../FailureMechanismCategoryType.cs)	(revision 3514dda97fee1a5e5178020b2a06780840075e82)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/FailureMechanism/FailureMechanismCategoryType.cs	(.../FailureMechanismCategoryType.cs)	(revision 1e14ee40087ad0c42f889f6ee86c13bf6d7d192b)
@@ -30,18 +30,18 @@
     public enum FailureMechanismCategoryType
     {
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.FailureMechanismCategoryType_MechanismSpecificFactorizedSignalingNorm_DisplayName))]
-        MechanismSpecificFactorizedSignalingNorm,
+        MechanismSpecificFactorizedSignalingNorm = 1,
 
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.FailureMechanismCategoryType_MechanismSpecificSignalingNorm_DisplayName))]
-        MechanismSpecificSignalingNorm,
+        MechanismSpecificSignalingNorm = 2,
 
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.FailureMechanismCategoryType_MechanismSpecificLowerLimitNorm_DisplayName))]
-        MechanismSpecificLowerLimitNorm,
+        MechanismSpecificLowerLimitNorm = 3,
 
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.FailureMechanismCategoryType_LowerLimitNorm_DisplayName))]
-        LowerLimitNorm,
+        LowerLimitNorm = 4,
 
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.FailureMechanismCategoryType_FactorizedLowerLimitNorm_DisplayName))]
-        FactorizedLowerLimitNorm
+        FactorizedLowerLimitNorm = 5
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/AssessmentSectionCategoryTypeTest.cs
===================================================================
diff -u -r963ad6370ebcf0a87e43e0d40f00332f6326e9c7 -r1e14ee40087ad0c42f889f6ee86c13bf6d7d192b
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/AssessmentSectionCategoryTypeTest.cs	(.../AssessmentSectionCategoryTypeTest.cs)	(revision 963ad6370ebcf0a87e43e0d40f00332f6326e9c7)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/AssessmentSectionCategoryTypeTest.cs	(.../AssessmentSectionCategoryTypeTest.cs)	(revision 1e14ee40087ad0c42f889f6ee86c13bf6d7d192b)
@@ -58,16 +58,16 @@
                 return new Dictionary<AssessmentSectionCategoryType, int>
                 {
                     {
-                        AssessmentSectionCategoryType.FactorizedSignalingNorm, 0
+                        AssessmentSectionCategoryType.FactorizedSignalingNorm, 1
                     },
                     {
-                        AssessmentSectionCategoryType.SignalingNorm, 1
+                        AssessmentSectionCategoryType.SignalingNorm, 2
                     },
                     {
-                        AssessmentSectionCategoryType.LowerLimitNorm, 2
+                        AssessmentSectionCategoryType.LowerLimitNorm, 3
                     },
                     {
-                        AssessmentSectionCategoryType.FactorizedLowerLimitNorm, 3
+                        AssessmentSectionCategoryType.FactorizedLowerLimitNorm, 4
                     }
                 };
             }
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/AssessmentSectionExtensionsTest.cs
===================================================================
diff -u -re3b58f9f74ce55c3334ca41ba325a7e5ff94052a -r1e14ee40087ad0c42f889f6ee86c13bf6d7d192b
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/AssessmentSectionExtensionsTest.cs	(.../AssessmentSectionExtensionsTest.cs)	(revision e3b58f9f74ce55c3334ca41ba325a7e5ff94052a)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssessmentSection/AssessmentSectionExtensionsTest.cs	(.../AssessmentSectionExtensionsTest.cs)	(revision 1e14ee40087ad0c42f889f6ee86c13bf6d7d192b)
@@ -84,6 +84,7 @@
         [Test]
         public void GetNormativeAssessmentLevel_NoCorrespondingCalculation_ReturnsNaN()
         {
+            // Setup
             var assessmentSection = new AssessmentSectionStub();
 
             assessmentSection.FailureMechanismContribution.NormativeNorm = new Random(32).NextEnumValue<NormType>();
@@ -98,6 +99,7 @@
         [Test]
         public void GetNormativeAssessmentLevel_NoCorrespondingAssessmentLevelOutput_ReturnsNaN()
         {
+            // Setup
             var assessmentSection = new AssessmentSectionStub();
             var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
 
@@ -180,6 +182,7 @@
         [Test]
         public void GetAssessmentLevel_NoCorrespondingCalculation_ReturnsNaN()
         {
+            // Setup
             var assessmentSection = new AssessmentSectionStub();
 
             // Call
@@ -193,6 +196,7 @@
         [Test]
         public void GetAssessmentLevel_NoCorrespondingAssessmentLevelOutput_ReturnsNaN()
         {
+            // Setup
             var assessmentSection = new AssessmentSectionStub();
             var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
 
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/FailureMechanismCategoryTypeTest.cs
===================================================================
diff -u -r3514dda97fee1a5e5178020b2a06780840075e82 -r1e14ee40087ad0c42f889f6ee86c13bf6d7d192b
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/FailureMechanismCategoryTypeTest.cs	(.../FailureMechanismCategoryTypeTest.cs)	(revision 3514dda97fee1a5e5178020b2a06780840075e82)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/FailureMechanism/FailureMechanismCategoryTypeTest.cs	(.../FailureMechanismCategoryTypeTest.cs)	(revision 1e14ee40087ad0c42f889f6ee86c13bf6d7d192b)
@@ -61,19 +61,19 @@
                 return new Dictionary<FailureMechanismCategoryType, int>
                 {
                     {
-                        FailureMechanismCategoryType.MechanismSpecificFactorizedSignalingNorm, 0
+                        FailureMechanismCategoryType.MechanismSpecificFactorizedSignalingNorm, 1
                     },
                     {
-                        FailureMechanismCategoryType.MechanismSpecificSignalingNorm, 1
+                        FailureMechanismCategoryType.MechanismSpecificSignalingNorm, 2
                     },
                     {
-                        FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm, 2
+                        FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm, 3
                     },
                     {
-                        FailureMechanismCategoryType.LowerLimitNorm, 3
+                        FailureMechanismCategoryType.LowerLimitNorm, 4
                     },
                     {
-                        FailureMechanismCategoryType.FactorizedLowerLimitNorm, 4
+                        FailureMechanismCategoryType.FactorizedLowerLimitNorm, 5
                     }
                 };
             }
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismExtensions.cs
===================================================================
diff -u -r8a3d8f25e6cea125fda6783db41e88aca1864ba7 -r1e14ee40087ad0c42f889f6ee86c13bf6d7d192b
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismExtensions.cs	(.../GrassCoverErosionOutwardsFailureMechanismExtensions.cs)	(revision 8a3d8f25e6cea125fda6783db41e88aca1864ba7)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismExtensions.cs	(.../GrassCoverErosionOutwardsFailureMechanismExtensions.cs)	(revision 1e14ee40087ad0c42f889f6ee86c13bf6d7d192b)
@@ -104,7 +104,8 @@
             return GetAssessmentLevelFromCalculations(hydraulicBoundaryLocation, calculations);
         }
 
-        private static RoundedDouble GetAssessmentLevelFromCalculations(HydraulicBoundaryLocation hydraulicBoundaryLocation, IEnumerable<HydraulicBoundaryLocationCalculation> calculations)
+        private static RoundedDouble GetAssessmentLevelFromCalculations(HydraulicBoundaryLocation hydraulicBoundaryLocation,
+                                                                        IEnumerable<HydraulicBoundaryLocationCalculation> calculations)
         {
             return calculations.FirstOrDefault(c => ReferenceEquals(c.HydraulicBoundaryLocation, hydraulicBoundaryLocation))?.Output?.Result
                    ?? RoundedDouble.NaN;
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs
===================================================================
diff -u -r8a3d8f25e6cea125fda6783db41e88aca1864ba7 -r1e14ee40087ad0c42f889f6ee86c13bf6d7d192b
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs)	(revision 8a3d8f25e6cea125fda6783db41e88aca1864ba7)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs)	(revision 1e14ee40087ad0c42f889f6ee86c13bf6d7d192b)
@@ -104,6 +104,7 @@
         [Test]
         public void GetAssessmentLevel_NoCorrespondingCalculation_ReturnsNaN()
         {
+            // Setup
             var assessmentSection = new AssessmentSectionStub();
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
 
@@ -119,6 +120,7 @@
         [Test]
         public void GetAssessmentLevel_NoCorrespondingAssessmentLevelOutput_ReturnsNaN()
         {
+            // Setup
             var assessmentSection = new AssessmentSectionStub();
             var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();