Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationGroupContext.cs
===================================================================
diff -u -r82daf7501673e736db81576d6cf2cad2b4450e21 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationGroupContext.cs	(.../ClosingStructuresCalculationGroupContext.cs)	(revision 82daf7501673e736db81576d6cf2cad2b4450e21)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresCalculationGroupContext.cs	(.../ClosingStructuresCalculationGroupContext.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -43,7 +43,7 @@
         /// <exception cref="ArgumentNullException">Thrown when any of the input parameters are <c>null</c>.</exception>
         public ClosingStructuresCalculationGroupContext(CalculationGroup calculationGroup,
                                                         ClosingStructuresFailureMechanism failureMechanism,
-                                                        IAssessmentSection assessmentSection) :
-                                                            base(calculationGroup, failureMechanism, assessmentSection) {}
+                                                        IAssessmentSection assessmentSection)
+            : base(calculationGroup, failureMechanism, assessmentSection) {}
     }
 }
\ No newline at end of file
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresContextBase.cs
===================================================================
diff -u -r8587508c66a1bc0938465e97cf365cc1ef254f53 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresContextBase.cs	(.../ClosingStructuresContextBase.cs)	(revision 8587508c66a1bc0938465e97cf365cc1ef254f53)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresContextBase.cs	(.../ClosingStructuresContextBase.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -23,9 +23,7 @@
 using Core.Common.Base;
 using Core.Common.Controls.PresentationObjects;
 using Ringtoets.ClosingStructures.Data;
-using Ringtoets.ClosingStructures.Forms.Properties;
 using Ringtoets.Common.Data.AssessmentSection;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.ClosingStructures.Forms.PresentationObjects
 {
@@ -49,17 +47,12 @@
         {
             if (failureMechanism == null)
             {
-                string message = string.Format(RingtoetsCommonFormsResources.AssertInputsAreNotNull_DataDescription_0_cannot_be_null,
-                                               Resources.ClosingStructuresContextBase_DataDescription_ClosingStructuresFailureMechanism);
-                throw new ArgumentNullException("failureMechanism", message);
+                throw new ArgumentNullException("failureMechanism");
             }
 
             if (assessmentSection == null)
             {
-                string message = string.Format(RingtoetsCommonFormsResources.AssertInputsAreNotNull_DataDescription_0_cannot_be_null,
-                                               RingtoetsCommonFormsResources.FailureMechanismContext_DataDescription_AssessmentSection);
-
-                throw new ArgumentNullException("assessmentSection", message);
+                throw new ArgumentNullException("assessmentSection");
             }
 
             FailureMechanism = failureMechanism;
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -ree5ab18ca7554ffb2ce9546dd72b341da59f0345 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision ee5ab18ca7554ffb2ce9546dd72b341da59f0345)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -82,15 +82,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Het sluitings kunstwerk toetsspoor.
-        /// </summary>
-        public static string ClosingStructuresContextBase_DataDescription_ClosingStructuresFailureMechanism {
-            get {
-                return ResourceManager.GetString("ClosingStructuresContextBase_DataDescription_ClosingStructuresFailureMechanism", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Invoer.
         /// </summary>
         public static string ClosingStructuresInputContext_NodeDisplayName {
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.resx
===================================================================
diff -u -ree5ab18ca7554ffb2ce9546dd72b341da59f0345 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision ee5ab18ca7554ffb2ce9546dd72b341da59f0345)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="ClosingStructuresContextBase_DataDescription_ClosingStructuresFailureMechanism" xml:space="preserve">
-    <value>Het sluitings kunstwerk toetsspoor</value>
-  </data>
   <data name="ClosingStructuresInputContext_NodeDisplayName" xml:space="preserve">
     <value>Invoer</value>
   </data>
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
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Ringtoets.ClosingStructures.Forms.Test.csproj
===================================================================
diff -u -ree5ab18ca7554ffb2ce9546dd72b341da59f0345 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Ringtoets.ClosingStructures.Forms.Test.csproj	(.../Ringtoets.ClosingStructures.Forms.Test.csproj)	(revision ee5ab18ca7554ffb2ce9546dd72b341da59f0345)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Ringtoets.ClosingStructures.Forms.Test.csproj	(.../Ringtoets.ClosingStructures.Forms.Test.csproj)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -122,11 +122,6 @@
       <Project>{4843D6E5-066F-4795-94F5-1D53932DD03C}</Project>
       <Name>Ringtoets.Common.Data.TestUtil</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Data\Ringtoets.HydraRing.Data.csproj">
-      <Project>{70F8CC9C-5BC8-4FB2-B201-EAE7FA8088C2}</Project>
-      <Name>Ringtoets.HydraRing.Data</Name>
-      <Private>True</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.ClosingStructures.Data\Ringtoets.ClosingStructures.Data.csproj">
       <Project>{C6309704-D67B-434C-BC98-9F8910BC1D10}</Project>
       <Name>Ringtoets.ClosingStructures.Data</Name>
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismContext.cs
===================================================================
diff -u -r1d1714a744afa41c6da4d755e44d16f4dca7a355 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismContext.cs	(.../FailureMechanismContext.cs)	(revision 1d1714a744afa41c6da4d755e44d16f4dca7a355)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismContext.cs	(.../FailureMechanismContext.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -40,7 +40,10 @@
         public FailureMechanismContext(T wrappedFailureMechanism, IAssessmentSection parent)
             : base(wrappedFailureMechanism)
         {
-            AssertInputsAreNotNull(parent);
+            if (parent == null)
+            {
+                throw new ArgumentNullException("parent");
+            }
 
             Parent = parent;
         }
@@ -49,13 +52,5 @@
         /// Gets the parent of <see cref="WrappedObjectContextBase{T}.WrappedData"/>.
         /// </summary>
         public IAssessmentSection Parent { get; private set; }
-
-        private void AssertInputsAreNotNull(IAssessmentSection parent)
-        {
-            if (parent == null)
-            {
-                throw new ArgumentNullException("parent", "The assessment section cannot be null.");
-            }
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismContributionContext.cs
===================================================================
diff -u -r1d1714a744afa41c6da4d755e44d16f4dca7a355 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismContributionContext.cs	(.../FailureMechanismContributionContext.cs)	(revision 1d1714a744afa41c6da4d755e44d16f4dca7a355)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PresentationObjects/FailureMechanismContributionContext.cs	(.../FailureMechanismContributionContext.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -40,7 +40,10 @@
         public FailureMechanismContributionContext(FailureMechanismContribution wrappedContribution, IAssessmentSection contributionOwner)
             : base(wrappedContribution)
         {
-            AssertInputsAreNotNull(contributionOwner);
+            if (contributionOwner == null)
+            {
+                throw new ArgumentNullException("contributionOwner");
+            }
 
             Parent = contributionOwner;
         }
@@ -49,13 +52,5 @@
         /// Gets the assessment section to which <see cref="WrappedObjectContextBase{T}.WrappedData"/> belongs to.
         /// </summary>
         public IAssessmentSection Parent { get; private set; }
-
-        private void AssertInputsAreNotNull(IAssessmentSection contributionOwner)
-        {
-            if (contributionOwner == null)
-            {
-                throw new ArgumentNullException("contributionOwner", "Assessment section cannot be null.");
-            }
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r423010168fe01b2373e9be55f047659911e670f5 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 423010168fe01b2373e9be55f047659911e670f5)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -22,7 +22,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Runtime Version:4.0.30319.17929
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -92,15 +92,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to {0} mag niet &apos;null&apos; zijn..
-        /// </summary>
-        public static string AssertInputsAreNotNull_DataDescription_0_cannot_be_null {
-            get {
-                return ResourceManager.GetString("AssertInputsAreNotNull_DataDescription_0_cannot_be_null", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Waterstand met een overschrijdingsfrequentie gelijk aan de trajectnorm..
         /// </summary>
         public static string AssessmentLevel_Description {
@@ -813,15 +804,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Het traject.
-        /// </summary>
-        public static string FailureMechanismContext_DataDescription_AssessmentSection {
-            get {
-                return ResourceManager.GetString("FailureMechanismContext_DataDescription_AssessmentSection", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to I&amp;s relevant.
         /// </summary>
         public static string FailureMechanismContextMenuStrip_Is_relevant {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r423010168fe01b2373e9be55f047659911e670f5 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 423010168fe01b2373e9be55f047659911e670f5)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -625,12 +625,6 @@
   <data name="DataTypeDisplayName_csv_file_filter" xml:space="preserve">
     <value>Kommagescheiden bestand (*.csv)|*.csv</value>
   </data>
-  <data name="FailureMechanismContext_DataDescription_AssessmentSection" xml:space="preserve">
-    <value>Het traject</value>
-  </data>
-  <data name="AssertInputsAreNotNull_DataDescription_0_cannot_be_null" xml:space="preserve">
-    <value>{0} mag niet 'null' zijn.</value>
-  </data>
   <data name="CalculationIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\calculation_icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/FailureMechanismContributionContextTest.cs
===================================================================
diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/FailureMechanismContributionContextTest.cs	(.../FailureMechanismContributionContextTest.cs)	(revision ce31448a066c084f755439f3e7d453bfb042b291)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/FailureMechanismContributionContextTest.cs	(.../FailureMechanismContributionContextTest.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -67,8 +67,8 @@
             TestDelegate call = () => new FailureMechanismContributionContext(contribution, null);
 
             // Assert
-            const string expectedMessage = "Assessment section cannot be null.";
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(call, expectedMessage);
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("contributionOwner", exception.ParamName);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsCalculationContext.cs
===================================================================
diff -u -rdd95a590c807772d742ebe1b7e28611fa4931863 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsCalculationContext.cs	(.../GrassCoverErosionInwardsCalculationContext.cs)	(revision dd95a590c807772d742ebe1b7e28611fa4931863)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsCalculationContext.cs	(.../GrassCoverErosionInwardsCalculationContext.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -30,7 +30,8 @@
     /// Presentation object for all data required to configure an instance of <see cref="GrassCoverErosionInwardsCalculation"/>
     /// in order to prepare it for performing a calculation.
     /// </summary>
-    public class GrassCoverErosionInwardsCalculationContext : GrassCoverErosionInwardsContext<GrassCoverErosionInwardsCalculation>, ICalculationContext<GrassCoverErosionInwardsCalculation, GrassCoverErosionInwardsFailureMechanism>
+    public class GrassCoverErosionInwardsCalculationContext : GrassCoverErosionInwardsContext<GrassCoverErosionInwardsCalculation>,
+                                                              ICalculationContext<GrassCoverErosionInwardsCalculation, GrassCoverErosionInwardsFailureMechanism>
     {
         /// <summary>
         /// Creates a new instance of <see cref="GrassCoverErosionInwardsCalculationContext"/>.
@@ -39,7 +40,9 @@
         /// <param name="failureMechanism">The failure mechanism which the context belongs to.</param>
         /// <param name="assessmentSection">The assessment section which the calculation belongs to.</param>
         /// <exception cref="ArgumentNullException">When any input argument is <c>null</c>.</exception>
-        public GrassCoverErosionInwardsCalculationContext(GrassCoverErosionInwardsCalculation calculation, GrassCoverErosionInwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
+        public GrassCoverErosionInwardsCalculationContext(GrassCoverErosionInwardsCalculation calculation,
+                                                          GrassCoverErosionInwardsFailureMechanism failureMechanism,
+                                                          IAssessmentSection assessmentSection)
             : base(calculation, failureMechanism, assessmentSection) {}
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsCalculationGroupContext.cs
===================================================================
diff -u -rdd95a590c807772d742ebe1b7e28611fa4931863 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsCalculationGroupContext.cs	(.../GrassCoverErosionInwardsCalculationGroupContext.cs)	(revision dd95a590c807772d742ebe1b7e28611fa4931863)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsCalculationGroupContext.cs	(.../GrassCoverErosionInwardsCalculationGroupContext.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -31,7 +31,8 @@
     /// Presentation object for all data required to configure an instance of <see cref="CalculationGroup"/>
     /// in order be able to create configurable grass cover erosion inwards calculations.
     /// </summary>
-    public class GrassCoverErosionInwardsCalculationGroupContext : GrassCoverErosionInwardsContext<CalculationGroup>, ICalculationContext<CalculationGroup, GrassCoverErosionInwardsFailureMechanism>
+    public class GrassCoverErosionInwardsCalculationGroupContext : GrassCoverErosionInwardsContext<CalculationGroup>,
+                                                                   ICalculationContext<CalculationGroup, GrassCoverErosionInwardsFailureMechanism>
     {
         /// <summary>
         /// Creates a new instance of <see cref="GrassCoverErosionInwardsCalculationGroupContext"/>.
@@ -40,7 +41,9 @@
         /// <param name="failureMechanism">The failure mechanism which the context belongs to.</param>
         /// <param name="assessmentSection">The assessment section which the context belongs to.</param>
         /// <exception cref="ArgumentNullException">When any input argument is <c>null</c>.</exception>
-        public GrassCoverErosionInwardsCalculationGroupContext(CalculationGroup calculationsGroup, GrassCoverErosionInwardsFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
+        public GrassCoverErosionInwardsCalculationGroupContext(CalculationGroup calculationsGroup,
+                                                               GrassCoverErosionInwardsFailureMechanism failureMechanism,
+                                                               IAssessmentSection assessmentSection)
             : base(calculationsGroup, failureMechanism, assessmentSection) {}
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsContext.cs
===================================================================
diff -u -rd689ea05c1014eb4d51b927e11eb6c48255f0a47 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsContext.cs	(.../GrassCoverErosionInwardsContext.cs)	(revision d689ea05c1014eb4d51b927e11eb6c48255f0a47)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsContext.cs	(.../GrassCoverErosionInwardsContext.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -27,9 +27,7 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.DikeProfiles;
 using Ringtoets.GrassCoverErosionInwards.Data;
-using Ringtoets.GrassCoverErosionInwards.Forms.Properties;
 using Ringtoets.HydraRing.Data;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects
 {
@@ -54,17 +52,12 @@
         {
             if (failureMechanism == null)
             {
-                var message = string.Format(RingtoetsCommonFormsResources.AssertInputsAreNotNull_DataDescription_0_cannot_be_null,
-                                            Resources.GrassCoverErosionInwardsContext_DataDescription_GrassCoverErosionInwardsFailureMechanism);
-
-                throw new ArgumentNullException("failureMechanism", message);
+                throw new ArgumentNullException("failureMechanism");
             }
 
             if (assessmentSection == null)
             {
-                var message = string.Format(RingtoetsCommonFormsResources.AssertInputsAreNotNull_DataDescription_0_cannot_be_null,
-                                            RingtoetsCommonFormsResources.FailureMechanismContext_DataDescription_AssessmentSection);
-                throw new ArgumentNullException("assessmentSection", message);
+                throw new ArgumentNullException("assessmentSection");
             }
 
             FailureMechanism = failureMechanism;
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsInputContext.cs
===================================================================
diff -u -rd689ea05c1014eb4d51b927e11eb6c48255f0a47 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsInputContext.cs	(.../GrassCoverErosionInwardsInputContext.cs)	(revision d689ea05c1014eb4d51b927e11eb6c48255f0a47)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsInputContext.cs	(.../GrassCoverErosionInwardsInputContext.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -22,7 +22,6 @@
 using System;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.GrassCoverErosionInwards.Data;
-using Ringtoets.GrassCoverErosionInwards.Forms.Properties;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects
@@ -49,10 +48,7 @@
         {
             if (calculation == null)
             {
-                var message = string.Format(RingtoetsCommonFormsResources.AssertInputsAreNotNull_DataDescription_0_cannot_be_null,
-                                            Resources.GrassCoverErosionInwardsInputContext_DataDescription_GrassCoverErosionInwardsInputCalculationItem);
-
-                throw new ArgumentNullException("calculation", message);
+                throw new ArgumentNullException("calculation");
             }
 
             Calculation = calculation;
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rd689ea05c1014eb4d51b927e11eb6c48255f0a47 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision d689ea05c1014eb4d51b927e11eb6c48255f0a47)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -22,7 +22,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Runtime Version:4.0.30319.17929
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -236,16 +236,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Het grasbekleding erosie kruin en binnentalud toetsspoor.
-        /// </summary>
-        public static string GrassCoverErosionInwardsContext_DataDescription_GrassCoverErosionInwardsFailureMechanism {
-            get {
-                return ResourceManager.GetString("GrassCoverErosionInwardsContext_DataDescription_GrassCoverErosionInwardsFailureMe" +
-                        "chanism", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to De maatgevende berekening voor dit vak is niet uitgevoerd..
         /// </summary>
         public static string GrassCoverErosionInwardsFailureMechanismResultView_Calculation_not_calculated {
@@ -336,16 +326,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to De berekening.
-        /// </summary>
-        public static string GrassCoverErosionInwardsInputContext_DataDescription_GrassCoverErosionInwardsInputCalculationItem {
-            get {
-                return ResourceManager.GetString("GrassCoverErosionInwardsInputContext_DataDescription_GrassCoverErosionInwardsInpu" +
-                        "tCalculationItem", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Het berekende Hydraulisch Belasting Niveau (HBN)..
         /// </summary>
         public static string GrassCoverErosionInwardsOutput_DikeHeight_Description {
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx
===================================================================
diff -u -rd689ea05c1014eb4d51b927e11eb6c48255f0a47 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision d689ea05c1014eb4d51b927e11eb6c48255f0a47)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -117,12 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="GrassCoverErosionInwardsContext_DataDescription_GrassCoverErosionInwardsFailureMechanism" xml:space="preserve">
-    <value>Het grasbekleding erosie kruin en binnentalud toetsspoor</value>
-  </data>
-  <data name="GrassCoverErosionInwardsInputContext_DataDescription_GrassCoverErosionInwardsInputCalculationItem" xml:space="preserve">
-    <value>De berekening</value>
-  </data>
   <data name="Categories_CriticalValues" xml:space="preserve">
     <value>Toetseisen</value>
   </data>
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsContextTest.cs
===================================================================
diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsContextTest.cs	(.../GrassCoverErosionInwardsContextTest.cs)	(revision ce31448a066c084f755439f3e7d453bfb042b291)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsContextTest.cs	(.../GrassCoverErosionInwardsContextTest.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -23,7 +23,6 @@
 using System.Linq;
 using Core.Common.Base;
 using Core.Common.Controls.PresentationObjects;
-using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
@@ -41,8 +40,7 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
-            assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase).Return(null);
+            var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
             mockRepository.ReplayAll();
 
             var target = new ObservableObject();
@@ -65,7 +63,7 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
+            var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
             mockRepository.ReplayAll();
 
             var observableObject = new ObservableObject();
@@ -74,8 +72,8 @@
             TestDelegate call = () => new SimpleGrassCoverErosionInwardsContext<ObservableObject>(observableObject, null, assessmentSectionMock);
 
             // Assert
-            const string expectedMessage = "Het grasbekleding erosie kruin en binnentalud toetsspoor mag niet 'null' zijn.";
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(call, expectedMessage);
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("failureMechanism", exception.ParamName);
             mockRepository.VerifyAll();
         }
 
@@ -90,8 +88,8 @@
             TestDelegate call = () => new SimpleGrassCoverErosionInwardsContext<ObservableObject>(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);
         }
 
         [Test]
@@ -102,8 +100,8 @@
             hydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "name", 1.1, 2.2));
 
             var mockRepository = new MockRepository();
-            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
-            assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase).Repeat.Twice();
+            var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
+            assessmentSectionMock.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
             mockRepository.ReplayAll();
 
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsInputContextTest.cs
===================================================================
diff -u -r04012135e8adf6a03ce2928e047603435c9a186f -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsInputContextTest.cs	(.../GrassCoverErosionInwardsInputContextTest.cs)	(revision 04012135e8adf6a03ce2928e047603435c9a186f)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsInputContextTest.cs	(.../GrassCoverErosionInwardsInputContextTest.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -20,13 +20,11 @@
 // All rights reserved.
 
 using System;
-using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
-using Ringtoets.GrassCoverErosionInwards.Forms.Properties;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionInwards.Forms.Test.PresentationObjects
@@ -46,7 +44,7 @@
         public void ConstructorWithData_Always_ExpectedPropertiesSet()
         {
             // Setup
-            var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
+            var assessmentSectionMock = mocksRepository.Stub<IAssessmentSection>();
             mocksRepository.ReplayAll();
 
             var input = new GrassCoverErosionInwardsInput();
@@ -69,7 +67,7 @@
         public void Constructor_NullCalculation_ThrowsArgumentNullException()
         {
             // Setup
-            var assessmentSectionMock = mocksRepository.StrictMock<IAssessmentSection>();
+            var assessmentSectionMock = mocksRepository.Stub<IAssessmentSection>();
             mocksRepository.ReplayAll();
 
             var input = new GrassCoverErosionInwardsInput();
@@ -79,9 +77,8 @@
             TestDelegate test = () => new GrassCoverErosionInwardsInputContext(input, null, failureMechanism, assessmentSectionMock);
 
             // Assert
-            var expectedMessage = string.Format(RingtoetsCommonFormsResources.AssertInputsAreNotNull_DataDescription_0_cannot_be_null,
-                                                Resources.GrassCoverErosionInwardsInputContext_DataDescription_GrassCoverErosionInwardsInputCalculationItem);
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, expectedMessage);
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("calculation", exception.ParamName);
             mocksRepository.VerifyAll();
         }
     }
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresCalculationContext.cs
===================================================================
diff -u -rdd72cf407b7d0e9284d101bb2e2854e569b1a29a -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresCalculationContext.cs	(.../HeightStructuresCalculationContext.cs)	(revision dd72cf407b7d0e9284d101bb2e2854e569b1a29a)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresCalculationContext.cs	(.../HeightStructuresCalculationContext.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -30,7 +30,8 @@
     /// Presentation object for all data required to configure an instance of <see cref="HeightStructuresCalculation"/>
     /// in order to prepare it for performing a calculation.
     /// </summary>
-    public class HeightStructuresCalculationContext : HeightStructuresContextBase<HeightStructuresCalculation>, ICalculationContext<HeightStructuresCalculation, HeightStructuresFailureMechanism>
+    public class HeightStructuresCalculationContext : HeightStructuresContextBase<HeightStructuresCalculation>,
+                                                      ICalculationContext<HeightStructuresCalculation, HeightStructuresFailureMechanism>
     {
         /// <summary>
         /// Creates a new instance of <see cref="HeightStructuresCalculationContext"/>.
@@ -39,7 +40,9 @@
         /// <param name="failureMechanism">The failure mechanism which the context belongs to.</param>
         /// <param name="assessmentSection">The assessment section which the calculation belongs to.</param>
         /// <exception cref="ArgumentNullException">When any input argument is <c>null</c>.</exception>
-        public HeightStructuresCalculationContext(HeightStructuresCalculation calculation, HeightStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
+        public HeightStructuresCalculationContext(HeightStructuresCalculation calculation,
+                                                  HeightStructuresFailureMechanism failureMechanism,
+                                                  IAssessmentSection assessmentSection)
             : base(calculation, failureMechanism, assessmentSection) {}
     }
 }
\ No newline at end of file
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresCalculationGroupContext.cs
===================================================================
diff -u -rdd72cf407b7d0e9284d101bb2e2854e569b1a29a -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresCalculationGroupContext.cs	(.../HeightStructuresCalculationGroupContext.cs)	(revision dd72cf407b7d0e9284d101bb2e2854e569b1a29a)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresCalculationGroupContext.cs	(.../HeightStructuresCalculationGroupContext.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -31,7 +31,8 @@
     /// Presentation object for all data required to configure an instance of <see cref="CalculationGroup"/>
     /// in order be able to create configurable height structures calculations.
     /// </summary>
-    public class HeightStructuresCalculationGroupContext : HeightStructuresContextBase<CalculationGroup>, ICalculationContext<CalculationGroup, HeightStructuresFailureMechanism>
+    public class HeightStructuresCalculationGroupContext : HeightStructuresContextBase<CalculationGroup>,
+                                                           ICalculationContext<CalculationGroup, HeightStructuresFailureMechanism>
     {
         /// <summary>
         /// Creates a new instance of <see cref="HeightStructuresCalculationGroupContext"/>.
@@ -40,7 +41,9 @@
         /// <param name="failureMechanism">The failure mechanism which the context belongs to.</param>
         /// <param name="assessmentSection">The assessment section which the context belongs to.</param>
         /// <exception cref="ArgumentNullException">When any input argument is <c>null</c>.</exception>
-        public HeightStructuresCalculationGroupContext(CalculationGroup calculationsGroup, HeightStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
+        public HeightStructuresCalculationGroupContext(CalculationGroup calculationsGroup,
+                                                       HeightStructuresFailureMechanism failureMechanism,
+                                                       IAssessmentSection assessmentSection)
             : base(calculationsGroup, failureMechanism, assessmentSection) {}
     }
 }
\ No newline at end of file
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresContextBase.cs
===================================================================
diff -u -rdd72cf407b7d0e9284d101bb2e2854e569b1a29a -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresContextBase.cs	(.../HeightStructuresContextBase.cs)	(revision dd72cf407b7d0e9284d101bb2e2854e569b1a29a)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresContextBase.cs	(.../HeightStructuresContextBase.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -26,9 +26,7 @@
 using Core.Common.Controls.PresentationObjects;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.HeightStructures.Data;
-using Ringtoets.HeightStructures.Forms.Properties;
 using Ringtoets.HydraRing.Data;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.HeightStructures.Forms.PresentationObjects
 {
@@ -52,17 +50,12 @@
         {
             if (failureMechanism == null)
             {
-                var message = string.Format(RingtoetsCommonFormsResources.AssertInputsAreNotNull_DataDescription_0_cannot_be_null,
-                                            Resources.HeightStructuresContextBase_DataDescription_HeightStructuresFailureMechanism);
-
-                throw new ArgumentNullException("failureMechanism", message);
+                throw new ArgumentNullException("failureMechanism");
             }
 
             if (assessmentSection == null)
             {
-                var message = string.Format(RingtoetsCommonFormsResources.AssertInputsAreNotNull_DataDescription_0_cannot_be_null,
-                                            RingtoetsCommonFormsResources.FailureMechanismContext_DataDescription_AssessmentSection);
-                throw new ArgumentNullException("assessmentSection", message);
+                throw new ArgumentNullException("assessmentSection");
             }
 
             FailureMechanism = failureMechanism;
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r0d12e759b6e46290d83d04a6a5760fe467b339ab -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 0d12e759b6e46290d83d04a6a5760fe467b339ab)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -217,15 +217,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Het hoogte kunstwerk toetsspoor.
-        /// </summary>
-        public static string HeightStructuresContextBase_DataDescription_HeightStructuresFailureMechanism {
-            get {
-                return ResourceManager.GetString("HeightStructuresContextBase_DataDescription_HeightStructuresFailureMechanism", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Invoer.
         /// </summary>
         public static string HeightStructuresInputContext_NodeDisplayName {
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx
===================================================================
diff -u -r0d12e759b6e46290d83d04a6a5760fe467b339ab -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 0d12e759b6e46290d83d04a6a5760fe467b339ab)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="HeightStructuresContextBase_DataDescription_HeightStructuresFailureMechanism" xml:space="preserve">
-    <value>Het hoogte kunstwerk toetsspoor</value>
-  </data>
   <data name="HeightStructuresInputContext_NodeDisplayName" xml:space="preserve">
     <value>Invoer</value>
   </data>
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresContextBaseTest.cs
===================================================================
diff -u -rdd72cf407b7d0e9284d101bb2e2854e569b1a29a -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresContextBaseTest.cs	(.../HeightStructuresContextBaseTest.cs)	(revision dd72cf407b7d0e9284d101bb2e2854e569b1a29a)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresContextBaseTest.cs	(.../HeightStructuresContextBaseTest.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -23,7 +23,6 @@
 using System.Linq;
 using Core.Common.Base;
 using Core.Common.Controls.PresentationObjects;
-using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
@@ -41,7 +40,7 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
+            var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
             mockRepository.ReplayAll();
 
             var target = new ObservableObject();
@@ -63,7 +62,7 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
+            var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
             mockRepository.ReplayAll();
 
             var observableObject = new ObservableObject();
@@ -72,8 +71,8 @@
             TestDelegate call = () => new SimpleHeightStructuresContext<ObservableObject>(observableObject, null, assessmentSectionMock);
 
             // Assert
-            const string expectedMessage = "Het hoogte 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 SimpleHeightStructuresContext<ObservableObject>(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);
         }
 
         [Test]
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingCalculationGroupContext.cs
===================================================================
diff -u -rdd95a590c807772d742ebe1b7e28611fa4931863 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingCalculationGroupContext.cs	(.../PipingCalculationGroupContext.cs)	(revision dd95a590c807772d742ebe1b7e28611fa4931863)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingCalculationGroupContext.cs	(.../PipingCalculationGroupContext.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -44,7 +44,11 @@
         /// <param name="pipingFailureMechanism">The piping failure mechanism which the piping context belongs to.</param>
         /// <param name="assessmentSection">The assessment section which the piping context belongs to.</param>
         /// <exception cref="ArgumentNullException">When any input argument is <c>null</c>.</exception>
-        public PipingCalculationGroupContext(CalculationGroup calculationGroup, IEnumerable<RingtoetsPipingSurfaceLine> surfaceLines, IEnumerable<StochasticSoilModel> stochasticSoilModels, PipingFailureMechanism pipingFailureMechanism, IAssessmentSection assessmentSection)
+        public PipingCalculationGroupContext(CalculationGroup calculationGroup,
+                                             IEnumerable<RingtoetsPipingSurfaceLine> surfaceLines,
+                                             IEnumerable<StochasticSoilModel> stochasticSoilModels,
+                                             PipingFailureMechanism pipingFailureMechanism,
+                                             IAssessmentSection assessmentSection)
             : base(calculationGroup, surfaceLines, stochasticSoilModels, pipingFailureMechanism, assessmentSection) {}
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingCalculationScenarioContext.cs
===================================================================
diff -u -rdd95a590c807772d742ebe1b7e28611fa4931863 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingCalculationScenarioContext.cs	(.../PipingCalculationScenarioContext.cs)	(revision dd95a590c807772d742ebe1b7e28611fa4931863)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingCalculationScenarioContext.cs	(.../PipingCalculationScenarioContext.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -43,7 +43,11 @@
         /// <param name="pipingFailureMechanism">The piping failure mechanism which the piping context belongs to.</param>
         /// <param name="assessmentSection">The assessment section which the piping context belongs to.</param>
         /// <exception cref="ArgumentNullException">When any input argument is <c>null</c>.</exception>
-        public PipingCalculationScenarioContext(PipingCalculationScenario calculation, IEnumerable<RingtoetsPipingSurfaceLine> surfaceLines, IEnumerable<StochasticSoilModel> stochasticSoilModels, PipingFailureMechanism pipingFailureMechanism, IAssessmentSection assessmentSection)
+        public PipingCalculationScenarioContext(PipingCalculationScenario calculation,
+                                                IEnumerable<RingtoetsPipingSurfaceLine> surfaceLines,
+                                                IEnumerable<StochasticSoilModel> stochasticSoilModels,
+                                                PipingFailureMechanism pipingFailureMechanism,
+                                                IAssessmentSection assessmentSection)
             : base(calculation, surfaceLines, stochasticSoilModels, pipingFailureMechanism, assessmentSection) {}
     }
 }
\ No newline at end of file
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingContext.cs
===================================================================
diff -u -ree5ab18ca7554ffb2ce9546dd72b341da59f0345 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingContext.cs	(.../PipingContext.cs)	(revision ee5ab18ca7554ffb2ce9546dd72b341da59f0345)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingContext.cs	(.../PipingContext.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -27,9 +27,7 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.HydraRing.Data;
 using Ringtoets.Piping.Data;
-using Ringtoets.Piping.Forms.Properties;
 using Ringtoets.Piping.Primitives;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Piping.Forms.PresentationObjects
 {
@@ -113,27 +111,19 @@
         {
             if (surfaceLines == null)
             {
-                var message = string.Format(RingtoetsCommonFormsResources.AssertInputsAreNotNull_DataDescription_0_cannot_be_null,
-                                            Resources.PipingContext_DataDescription_Surfacelines);
-                throw new ArgumentNullException("surfaceLines", message);
+                throw new ArgumentNullException("surfaceLines");
             }
             if (stochasticSoilModels == null)
             {
-                var message = string.Format(RingtoetsCommonFormsResources.AssertInputsAreNotNull_DataDescription_0_cannot_be_null,
-                                            Resources.PipingContext_DataDescription_StochasticSoilModels);
-                throw new ArgumentNullException("stochasticSoilModels", message);
+                throw new ArgumentNullException("stochasticSoilModels");
             }
             if (pipingFailureMechanism == null)
             {
-                var message = string.Format(RingtoetsCommonFormsResources.AssertInputsAreNotNull_DataDescription_0_cannot_be_null,
-                                            Resources.PipingContext_DataDescription_PipingFailureMechanism);
-                throw new ArgumentNullException("pipingFailureMechanism", message);
+                throw new ArgumentNullException("pipingFailureMechanism");
             }
             if (assessmentSection == null)
             {
-                var message = string.Format(RingtoetsCommonFormsResources.AssertInputsAreNotNull_DataDescription_0_cannot_be_null,
-                                            RingtoetsCommonFormsResources.FailureMechanismContext_DataDescription_AssessmentSection);
-                throw new ArgumentNullException("assessmentSection", message);
+                throw new ArgumentNullException("assessmentSection");
             }
         }
     }
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingInputContext.cs
===================================================================
diff -u -rd689ea05c1014eb4d51b927e11eb6c48255f0a47 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingInputContext.cs	(.../PipingInputContext.cs)	(revision d689ea05c1014eb4d51b927e11eb6c48255f0a47)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingInputContext.cs	(.../PipingInputContext.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -23,9 +23,7 @@
 using System.Collections.Generic;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Piping.Data;
-using Ringtoets.Piping.Forms.Properties;
 using Ringtoets.Piping.Primitives;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.Piping.Forms.PresentationObjects
 {
@@ -56,10 +54,7 @@
         {
             if (calculation == null)
             {
-                var message = string.Format(RingtoetsCommonFormsResources.AssertInputsAreNotNull_DataDescription_0_cannot_be_null,
-                                            Resources.PipingContext_DataDescription_PipingCalculationItem);
-
-                throw new ArgumentNullException("calculation", message);
+                throw new ArgumentNullException("calculation");
             }
 
             PipingCalculation = calculation;
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rcd60fad8d8f19927154d3dc36b92a923b4bbbfc9 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision cd60fad8d8f19927154d3dc36b92a923b4bbbfc9)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -22,7 +22,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Runtime Version:4.0.30319.17929
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -527,42 +527,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to De berekening.
-        /// </summary>
-        public static string PipingContext_DataDescription_PipingCalculationItem {
-            get {
-                return ResourceManager.GetString("PipingContext_DataDescription_PipingCalculationItem", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Het piping toetsspoor.
-        /// </summary>
-        public static string PipingContext_DataDescription_PipingFailureMechanism {
-            get {
-                return ResourceManager.GetString("PipingContext_DataDescription_PipingFailureMechanism", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to De verzameling van stochastische ondergrondmodellen.
-        /// </summary>
-        public static string PipingContext_DataDescription_StochasticSoilModels {
-            get {
-                return ResourceManager.GetString("PipingContext_DataDescription_StochasticSoilModels", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to De verzameling van profielschematisaties.
-        /// </summary>
-        public static string PipingContext_DataDescription_Surfacelines {
-            get {
-                return ResourceManager.GetString("PipingContext_DataDescription_Surfacelines", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Dempingsfactor relateert respons van stijghoogte bij binnenteen aan buitenwaterstand..
         /// </summary>
         public static string PipingInput_DampingFactorExit_Description {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx
===================================================================
diff -u -rcd60fad8d8f19927154d3dc36b92a923b4bbbfc9 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision cd60fad8d8f19927154d3dc36b92a923b4bbbfc9)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -355,15 +355,6 @@
   <data name="Categories_Uplift" xml:space="preserve">
     <value>Opbarsten</value>
   </data>
-  <data name="PipingContext_DataDescription_Surfacelines" xml:space="preserve">
-    <value>De verzameling van profielschematisaties</value>
-  </data>
-  <data name="PipingContext_DataDescription_StochasticSoilModels" xml:space="preserve">
-    <value>De verzameling van stochastische ondergrondmodellen</value>
-  </data>
-  <data name="PipingContext_DataDescription_PipingFailureMechanism" xml:space="preserve">
-    <value>Het piping toetsspoor</value>
-  </data>
   <data name="DesignVariableTypeConverter_DesignValue_Description" xml:space="preserve">
     <value>De representatieve waarde die gebruikt wordt door de berekening.</value>
   </data>
@@ -580,9 +571,6 @@
   <data name="StochasticSoilModelCollection_DisplayName" xml:space="preserve">
     <value>Stochastische ondergrondmodellen</value>
   </data>
-  <data name="PipingContext_DataDescription_PipingCalculationItem" xml:space="preserve">
-    <value>De berekening</value>
-  </data>
   <data name="PipingScenarioView_PipingScenarioRow_FailureProbabilityHeave" xml:space="preserve">
     <value>Kans op heave [1/jaar]</value>
   </data>
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingContextTest.cs
===================================================================
diff -u -rcbe47edc5aec1175bceda95452ebe5697eda181d -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingContextTest.cs	(.../PipingContextTest.cs)	(revision cbe47edc5aec1175bceda95452ebe5697eda181d)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingContextTest.cs	(.../PipingContextTest.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -42,7 +42,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
             RingtoetsPipingSurfaceLine[] surfaceLines =
@@ -80,7 +80,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
             var failureMechanism = new PipingFailureMechanism();
@@ -94,11 +94,7 @@
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
-            string customMessage = exception.Message.Split(new[]
-            {
-                Environment.NewLine
-            }, StringSplitOptions.None)[0];
-            Assert.AreEqual("De verzameling van profielschematisaties mag niet 'null' zijn.", customMessage);
+            Assert.AreEqual("surfaceLines", exception.ParamName);
             mocks.VerifyAll();
         }
 
@@ -107,7 +103,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
             // Call
@@ -119,11 +115,7 @@
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
-            string customMessage = exception.Message.Split(new[]
-            {
-                Environment.NewLine
-            }, StringSplitOptions.None)[0];
-            Assert.AreEqual("De verzameling van stochastische ondergrondmodellen mag niet 'null' zijn.", customMessage);
+            Assert.AreEqual("stochasticSoilModels", exception.ParamName);
             mocks.VerifyAll();
         }
 
@@ -132,7 +124,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
             // Call
@@ -144,11 +136,7 @@
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
-            string customMessage = exception.Message.Split(new[]
-            {
-                Environment.NewLine
-            }, StringSplitOptions.None)[0];
-            Assert.AreEqual("Het piping toetsspoor mag niet 'null' zijn.", customMessage);
+            Assert.AreEqual("pipingFailureMechanism", exception.ParamName);
             mocks.VerifyAll();
         }
 
@@ -164,11 +152,7 @@
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
-            string customMessage = exception.Message.Split(new[]
-            {
-                Environment.NewLine
-            }, StringSplitOptions.None)[0];
-            Assert.AreEqual("Het traject mag niet 'null' zijn.", customMessage);
+            Assert.AreEqual("assessmentSection", exception.ParamName);
         }
 
         private class SimplePipingContext<T> : PipingContext<T> where T : IObservable
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingInputContextTest.cs
===================================================================
diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingInputContextTest.cs	(.../PipingInputContextTest.cs)	(revision ce31448a066c084f755439f3e7d453bfb042b291)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingInputContextTest.cs	(.../PipingInputContextTest.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -39,7 +39,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
             var calculation = new PipingCalculationScenario(new GeneralPipingInput());
@@ -73,7 +73,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var assessmentSectionMock = mocks.StrictMock<IAssessmentSection>();
+            var assessmentSectionMock = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
             var calculationInput = new PipingInput(new GeneralPipingInput());
@@ -91,8 +91,8 @@
             TestDelegate call = () => new PipingInputContext(calculationInput, null, surfaceLines, stochasticSoilModels, failureMechanism, assessmentSectionMock);
 
             // Assert
-            const string expectedMessage = "De berekening mag niet 'null' zijn.";
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(call, expectedMessage);
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("calculation", exception.ParamName);
             mocks.VerifyAll();
         }
     }
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationContext.cs
===================================================================
diff -u -r7a0eb8b2709b5c13d4711701213826b9cbd5aafe -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationContext.cs	(.../StabilityPointStructuresCalculationContext.cs)	(revision 7a0eb8b2709b5c13d4711701213826b9cbd5aafe)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationContext.cs	(.../StabilityPointStructuresCalculationContext.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -31,8 +31,7 @@
     /// in order to prepare it for performing a calculation.
     /// </summary>
     public class StabilityPointStructuresCalculationContext : StabilityPointStructuresContextBase<StabilityPointStructuresCalculation>,
-                                                              ICalculationContext<StabilityPointStructuresCalculation,
-                                                                  StabilityPointStructuresFailureMechanism>
+                                                              ICalculationContext<StabilityPointStructuresCalculation, StabilityPointStructuresFailureMechanism>
     {
         /// <summary>
         /// Creates a new instance of <see cref="StabilityPointStructuresCalculationContext"/>.
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationGroupContext.cs
===================================================================
diff -u -r7a0eb8b2709b5c13d4711701213826b9cbd5aafe -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationGroupContext.cs	(.../StabilityPointStructuresCalculationGroupContext.cs)	(revision 7a0eb8b2709b5c13d4711701213826b9cbd5aafe)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresCalculationGroupContext.cs	(.../StabilityPointStructuresCalculationGroupContext.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -32,8 +32,7 @@
     /// in order be able to create configurable stability point structures calculations.
     /// </summary>
     public class StabilityPointStructuresCalculationGroupContext : StabilityPointStructuresContextBase<CalculationGroup>,
-                                                                   ICalculationContext<CalculationGroup,
-                                                                       StabilityPointStructuresFailureMechanism>
+                                                                   ICalculationContext<CalculationGroup, StabilityPointStructuresFailureMechanism>
     {
         /// <summary>
         /// Creates a new instance of <see cref="StabilityPointStructuresCalculationGroupContext"/>.
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresFailureMechanismContext.cs
===================================================================
diff -u -re5f4a598d201934e48ab71795fb3b19cb9a960b1 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresFailureMechanismContext.cs	(.../StabilityPointStructuresFailureMechanismContext.cs)	(revision e5f4a598d201934e48ab71795fb3b19cb9a960b1)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresFailureMechanismContext.cs	(.../StabilityPointStructuresFailureMechanismContext.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -37,7 +37,8 @@
         /// <param name="failureMechanism">The <see cref="StabilityPointStructuresFailureMechanism"/> instance wrapped by this context object.</param>
         /// <param name="assessmentSection">The assessment section which the failure mechanism belongs to.</param>
         /// <exception cref="ArgumentNullException">When any input argument is <c>null</c>.</exception>
-        public StabilityPointStructuresFailureMechanismContext(StabilityPointStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection)
+        public StabilityPointStructuresFailureMechanismContext(StabilityPointStructuresFailureMechanism failureMechanism,
+                                                               IAssessmentSection assessmentSection)
             : base(failureMechanism, assessmentSection) {}
     }
 }
\ No newline at end of file
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverWaveConditionsCalculationContext.cs
===================================================================
diff -u -r86401a913aaf544979e4062d00acfe1fb24e1e4f -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverWaveConditionsCalculationContext.cs	(.../StabilityStoneCoverWaveConditionsCalculationContext.cs)	(revision 86401a913aaf544979e4062d00acfe1fb24e1e4f)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverWaveConditionsCalculationContext.cs	(.../StabilityStoneCoverWaveConditionsCalculationContext.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -40,7 +40,7 @@
         /// <exception cref="System.ArgumentNullException">Thrown when any input argument is <c>null</c>.</exception>
         public StabilityStoneCoverWaveConditionsCalculationContext(StabilityStoneCoverWaveConditionsCalculation wrappedData,
                                                                    StabilityStoneCoverFailureMechanism failureMechanism,
-                                                                   IAssessmentSection assessmentSection) :
-                                                                       base(wrappedData, failureMechanism, assessmentSection) {}
+                                                                   IAssessmentSection assessmentSection)
+            : base(wrappedData, failureMechanism, assessmentSection) {}
     }
 }
\ No newline at end of file
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverWaveConditionsCalculationGroupContext.cs
===================================================================
diff -u -r6c3a074511922fb175a1aa7f20168bbb6d63a688 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverWaveConditionsCalculationGroupContext.cs	(.../StabilityStoneCoverWaveConditionsCalculationGroupContext.cs)	(revision 6c3a074511922fb175a1aa7f20168bbb6d63a688)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverWaveConditionsCalculationGroupContext.cs	(.../StabilityStoneCoverWaveConditionsCalculationGroupContext.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -42,7 +42,7 @@
         /// <exception cref="ArgumentNullException">Thrown when any input argument is <c>null</c>.</exception>
         public StabilityStoneCoverWaveConditionsCalculationGroupContext(CalculationGroup calculationGroup,
                                                                         StabilityStoneCoverFailureMechanism failureMechanism,
-                                                                        IAssessmentSection assessmentSection) :
-                                                                            base(calculationGroup, failureMechanism, assessmentSection) {}
+                                                                        IAssessmentSection assessmentSection)
+            : base(calculationGroup, failureMechanism, assessmentSection) {}
     }
 }
\ No newline at end of file
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverContext.cs
===================================================================
diff -u -rd689ea05c1014eb4d51b927e11eb6c48255f0a47 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverContext.cs	(.../WaveImpactAsphaltCoverContext.cs)	(revision d689ea05c1014eb4d51b927e11eb6c48255f0a47)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverContext.cs	(.../WaveImpactAsphaltCoverContext.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -29,8 +29,6 @@
 using Ringtoets.HydraRing.Data;
 using Ringtoets.Revetment.Data;
 using Ringtoets.WaveImpactAsphaltCover.Data;
-using Ringtoets.WaveImpactAsphaltCover.Forms.Properties;
-using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.WaveImpactAsphaltCover.Forms.PresentationObjects
 {
@@ -55,17 +53,12 @@
         {
             if (failureMechanism == null)
             {
-                var message = string.Format(RingtoetsCommonFormsResources.AssertInputsAreNotNull_DataDescription_0_cannot_be_null,
-                                            Resources.WaveImpactAsphaltCoverContext_DataDescription_WaveImpactAsphaltCoverFailureMechanism);
-
-                throw new ArgumentNullException("failureMechanism", message);
+                throw new ArgumentNullException("failureMechanism");
             }
 
             if (assessmentSection == null)
             {
-                var message = string.Format(RingtoetsCommonFormsResources.AssertInputsAreNotNull_DataDescription_0_cannot_be_null,
-                                            RingtoetsCommonFormsResources.FailureMechanismContext_DataDescription_AssessmentSection);
-                throw new ArgumentNullException("assessmentSection", message);
+                throw new ArgumentNullException("assessmentSection");
             }
 
             FailureMechanism = failureMechanism;
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverWaveConditionsInputContext.cs
===================================================================
diff -u -rf230a482a0b8660e89e56caaa237fdea6b695163 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverWaveConditionsInputContext.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputContext.cs)	(revision f230a482a0b8660e89e56caaa237fdea6b695163)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverWaveConditionsInputContext.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputContext.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -47,7 +47,8 @@
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public WaveImpactAsphaltCoverWaveConditionsInputContext(WaveConditionsInput wrappedData,
                                                                 IEnumerable<ForeshoreProfile> foreshoreProfiles,
-                                                                IAssessmentSection assessmentSection) : base(wrappedData)
+                                                                IAssessmentSection assessmentSection)
+            : base(wrappedData)
         {
             if (foreshoreProfiles == null)
             {
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rdc0514a27cbec73b00a8465a1b15ab207dca4a84 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision dc0514a27cbec73b00a8465a1b15ab207dca4a84)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -82,16 +82,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Het golfklappen op asfalt toetsspoor.
-        /// </summary>
-        public static string WaveImpactAsphaltCoverContext_DataDescription_WaveImpactAsphaltCoverFailureMechanism {
-            get {
-                return ResourceManager.GetString("WaveImpactAsphaltCoverContext_DataDescription_WaveImpactAsphaltCoverFailureMechan" +
-                        "ism", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Asfalt.
         /// </summary>
         public static string WaveImpactAsphaltCoverWaveConditionsInputContextProperties_RevetmentType {
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Properties/Resources.resx
===================================================================
diff -u -rdc0514a27cbec73b00a8465a1b15ab207dca4a84 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision dc0514a27cbec73b00a8465a1b15ab207dca4a84)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="WaveImpactAsphaltCoverContext_DataDescription_WaveImpactAsphaltCoverFailureMechanism" xml:space="preserve">
-    <value>Het golfklappen op asfalt toetsspoor</value>
-  </data>
   <data name="WaveImpactAsphaltCoverWaveConditionsInputContextProperties_RevetmentType" xml:space="preserve">
     <value>Asfalt</value>
   </data>
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverContextTest.cs
===================================================================
diff -u -rd689ea05c1014eb4d51b927e11eb6c48255f0a47 -r438a524144f283209902ae89f058a134380c9538
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverContextTest.cs	(.../WaveImpactAsphaltCoverContextTest.cs)	(revision d689ea05c1014eb4d51b927e11eb6c48255f0a47)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverContextTest.cs	(.../WaveImpactAsphaltCoverContextTest.cs)	(revision 438a524144f283209902ae89f058a134380c9538)
@@ -47,8 +47,7 @@
         public void ParameteredConstructor_ExpectedValues()
         {
             // Setup
-            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
-            assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase).Return(null);
+            var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
             var target = mockRepository.StrictMock<IObservable>();
             mockRepository.ReplayAll();
 
@@ -70,16 +69,16 @@
         public void ParameteredConstructor_FailureMechanismIsNull_ThrowsArgumentNullException()
         {
             // Setup
-            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
+            var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
             var observableObject = mockRepository.StrictMock<IObservable>();
             mockRepository.ReplayAll();
 
             // Call
             TestDelegate call = () => new SimpleWaveImpactAsphaltCoverContext<IObservable>(observableObject, null, assessmentSectionMock);
 
             // Assert
-            const string expectedMessage = "Het golfklappen op asfalt toetsspoor mag niet 'null' zijn.";
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(call, expectedMessage);
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("failureMechanism", exception.ParamName);
             mockRepository.VerifyAll();
         }
 
@@ -95,8 +94,8 @@
             TestDelegate call = () => new SimpleWaveImpactAsphaltCoverContext<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);
             mockRepository.VerifyAll();
         }
 
@@ -107,8 +106,8 @@
             var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase();
             hydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(1, "name", 1.1, 2.2));
 
-            var assessmentSectionMock = mockRepository.StrictMock<IAssessmentSection>();
-            assessmentSectionMock.Expect(asm => asm.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase).Repeat.Twice();
+            var assessmentSectionMock = mockRepository.Stub<IAssessmentSection>();
+            assessmentSectionMock.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase;
             var target = mockRepository.StrictMock<IObservable>();
             mockRepository.ReplayAll();