Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresCalculationsPropertiesTest.cs
===================================================================
diff -u -r0814459e445e9572094d8a44a299e7cd74244e47 -rb622ffe6a4bbd1f061efde51531949097906187f
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresCalculationsPropertiesTest.cs	(.../ClosingStructuresCalculationsPropertiesTest.cs)	(revision 0814459e445e9572094d8a44a299e7cd74244e47)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresCalculationsPropertiesTest.cs	(.../ClosingStructuresCalculationsPropertiesTest.cs)	(revision b622ffe6a4bbd1f061efde51531949097906187f)
@@ -21,11 +21,8 @@
 
 using System;
 using System.ComponentModel;
-using Core.Common.Base;
-using Core.Common.TestUtil;
 using Core.Gui.TestUtil;
 using NUnit.Framework;
-using Rhino.Mocks;
 using Riskeer.ClosingStructures.Data;
 using Riskeer.ClosingStructures.Forms.PropertyClasses;
 using Riskeer.Common.Data.TestUtil;
@@ -196,51 +193,5 @@
                                                                             "Modelfactor instromend volume.",
                                                                             true);
         }
-
-        [Test]
-        [SetCulture("nl-NL")]
-        [TestCase(-1)]
-        [TestCase(-20)]
-        [TestCase(41)]
-        public void N2A_SetInvalidValue_ThrowsArgumentOutOfRangeException(int newN)
-        {
-            // Setup
-            var failureMechanism = new ClosingStructuresFailureMechanism();
-
-            var properties = new ClosingStructuresFailurePathProperties(failureMechanism);
-
-            // Call
-            void Call() => properties.N2A = newN;
-
-            // Assert
-            const string expectedMessage = "De waarde voor 'N2A' moet in het bereik [0, 40] liggen.";
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentOutOfRangeException>(Call, expectedMessage);
-        }
-
-        [Test]
-        [TestCase(0)]
-        [TestCase(5)]
-        [TestCase(21)]
-        [TestCase(40)]
-        public void N2A_SetValidValue_UpdateDataAndNotifyObservers(int value)
-        {
-            // Setup
-            var mockRepository = new MockRepository();
-            var observer = mockRepository.StrictMock<IObserver>();
-            observer.Expect(o => o.UpdateObserver());
-            mockRepository.ReplayAll();
-
-            var failureMechanism = new ClosingStructuresFailureMechanism();
-            failureMechanism.Attach(observer);
-
-            var properties = new ClosingStructuresCalculationsProperties(failureMechanism);
-
-            // Call
-            properties.N2A = value;
-
-            // Assert
-            Assert.AreEqual(value, failureMechanism.GeneralInput.N2A);
-            mockRepository.VerifyAll();
-        }
     }
 }
\ No newline at end of file
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresFailureMechanismPropertiesTest.cs
===================================================================
diff -u -rd480fcf3bc481eecc0568ee40d2dfa808505f8c2 -rb622ffe6a4bbd1f061efde51531949097906187f
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresFailureMechanismPropertiesTest.cs	(.../ClosingStructuresFailureMechanismPropertiesTest.cs)	(revision d480fcf3bc481eecc0568ee40d2dfa808505f8c2)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresFailureMechanismPropertiesTest.cs	(.../ClosingStructuresFailureMechanismPropertiesTest.cs)	(revision b622ffe6a4bbd1f061efde51531949097906187f)
@@ -169,7 +169,11 @@
         public void N2A_SetInvalidValue_ThrowsArgumentOutOfRangeException(int newN)
         {
             // Setup
+            var mocks = new MockRepository();
+            var observer = mocks.StrictMock<IObserver>();
+
             var failureMechanism = new ClosingStructuresFailureMechanism();
+            failureMechanism.Attach(observer);
 
             var properties = new ClosingStructuresFailureMechanismProperties(failureMechanism, new ClosingStructuresFailureMechanismProperties.ConstructionProperties());
 
@@ -179,6 +183,8 @@
             // Assert
             const string expectedMessage = "De waarde voor 'N2A' moet in het bereik [0, 40] liggen.";
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentOutOfRangeException>(Call, expectedMessage);
+
+            mocks.VerifyAll();
         }
 
         [Test]
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresFailurePathPropertiesTest.cs
===================================================================
diff -u -r18b832c665c46cd9265da04b39b7d6c4a7e8cd0a -rb622ffe6a4bbd1f061efde51531949097906187f
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresFailurePathPropertiesTest.cs	(.../ClosingStructuresFailurePathPropertiesTest.cs)	(revision 18b832c665c46cd9265da04b39b7d6c4a7e8cd0a)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructuresFailurePathPropertiesTest.cs	(.../ClosingStructuresFailurePathPropertiesTest.cs)	(revision b622ffe6a4bbd1f061efde51531949097906187f)
@@ -19,13 +19,9 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.ComponentModel;
-using Core.Common.Base;
-using Core.Common.TestUtil;
 using Core.Gui.TestUtil;
 using NUnit.Framework;
-using Rhino.Mocks;
 using Riskeer.ClosingStructures.Data;
 using Riskeer.ClosingStructures.Forms.PropertyClasses;
 using Riskeer.Common.Data.TestUtil;
@@ -128,51 +124,5 @@
                                                                             "De parameter 'N' die gebruikt wordt om het lengte-effect mee te nemen in de beoordeling (afgerond).",
                                                                             true);
         }
-
-        [Test]
-        [SetCulture("nl-NL")]
-        [TestCase(-1)]
-        [TestCase(-20)]
-        [TestCase(41)]
-        public void N2A_SetInvalidValue_ThrowsArgumentOutOfRangeException(int newN)
-        {
-            // Setup
-            var failureMechanism = new ClosingStructuresFailureMechanism();
-
-            var properties = new ClosingStructuresFailurePathProperties(failureMechanism);
-
-            // Call
-            void Call() => properties.N2A = newN;
-
-            // Assert
-            const string expectedMessage = "De waarde voor 'N2A' moet in het bereik [0, 40] liggen.";
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentOutOfRangeException>(Call, expectedMessage);
-        }
-
-        [Test]
-        [TestCase(1)]
-        [TestCase(10)]
-        [TestCase(20)]
-        public void N2A_SetValidValue_UpdateDataAndNotifyObservers(int newN)
-        {
-            // Setup
-            var mocks = new MockRepository();
-            var observer = mocks.StrictMock<IObserver>();
-            observer.Expect(o => o.UpdateObserver());
-            mocks.ReplayAll();
-
-            var failureMechanism = new ClosingStructuresFailureMechanism();
-            failureMechanism.Attach(observer);
-
-            var properties = new ClosingStructuresFailurePathProperties(failureMechanism);
-
-            // Call
-            properties.N2A = newN;
-
-            // Assert
-            Assert.AreEqual(newN, failureMechanism.GeneralInput.N2A, failureMechanism.GeneralInput.N2A);
-
-            mocks.VerifyAll();
-        }
     }
 }
\ No newline at end of file