Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs
===================================================================
diff -u -r3bc9f27cde286b18b043ec35d3308e33ca406f4f -r2d80165e4be156ca0f6963a3fc997874bee019ee
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs)	(revision 3bc9f27cde286b18b043ec35d3308e33ca406f4f)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs)	(revision 2d80165e4be156ca0f6963a3fc997874bee019ee)
@@ -89,104 +89,103 @@
         }
 
         [Test]
-        public void GetNormativeAssessmentLevel_HydraulicBoundaryLocationWithOutputAndNormTypeSignaling_ReturnsCorrespondingAssessmentLevel()
+        public void GetNormativeAssessmentLevel_HydraulicBoundaryLocationNull_ReturnsNaN()
         {
             // Setup
             var assessmentSection = new AssessmentSectionStub();
-            assessmentSection.FailureMechanismContribution.NormativeNorm = NormType.Signaling;
-
-            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
 
-            GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations(
-                failureMechanism, assessmentSection,
-                new[]
-                {
-                    hydraulicBoundaryLocation
-                }, true);
+            assessmentSection.FailureMechanismContribution.NormativeNorm = new Random(32).NextEnumValue<NormType>();
 
             // Call
-            RoundedDouble normativeAssessmentLevel = failureMechanism.GetNormativeAssessmentLevel(assessmentSection, hydraulicBoundaryLocation);
+            RoundedDouble normativeAssessmentLevel = failureMechanism.GetNormativeAssessmentLevel(assessmentSection, null);
 
             // Assert
-            Assert.AreEqual(failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm.ElementAt(0).Output.Result, normativeAssessmentLevel);
+            Assert.IsNaN(normativeAssessmentLevel);
         }
 
         [Test]
-        public void GetNormativeAssessmentLevel_HydraulicBoundaryLocationWithOutputAndNormTypeLowerLimit_ReturnsCorrespondingAssessmentLevel()
+        public void GetNormativeAssessmentLevel_NoCorrespondingCalculation_ReturnsNaN()
         {
-            // Setup
             var assessmentSection = new AssessmentSectionStub();
-            assessmentSection.FailureMechanismContribution.NormativeNorm = NormType.LowerLimit;
-
-            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
 
-            GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations(
-                failureMechanism, assessmentSection,
-                new[]
-                {
-                    hydraulicBoundaryLocation
-                }, true);
+            assessmentSection.FailureMechanismContribution.NormativeNorm = new Random(32).NextEnumValue<NormType>();
 
             // Call
-            RoundedDouble normativeAssessmentLevel = failureMechanism.GetNormativeAssessmentLevel(assessmentSection, hydraulicBoundaryLocation);
+            RoundedDouble normativeAssessmentLevel = failureMechanism.GetNormativeAssessmentLevel(assessmentSection, new TestHydraulicBoundaryLocation());
 
             // Assert
-            Assert.AreEqual(failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.ElementAt(0).Output.Result, normativeAssessmentLevel);
+            Assert.IsNaN(normativeAssessmentLevel);
         }
 
-        [TestCase(NormType.Signaling)]
-        [TestCase(NormType.LowerLimit)]
-        public void GetNormativeAssessmentLevel_HydraulicBoundaryLocationNull_ReturnsNaN(NormType normType)
+        [Test]
+        public void GetNormativeAssessmentLevel_NoCorrespondingAssessmentLevelOutput_ReturnsNaN()
         {
-            // Setup
             var assessmentSection = new AssessmentSectionStub();
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+
+            assessmentSection.FailureMechanismContribution.NormativeNorm = new Random(32).NextEnumValue<NormType>();
+            assessmentSection.SetHydraulicBoundaryLocationCalculations(new[]
+            {
+                hydraulicBoundaryLocation
+            });
+
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
 
             // Call
-            RoundedDouble normativeAssessmentLevel = failureMechanism.GetNormativeAssessmentLevel(assessmentSection, null);
+            RoundedDouble normativeAssessmentLevel = failureMechanism.GetNormativeAssessmentLevel(assessmentSection, hydraulicBoundaryLocation);
 
             // Assert
             Assert.IsNaN(normativeAssessmentLevel);
         }
 
-        [TestCase(NormType.Signaling)]
-        [TestCase(NormType.LowerLimit)]
-        public void GetNormativeAssessmentLevel_NoCorrespondingCalculation_ReturnsNaN(NormType normType)
+        [Test]
+        public void GetNormativeAssessmentLevel_HydraulicBoundaryLocationWithOutputAndNormTypeSignaling_ReturnsCorrespondingAssessmentLevel()
         {
+            // Setup
             var assessmentSection = new AssessmentSectionStub();
-            assessmentSection.FailureMechanismContribution.NormativeNorm = normType;
+            assessmentSection.FailureMechanismContribution.NormativeNorm = NormType.Signaling;
 
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
 
+            GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations(
+                failureMechanism, assessmentSection,
+                new[]
+                {
+                    hydraulicBoundaryLocation
+                }, true);
+
             // Call
-            RoundedDouble normativeAssessmentLevel = failureMechanism.GetNormativeAssessmentLevel(assessmentSection, new TestHydraulicBoundaryLocation());
+            RoundedDouble normativeAssessmentLevel = failureMechanism.GetNormativeAssessmentLevel(assessmentSection, hydraulicBoundaryLocation);
 
             // Assert
-            Assert.IsNaN(normativeAssessmentLevel);
+            Assert.AreEqual(failureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm.ElementAt(0).Output.Result, normativeAssessmentLevel);
         }
 
-        [TestCase(NormType.Signaling)]
-        [TestCase(NormType.LowerLimit)]
-        public void GetNormativeAssessmentLevel_NoCorrespondingAssessmentLevelOutput_ReturnsNaN(NormType normType)
+        [Test]
+        public void GetNormativeAssessmentLevel_HydraulicBoundaryLocationWithOutputAndNormTypeLowerLimit_ReturnsCorrespondingAssessmentLevel()
         {
+            // Setup
             var assessmentSection = new AssessmentSectionStub();
-            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+            assessmentSection.FailureMechanismContribution.NormativeNorm = NormType.LowerLimit;
 
-            assessmentSection.FailureMechanismContribution.NormativeNorm = normType;
-            assessmentSection.SetHydraulicBoundaryLocationCalculations(new[]
-            {
-                hydraulicBoundaryLocation
-            });
-
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
 
+            GrassCoverErosionOutwardsHydraulicBoundaryLocationsTestHelper.SetHydraulicBoundaryLocations(
+                failureMechanism, assessmentSection,
+                new[]
+                {
+                    hydraulicBoundaryLocation
+                }, true);
+
             // Call
             RoundedDouble normativeAssessmentLevel = failureMechanism.GetNormativeAssessmentLevel(assessmentSection, hydraulicBoundaryLocation);
 
             // Assert
-            Assert.IsNaN(normativeAssessmentLevel);
+            Assert.AreEqual(failureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.ElementAt(0).Output.Result, normativeAssessmentLevel);
         }
     }
 }
\ No newline at end of file