Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs
===================================================================
diff -u -r7a7964c2eb9844cb44c4c02a807bae60e67c4bfe -re1fb308ee037ad868246b1a38601f098f151a123
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs	(.../HeightStructuresInputTest.cs)	(revision 7a7964c2eb9844cb44c4c02a807bae60e67c4bfe)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs	(.../HeightStructuresInputTest.cs)	(revision e1fb308ee037ad868246b1a38601f098f151a123)
@@ -174,21 +174,20 @@
         }
 
         [Test]
-        [TestCase(400, 360)]
-        [TestCase(360.05, 360)]
-        [TestCase(-0.005, 0)]
-        [TestCase(-23, 0)]
-        public void Properties_StructureNormalOrientationInValidValues_ValueRoundedToValidValue(double invalidValue, double validValue)
+        [TestCase(400)]
+        [TestCase(360.05)]
+        [TestCase(-0.005)]
+        [TestCase(-23)]
+        public void Properties_StructureNormalOrientationInValidValues_ThrowsArgumentOutOfRangeException(double invalidValue)
         {
             // Setup
             var input = new HeightStructuresInput();
 
             // Call
-            input.OrientationOfTheNormalOfTheStructure = (RoundedDouble)invalidValue;
+            TestDelegate call = () => input.OrientationOfTheNormalOfTheStructure = (RoundedDouble)invalidValue;
 
             // Assert
-            Assert.AreEqual(2, input.OrientationOfTheNormalOfTheStructure.NumberOfDecimalPlaces);
-            AssertAreEqual(validValue, input.OrientationOfTheNormalOfTheStructure);
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentOutOfRangeException>(call, "De waarde voor de oriëntatie moet in het bereik tussen [0, 360] graden liggen.");
         }
 
         [Test]
@@ -294,7 +293,8 @@
         [Test]
         [TestCase(-0.1)]
         [TestCase(1.1)]
-        public void Properties_InvalidFailureProbabilityOfStructureGivenErosion_ExpectedValues(double failureProbabilityOfStructureGivenErosion)
+        [TestCase(double.NaN)]
+        public void Properties_InvalidFailureProbabilityOfStructureGivenErosion_ThrowArgumentOutOfRangeException(double failureProbabilityOfStructureGivenErosion)
         {
             // Setup
             var input = new HeightStructuresInput();
@@ -303,7 +303,7 @@
             TestDelegate call = () => input.FailureProbabilityOfStructureGivenErosion = (RoundedDouble) failureProbabilityOfStructureGivenErosion;
 
             // Assert
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, "De waarde voor de faalkans moet in het bereik tussen [0, 1] liggen.");
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentOutOfRangeException>(call, "De waarde voor de faalkans moet in het bereik tussen [0, 1] liggen.");
         }
 
         [Test]