Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationOutputEntityReadExtensionsTest.cs
===================================================================
diff -u -r46d300b8932314e01403183fa15dc7f7cbdc7fd3 -rb8df616ca911988b921b933bead5f1ef6862d076
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationOutputEntityReadExtensionsTest.cs	(.../HydraulicLocationOutputEntityReadExtensionsTest.cs)	(revision 46d300b8932314e01403183fa15dc7f7cbdc7fd3)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationOutputEntityReadExtensionsTest.cs	(.../HydraulicLocationOutputEntityReadExtensionsTest.cs)	(revision b8df616ca911988b921b933bead5f1ef6862d076)
@@ -24,7 +24,6 @@
 using System.Linq;
 using Application.Ringtoets.Storage.DbContext;
 using Application.Ringtoets.Storage.Read;
-using Core.Common.Base.Data;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Hydraulics;
@@ -48,11 +47,7 @@
         }
 
         [Test]
-        [Combinatorial]
-        public void Read_ValidParameters_ReturnsHydraulicBoundaryLocationOutput(
-            [Values(HydraulicLocationOutputType.DesignWaterLevel, HydraulicLocationOutputType.WaveHeight)] HydraulicLocationOutputType outputType,
-            [Values(CalculationConvergence.CalculatedNotConverged, CalculationConvergence.CalculatedConverged,
-                CalculationConvergence.NotCalculated)] CalculationConvergence convergence)
+        public void Read_ValidParameters_ReturnsHydraulicBoundaryLocationOutput()
         {
             // Setup
             var random = new Random(22);
@@ -61,6 +56,7 @@
             double targetReliability = random.NextDouble();
             double calculatedProbability = random.NextDouble();
             double calculatedReliability = random.NextDouble();
+            var convergence = random.NextEnumValue<CalculationConvergence>();
             var entity = new HydraulicLocationOutputEntity
             {
                 Result = result,
@@ -85,11 +81,12 @@
         }
 
         [Test]
-        public void Read_NaNParameters_ReturnsHydraulicBoundaryLocationOutputWithNaN(
-            [Values(CalculationConvergence.CalculatedNotConverged, CalculationConvergence.CalculatedConverged,
-                CalculationConvergence.NotCalculated)] CalculationConvergence convergence)
+        public void Read_NaNParameters_ReturnsHydraulicBoundaryLocationOutputWithNaN()
         {
             // Setup
+            var random = new Random(21);
+            var convergence = random.NextEnumValue<CalculationConvergence>();
+
             var entity = new HydraulicLocationOutputEntity
             {
                 Result = double.NaN,