Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
===================================================================
diff -u -re38a7c2baca2872af6319d535c6468133ea31fbc -r0d277f52d905e76b3983b760213d54f376ef6b78
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision e38a7c2baca2872af6319d535c6468133ea31fbc)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs	(.../RingtoetsProjectTestHelper.cs)	(revision 0d277f52d905e76b3983b760213d54f376ef6b78)
@@ -211,10 +211,8 @@
             var random = new Random(21);
             foreach (var sectionResult in sectionResults)
             {
-                var randomLayer2AResult = (AssessmentLayerTwoAResult) random.Next(0, Enum.GetValues(typeof(AssessmentLayerTwoAResult)).Length);
-
                 sectionResult.AssessmentLayerOne = GetAssessmentLayerOneState();
-                sectionResult.AssessmentLayerTwoA = randomLayer2AResult;
+                sectionResult.AssessmentLayerTwoA = GetAssessmentLayerTwoAResult();
                 sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble();
             }
         }
@@ -224,10 +222,8 @@
             var random = new Random(21);
             foreach (var sectionResult in sectionResults)
             {
-                var randomLayer2AResult = (AssessmentLayerTwoAResult) random.Next(0, Enum.GetValues(typeof(AssessmentLayerTwoAResult)).Length);
-
                 sectionResult.AssessmentLayerOne = GetAssessmentLayerOneState();
-                sectionResult.AssessmentLayerTwoA = randomLayer2AResult;
+                sectionResult.AssessmentLayerTwoA = GetAssessmentLayerTwoAResult();
                 sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble();
             }
         }
@@ -237,10 +233,8 @@
             var random = new Random(21);
             foreach (var sectionResult in sectionResults)
             {
-                var randomLayer2AResult = (AssessmentLayerTwoAResult) random.Next(0, Enum.GetValues(typeof(AssessmentLayerTwoAResult)).Length);
-
                 sectionResult.AssessmentLayerOne = GetAssessmentLayerOneState();
-                sectionResult.AssessmentLayerTwoA = randomLayer2AResult;
+                sectionResult.AssessmentLayerTwoA = GetAssessmentLayerTwoAResult();
                 sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble();
             }
         }
@@ -250,10 +244,8 @@
             var random = new Random(21);
             foreach (var sectionResult in sectionResults)
             {
-                var randomLayer2AResult = (AssessmentLayerTwoAResult) random.Next(0, Enum.GetValues(typeof(AssessmentLayerTwoAResult)).Length);
-
                 sectionResult.AssessmentLayerOne = GetAssessmentLayerOneState();
-                sectionResult.AssessmentLayerTwoA = randomLayer2AResult;
+                sectionResult.AssessmentLayerTwoA = GetAssessmentLayerTwoAResult();
                 sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble();
             }
         }
@@ -263,10 +255,8 @@
             var random = new Random(21);
             foreach (var sectionResult in sectionResults)
             {
-                var randomLayer2AResult = (AssessmentLayerTwoAResult) random.Next(0, Enum.GetValues(typeof(AssessmentLayerTwoAResult)).Length);
-
                 sectionResult.AssessmentLayerOne = GetAssessmentLayerOneState();
-                sectionResult.AssessmentLayerTwoA = randomLayer2AResult;
+                sectionResult.AssessmentLayerTwoA = GetAssessmentLayerTwoAResult();
                 sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble();
             }
         }
@@ -343,9 +333,15 @@
         private static AssessmentLayerOneState GetAssessmentLayerOneState()
         {
             var random = new Random(21);
-            return (AssessmentLayerOneState)random.Next(0, Enum.GetValues(typeof(AssessmentLayerOneState)).Length);
+            return (AssessmentLayerOneState) random.Next(1, Enum.GetValues(typeof(AssessmentLayerOneState)).Length + 1);
         }
 
+        private static AssessmentLayerTwoAResult GetAssessmentLayerTwoAResult()
+        {
+            var random = new Random(21);
+            return (AssessmentLayerTwoAResult) random.Next(1, Enum.GetValues(typeof(AssessmentLayerTwoAResult)).Length + 1);
+        }
+
         #region StabilityPointStructures FailureMechanism
 
         private static void ConfigureStabilityPointStructuresFailureMechanism(StabilityPointStructuresFailureMechanism failureMechanism,
@@ -953,10 +949,8 @@
             var random = new Random(21);
             foreach (var sectionResult in sectionResults)
             {
-                var randomLayer2AResult = (AssessmentLayerTwoAResult) random.Next(0, Enum.GetValues(typeof(AssessmentLayerTwoAResult)).Length);
-
                 sectionResult.AssessmentLayerOne = GetAssessmentLayerOneState();
-                sectionResult.AssessmentLayerTwoA = randomLayer2AResult;
+                sectionResult.AssessmentLayerTwoA = GetAssessmentLayerTwoAResult();
                 sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble();
             }
         }
@@ -1042,10 +1036,8 @@
             var random = new Random(21);
             foreach (var sectionResult in sectionResults)
             {
-                var randomLayer2AResult = (AssessmentLayerTwoAResult) random.Next(0, Enum.GetValues(typeof(AssessmentLayerTwoAResult)).Length);
-
                 sectionResult.AssessmentLayerOne = GetAssessmentLayerOneState();
-                sectionResult.AssessmentLayerTwoA = randomLayer2AResult;
+                sectionResult.AssessmentLayerTwoA = GetAssessmentLayerTwoAResult();
                 sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble();
             }
         }