Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsCalculationsPropertiesTest.cs
===================================================================
diff -u -r965d5f2a969b047c100a6b06e5735b3a5d81b627 -re2cba843b032cb2c87af83354f7ebd41e3b03027
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsCalculationsPropertiesTest.cs	(.../GrassCoverErosionInwardsCalculationsPropertiesTest.cs)	(revision 965d5f2a969b047c100a6b06e5735b3a5d81b627)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsCalculationsPropertiesTest.cs	(.../GrassCoverErosionInwardsCalculationsPropertiesTest.cs)	(revision e2cba843b032cb2c87af83354f7ebd41e3b03027)
@@ -47,28 +47,28 @@
         private const int fbFactorPropertyIndex = 6;
         private const int fnFactorPropertyIndex = 7;
         private const int fshallowModelFactorPropertyIndex = 8;
-        private MockRepository mockRepository;
+        private MockRepository mocks;
 
         [SetUp]
         public void SetUp()
         {
-            mockRepository = new MockRepository();
+            mocks = new MockRepository();
         }
 
         [Test]
         public void Constructor_DataIsNull_ThrowArgumentNullException()
         {
             // Setup
-            var handler = mockRepository.Stub<IFailureMechanismPropertyChangeHandler<GrassCoverErosionInwardsFailureMechanism>>();
-            mockRepository.ReplayAll();
+            var handler = mocks.Stub<IFailureMechanismPropertyChangeHandler<GrassCoverErosionInwardsFailureMechanism>>();
+            mocks.ReplayAll();
 
             // Call
             void Call() => new GrassCoverErosionInwardsCalculationsProperties(null, handler);
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(Call).ParamName;
             Assert.AreEqual("data", paramName);
-            mockRepository.VerifyAll();
+            mocks.VerifyAll();
         }
 
         [Test]
@@ -86,8 +86,8 @@
         public void Constructor_ExpectedValues()
         {
             // Setup
-            var handler = mockRepository.Stub<IFailureMechanismPropertyChangeHandler<GrassCoverErosionInwardsFailureMechanism>>();
-            mockRepository.ReplayAll();
+            var handler = mocks.Stub<IFailureMechanismPropertyChangeHandler<GrassCoverErosionInwardsFailureMechanism>>();
+            mocks.ReplayAll();
 
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
 
@@ -117,15 +117,16 @@
 
             Assert.AreEqual(generalInput.FshallowModelFactor.Mean, properties.FshallowModelFactor.Mean);
             Assert.AreEqual(generalInput.FshallowModelFactor.StandardDeviation, properties.FshallowModelFactor.StandardDeviation);
-            mockRepository.VerifyAll();
+            
+            mocks.VerifyAll();
         }
 
         [Test]
         public void Constructor_Always_PropertiesHaveExpectedAttributeValues()
         {
             // Setup
-            var handler = mockRepository.Stub<IFailureMechanismPropertyChangeHandler<GrassCoverErosionInwardsFailureMechanism>>();
-            mockRepository.ReplayAll();
+            var handler = mocks.Stub<IFailureMechanismPropertyChangeHandler<GrassCoverErosionInwardsFailureMechanism>>();
+            mocks.ReplayAll();
 
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
 
@@ -208,7 +209,7 @@
                                                                             "De parameter 'Fondiep' die gebruikt wordt in de berekening.",
                                                                             true);
 
-            mockRepository.VerifyAll();
+            mocks.VerifyAll();
         }
 
         [Test]
@@ -219,8 +220,8 @@
         public void N_SetInvalidValue_ThrowsArgumentOutOfRangeExceptionNoNotifications(double newN)
         {
             // Setup
-            var observable = mockRepository.StrictMock<IObservable>();
-            mockRepository.ReplayAll();
+            var observable = mocks.StrictMock<IObservable>();
+            mocks.ReplayAll();
 
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
             var changeHandler = new FailureMechanismSetPropertyValueAfterConfirmationParameterTester<GrassCoverErosionInwardsFailureMechanism, double>(
@@ -242,7 +243,8 @@
             const string expectedMessage = "De waarde voor 'N' moet in het bereik [1,00, 20,00] liggen.";
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentOutOfRangeException>(Call, expectedMessage);
             Assert.IsTrue(changeHandler.Called);
-            mockRepository.VerifyAll();
+            
+            mocks.VerifyAll();
         }
 
         [Test]
@@ -252,9 +254,9 @@
         public void N_SetValidValue_UpdateDataAndNotifyObservers(double newN)
         {
             // Setup
-            var observable = mockRepository.StrictMock<IObservable>();
+            var observable = mocks.StrictMock<IObservable>();
             observable.Expect(o => o.NotifyObservers());
-            mockRepository.ReplayAll();
+            mocks.ReplayAll();
 
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
             var changeHandler = new FailureMechanismSetPropertyValueAfterConfirmationParameterTester<GrassCoverErosionInwardsFailureMechanism, double>(
@@ -275,7 +277,8 @@
             // Assert
             Assert.AreEqual(newN, failureMechanism.GeneralInput.N);
             Assert.IsTrue(changeHandler.Called);
-            mockRepository.VerifyAll();
+            
+            mocks.VerifyAll();
         }
     }
 }
