Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresContextBaseTest.cs
===================================================================
diff -u -r8587508c66a1bc0938465e97cf365cc1ef254f53 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresContextBaseTest.cs	(.../ClosingStructuresContextBaseTest.cs)	(revision 8587508c66a1bc0938465e97cf365cc1ef254f53)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresContextBaseTest.cs	(.../ClosingStructuresContextBaseTest.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -22,7 +22,6 @@
 using System;
 using Core.Common.Base;
 using Core.Common.Controls.PresentationObjects;
-using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.ClosingStructures.Data;
@@ -39,7 +38,7 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
+            var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
             var target = mockRepository.Stub<IObservable>();
             mockRepository.ReplayAll();
 
@@ -69,8 +68,8 @@
             TestDelegate call = () => new SimpleClosingStructuresContext<IObservable>(observableObject, null, assessmentSectionMock);
 
             // Assert
-            const string expectedMessage = "Het sluitings kunstwerk toetsspoor mag niet 'null' zijn.";
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(call, expectedMessage);
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("failureMechanism", exception.ParamName);
             mockRepository.VerifyAll();
         }
 
@@ -88,8 +87,8 @@
             TestDelegate call = () => new SimpleClosingStructuresContext<IObservable>(observableObject, failureMechanism, null);
 
             // Assert
-            const string expectedMessage = "Het traject mag niet 'null' zijn.";
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(call, expectedMessage);
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("assessmentSection", exception.ParamName);
         }
 
         private class SimpleClosingStructuresContext<T> : ClosingStructuresContextBase<T> where T : IObservable