Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -rb6e0f8d41d92ed18c902138dd49cce6e703ee883 -rbcd1a835c8d39b06f4934b040d6ea45fa44b2ee5
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismSectionResultCreateExtensionsTest.cs	(.../ClosingStructuresFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision b6e0f8d41d92ed18c902138dd49cce6e703ee883)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismSectionResultCreateExtensionsTest.cs	(.../ClosingStructuresFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision bcd1a835c8d39b06f4934b040d6ea45fa44b2ee5)
@@ -25,6 +25,7 @@
 using Application.Ringtoets.Storage.DbContext;
 using Application.Ringtoets.Storage.TestUtil;
 using Core.Common.Base.Data;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.ClosingStructures.Data;
 using Ringtoets.Common.Data.FailureMechanism;
@@ -49,17 +50,17 @@
         }
 
         [Test]
-        [Combinatorial]
-        public void Create_WithDifferentResults_ReturnsEntityWithExpectedResults(
-            [Values(AssessmentLayerOneState.NotAssessed, AssessmentLayerOneState.NoVerdict,
-                AssessmentLayerOneState.Sufficient)] AssessmentLayerOneState assessmentLayerOneResult,
-            [Values(0.2, 0.5)] double assessmentLayerThreeResult)
+        public void Create_WithDifferentResults_ReturnsEntityWithExpectedResults()
         {
             // Setup
+            var random = new Random(21);
+            var assessmentLayerOneResult = random.NextEnumValue<AssessmentLayerOneState>();
+            RoundedDouble assessmentLayerThreeResult = random.NextRoundedDouble();
+
             var sectionResult = new ClosingStructuresFailureMechanismSectionResult(new TestFailureMechanismSection())
             {
                 AssessmentLayerOne = assessmentLayerOneResult,
-                AssessmentLayerThree = (RoundedDouble) assessmentLayerThreeResult
+                AssessmentLayerThree = assessmentLayerThreeResult
             };
 
             // Call
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -rb6e0f8d41d92ed18c902138dd49cce6e703ee883 -rbcd1a835c8d39b06f4934b040d6ea45fa44b2ee5
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismSectionResultCreateExtensionsTest.cs	(.../GrassCoverErosionInwardsFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision b6e0f8d41d92ed18c902138dd49cce6e703ee883)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismSectionResultCreateExtensionsTest.cs	(.../GrassCoverErosionInwardsFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision bcd1a835c8d39b06f4934b040d6ea45fa44b2ee5)
@@ -25,6 +25,7 @@
 using Application.Ringtoets.Storage.DbContext;
 using Application.Ringtoets.Storage.TestUtil;
 using Core.Common.Base.Data;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.GrassCoverErosionInwards.Data;
@@ -49,16 +50,17 @@
 
         [Test]
         [Combinatorial]
-        public void Create_WithDifferentResults_ReturnsEntityWithExpectedResults(
-            [Values(AssessmentLayerOneState.NotAssessed, AssessmentLayerOneState.NoVerdict,
-                AssessmentLayerOneState.Sufficient)] AssessmentLayerOneState assessmentLayerOneResult,
-            [Values(0.2, 0.5)] double assessmentLayerThreeResult)
+        public void Create_WithDifferentResults_ReturnsEntityWithExpectedResults()
         {
             // Setup
+            var random = new Random(21);
+            var assessmentLayerOneResult = random.NextEnumValue<AssessmentLayerOneState>();
+            RoundedDouble assessmentLayerThreeResult = random.NextRoundedDouble();
+
             var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(new TestFailureMechanismSection())
             {
                 AssessmentLayerOne = assessmentLayerOneResult,
-                AssessmentLayerThree = (RoundedDouble) assessmentLayerThreeResult
+                AssessmentLayerThree = assessmentLayerThreeResult
             };
 
             var registry = new PersistenceRegistry();
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HeightStructures/HeightStructuresFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -rb6e0f8d41d92ed18c902138dd49cce6e703ee883 -rbcd1a835c8d39b06f4934b040d6ea45fa44b2ee5
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HeightStructures/HeightStructuresFailureMechanismSectionResultCreateExtensionsTest.cs	(.../HeightStructuresFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision b6e0f8d41d92ed18c902138dd49cce6e703ee883)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HeightStructures/HeightStructuresFailureMechanismSectionResultCreateExtensionsTest.cs	(.../HeightStructuresFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision bcd1a835c8d39b06f4934b040d6ea45fa44b2ee5)
@@ -25,6 +25,7 @@
 using Application.Ringtoets.Storage.DbContext;
 using Application.Ringtoets.Storage.TestUtil;
 using Core.Common.Base.Data;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Structures;
@@ -50,16 +51,17 @@
 
         [Test]
         [Combinatorial]
-        public void Create_WithDifferentResults_ReturnsEntityWithExpectedResults(
-            [Values(AssessmentLayerOneState.NotAssessed, AssessmentLayerOneState.NoVerdict,
-                AssessmentLayerOneState.Sufficient)] AssessmentLayerOneState assessmentLayerOneResult,
-            [Values(0.2, 0.5)] double assessmentLayerThreeResult)
+        public void Create_WithDifferentResults_ReturnsEntityWithExpectedResults()
         {
             // Setup
+            var random = new Random(21);
+            var assessmentLayerOneResult = random.NextEnumValue<AssessmentLayerOneState>();
+            RoundedDouble assessmentLayerThreeResult = random.NextRoundedDouble();
+
             var sectionResult = new HeightStructuresFailureMechanismSectionResult(new TestFailureMechanismSection())
             {
                 AssessmentLayerOne = assessmentLayerOneResult,
-                AssessmentLayerThree = (RoundedDouble) assessmentLayerThreeResult
+                AssessmentLayerThree = assessmentLayerThreeResult
             };
 
             // Call
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -rb6e0f8d41d92ed18c902138dd49cce6e703ee883 -rbcd1a835c8d39b06f4934b040d6ea45fa44b2ee5
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingFailureMechanismSectionResultCreateExtensionsTest.cs	(.../PipingFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision b6e0f8d41d92ed18c902138dd49cce6e703ee883)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingFailureMechanismSectionResultCreateExtensionsTest.cs	(.../PipingFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision bcd1a835c8d39b06f4934b040d6ea45fa44b2ee5)
@@ -24,6 +24,7 @@
 using Application.Ringtoets.Storage.DbContext;
 using Application.Ringtoets.Storage.TestUtil;
 using Core.Common.Base.Data;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Piping.Data;
@@ -35,16 +36,17 @@
     {
         [Test]
         [Combinatorial]
-        public void Create_WithDifferentResults_ReturnsEntityWithExpectedResults(
-            [Values(AssessmentLayerOneState.NotAssessed, AssessmentLayerOneState.NoVerdict,
-                AssessmentLayerOneState.Sufficient)] AssessmentLayerOneState assessmentLayerOneResult,
-            [Values(0.2, 0.5)] double assessmentLayerThreeResult)
+        public void Create_WithDifferentResults_ReturnsEntityWithExpectedResults()
         {
             // Setup
+            var random = new Random(21);
+            var assessmentLayerOneResult = random.NextEnumValue<AssessmentLayerOneState>();
+            RoundedDouble assessmentLayerThreeResult = random.NextRoundedDouble();
+
             var sectionResult = new PipingFailureMechanismSectionResult(new TestFailureMechanismSection())
             {
                 AssessmentLayerOne = assessmentLayerOneResult,
-                AssessmentLayerThree = (RoundedDouble) assessmentLayerThreeResult
+                AssessmentLayerThree = assessmentLayerThreeResult
             };
 
             // Call
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -rb6e0f8d41d92ed18c902138dd49cce6e703ee883 -rbcd1a835c8d39b06f4934b040d6ea45fa44b2ee5
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismSectionResultCreateExtensionsTest.cs	(.../StabilityPointStructuresFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision b6e0f8d41d92ed18c902138dd49cce6e703ee883)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismSectionResultCreateExtensionsTest.cs	(.../StabilityPointStructuresFailureMechanismSectionResultCreateExtensionsTest.cs)	(revision bcd1a835c8d39b06f4934b040d6ea45fa44b2ee5)
@@ -25,6 +25,7 @@
 using Application.Ringtoets.Storage.DbContext;
 using Application.Ringtoets.Storage.TestUtil;
 using Core.Common.Base.Data;
+using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Structures;
@@ -50,16 +51,17 @@
 
         [Test]
         [Combinatorial]
-        public void Create_VariousResults_ReturnsEntity(
-            [Values(AssessmentLayerOneState.NotAssessed, AssessmentLayerOneState.NoVerdict,
-                AssessmentLayerOneState.Sufficient)] AssessmentLayerOneState assessmentLayerOneResult,
-            [Values(0.2, 0.5)] double assessmentLayerThreeResult)
+        public void Create_VariousResults_ReturnsEntity()
         {
             // Setup
+            var random = new Random(21);
+            var assessmentLayerOneResult = random.NextEnumValue<AssessmentLayerOneState>();
+            RoundedDouble assessmentLayerThreeResult = random.NextRoundedDouble();
+
             var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(new TestFailureMechanismSection())
             {
                 AssessmentLayerOne = assessmentLayerOneResult,
-                AssessmentLayerThree = (RoundedDouble) assessmentLayerThreeResult
+                AssessmentLayerThree = assessmentLayerThreeResult
             };
 
             // Call