\ No newline at end of file
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailurePathPropertiesTest.cs
===================================================================
diff -u -r0e9d074a8dd58198dbb156c497eb96979868b879 -re2cba843b032cb2c87af83354f7ebd41e3b03027
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailurePathPropertiesTest.cs	(.../GrassCoverErosionInwardsFailurePathPropertiesTest.cs)	(revision 0e9d074a8dd58198dbb156c497eb96979868b879)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailurePathPropertiesTest.cs	(.../GrassCoverErosionInwardsFailurePathPropertiesTest.cs)	(revision e2cba843b032cb2c87af83354f7ebd41e3b03027)
@@ -44,7 +44,20 @@
         private const int contributionPropertyIndex = 3;
         private const int isRelevantPropertyIndex = 4;
         private const int nPropertyIndex = 5;
+        private MockRepository mocks;
 
+        [SetUp]
+        public void SetUp()
+        {
+            mocks = new MockRepository();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            mocks.VerifyAll();
+        }
+
         [Test]
         [TestCase(true)]
         [TestCase(false)]
@@ -56,7 +69,6 @@
                 IsRelevant = isRelevant
             };
 
-            var mocks = new MockRepository();
             var handler = mocks.Stub<IFailureMechanismPropertyChangeHandler<GrassCoverErosionInwardsFailureMechanism>>();
             mocks.ReplayAll();
 
@@ -76,8 +88,6 @@
             Assert.AreEqual(generalInput.N,
                             properties.N,
                             properties.N.GetAccuracy());
-
-            mocks.VerifyAll();
         }
 
         [Test]
@@ -89,7 +99,6 @@
                 IsRelevant = true
             };
 
-            var mocks = new MockRepository();
             var handler = mocks.Stub<IFailureMechanismPropertyChangeHandler<GrassCoverErosionInwardsFailureMechanism>>();
             mocks.ReplayAll();
 
@@ -143,8 +152,6 @@
                                                                             lengthEffectCategory,
                                                                             "N* [-]",
                                                                             "De parameter 'N' die gebruikt wordt om het lengte-effect mee te nemen in de beoordeling (afgerond).");
-
-            mocks.VerifyAll();
         }
 
         [Test]
@@ -156,7 +163,6 @@
                 IsRelevant = false
             };
 
-            var mocks = new MockRepository();
             var handler = mocks.Stub<IFailureMechanismPropertyChangeHandler<GrassCoverErosionInwardsFailureMechanism>>();
             mocks.ReplayAll();
 
@@ -196,8 +202,6 @@
                                                                             "Is relevant",
                                                                             "Geeft aan of dit toetsspoor relevant is of niet.",
                                                                             true);
-
-            mocks.VerifyAll();
         }
 
         [Test]
@@ -208,9 +212,8 @@
         public void N_SetInvalidValue_ThrowsArgumentOutOfRangeExceptionNoNotifications(double newN)
         {
             // Setup
-            var mockRepository = new MockRepository();
-            var observable = mockRepository.StrictMock<IObservable>();
-            mockRepository.ReplayAll();
+            var observable = mocks.StrictMock<IObservable>();
+            mocks.ReplayAll();
 
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
             var handler = new FailureMechanismSetPropertyValueAfterConfirmationParameterTester<GrassCoverErosionInwardsFailureMechanism, RoundedDouble>(
@@ -230,7 +233,6 @@
             const string expectedMessage = "De waarde voor 'N' moet in het bereik [1,00, 20,00] liggen.";
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentOutOfRangeException>(Call, expectedMessage);
             Assert.IsTrue(handler.Called);
-            mockRepository.VerifyAll();
         }
 
         [Test]
@@ -240,10 +242,9 @@
         public void N_SetValidValue_UpdateDataAndNotifyObservers(double newN)
         {
             // Setup
-            var mockRepository = new MockRepository();
-            var observable = mockRepository.StrictMock<IObservable>();
+            var observable = mocks.StrictMock<IObservable>();
             observable.Expect(o => o.NotifyObservers());
-            mockRepository.ReplayAll();
+            mocks.ReplayAll();
 
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
             var handler = new FailureMechanismSetPropertyValueAfterConfirmationParameterTester<GrassCoverErosionInwardsFailureMechanism, RoundedDouble>(
@@ -262,7 +263,6 @@
             // Assert
             Assert.AreEqual(newN, failureMechanism.GeneralInput.N, failureMechanism.GeneralInput.N.GetAccuracy());
             Assert.IsTrue(handler.Called);
-            mockRepository.VerifyAll();
         }
 
         [Test]
@@ -271,7 +271,6 @@
         public void DynamicVisibleValidationMethod_DependingOnRelevancy_ReturnExpectedVisibility(bool isRelevant)
         {
             // Setup
-            var mocks = new MockRepository();
             var handler = mocks.Stub<IFailureMechanismPropertyChangeHandler<GrassCoverErosionInwardsFailureMechanism>>();
             mocks.ReplayAll();
 
@@ -291,8 +290,6 @@
             Assert.AreEqual(isRelevant, properties.DynamicVisibleValidationMethod(nameof(properties.N)));
 
             Assert.IsTrue(properties.DynamicVisibleValidationMethod(null));
-
-            mocks.VerifyAll();
         }
     }
 }
\ No newline at end of file