Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs
===================================================================
diff -u -r1a595dde70f3b4eadd73cab397c994825bdb13ab -r3de205c4bad95d8d024286cff66c99320c2cec82
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs	(.../DesignWaterLevelCalculationActivityTest.cs)	(revision 1a595dde70f3b4eadd73cab397c994825bdb13ab)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs	(.../DesignWaterLevelCalculationActivityTest.cs)	(revision 3de205c4bad95d8d024286cff66c99320c2cec82)
@@ -325,8 +325,10 @@
                     CalculationServiceTestHelper.AssertValidationEndMessage(messages[2]);
                     CalculationServiceTestHelper.AssertCalculationStartMessage(messages[3]);
 
-                    string errorMessage = GetErrorMessage(endInFailure, lastErrorFileContent);
-                    Assert.AreEqual($"Er is een fout opgetreden tijdens de toetspeil berekening 'locationName' (Categorie {categoryBoundaryName}). {errorMessage}", messages[4]);
+                    string expectedFailureMessage = string.IsNullOrEmpty(lastErrorFileContent)
+                                                        ? $"Er is een fout opgetreden tijdens de toetspeil berekening '{locationName}' (Categorie {categoryBoundaryName}). Er is geen foutrapport beschikbaar."
+                                                        : $"Er is een fout opgetreden tijdens de toetspeil berekening '{locationName}' (Categorie {categoryBoundaryName}). Bekijk het foutrapport door op details te klikken.{Environment.NewLine}{lastErrorFileContent}";
+                    Assert.AreEqual(expectedFailureMessage, messages[4]);
 
                     StringAssert.StartsWith("Waterstand berekening is uitgevoerd op de tijdelijke locatie", messages[5]);
                     CalculationServiceTestHelper.AssertCalculationEndMessage(messages[6]);
@@ -424,25 +426,6 @@
             mockRepository.VerifyAll();
         }
 
-        private static string GetErrorMessage(bool endInFailure, string lastErrorFileContent)
-        {
-            string errorMessage;
-            if (endInFailure && string.IsNullOrEmpty(lastErrorFileContent))
-            {
-                errorMessage = "Er is geen foutrapport beschikbaar.";
-            }
-            else if (endInFailure)
-            {
-                errorMessage = "Bekijk het foutrapport door op details te klikken.\r\nLastErrorFileContentAndEndInFailure";
-            }
-            else
-            {
-                errorMessage = "Bekijk het foutrapport door op details te klikken.\r\nLastErrorFileContent";
-            }
-
-            return errorMessage;
-        }
-
         private static string GetActivityDescription(string locationName, string categoryBoundaryName)
         {
             return $"Waterstand berekenen voor locatie '{locationName}' (Categorie {categoryBoundaryName})";
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs
===================================================================
diff -u -r531e2f1120cde8519e8d18b580934c0bb67ca834 -r3de205c4bad95d8d024286cff66c99320c2cec82
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision 531e2f1120cde8519e8d18b580934c0bb67ca834)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision 3de205c4bad95d8d024286cff66c99320c2cec82)
@@ -325,8 +325,10 @@
                     CalculationServiceTestHelper.AssertValidationEndMessage(messages[2]);
                     CalculationServiceTestHelper.AssertCalculationStartMessage(messages[3]);
 
-                    string errorMessage = GetErrorMessage(endInFailure, lastErrorFileContent);
-                    Assert.AreEqual($"Er is een fout opgetreden tijdens de golfhoogte berekening 'locationName' (Categorie {categoryBoundaryName}). {errorMessage}", messages[4]);
+                    string expectedFailureMessage = string.IsNullOrEmpty(lastErrorFileContent)
+                                                        ? $"Er is een fout opgetreden tijdens de golfhoogte berekening '{locationName}' (Categorie {categoryBoundaryName}). Er is geen foutrapport beschikbaar."
+                                                        : $"Er is een fout opgetreden tijdens de golfhoogte berekening '{locationName}' (Categorie {categoryBoundaryName}). Bekijk het foutrapport door op details te klikken.{Environment.NewLine}{lastErrorFileContent}";
+                    Assert.AreEqual(expectedFailureMessage, messages[4]);
 
                     StringAssert.StartsWith("Golfhoogte berekening is uitgevoerd op de tijdelijke locatie", messages[5]);
                     CalculationServiceTestHelper.AssertCalculationEndMessage(messages[6]);
@@ -424,25 +426,6 @@
             mockRepository.VerifyAll();
         }
 
-        private static string GetErrorMessage(bool endInFailure, string lastErrorFileContent)
-        {
-            string errorMessage;
-            if (endInFailure && string.IsNullOrEmpty(lastErrorFileContent))
-            {
-                errorMessage = "Er is geen foutrapport beschikbaar.";
-            }
-            else if (endInFailure)
-            {
-                errorMessage = "Bekijk het foutrapport door op details te klikken.\r\nLastErrorFileContentAndEndInFailure";
-            }
-            else
-            {
-                errorMessage = "Bekijk het foutrapport door op details te klikken.\r\nLastErrorFileContent";
-            }
-
-            return errorMessage;
-        }
-
         private static string GetActivityDescription(string locationName, string categoryBoundaryName)
         {
             return $"Golfhoogte berekenen voor locatie '{locationName}' (Categorie {categoryBoundaryName})";
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/GuiServices/DuneLocationCalculationGuiServiceTest.cs
===================================================================
diff -u -ra248242529e2d1283b616d751ab5d90b387f70e1 -r3de205c4bad95d8d024286cff66c99320c2cec82
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/GuiServices/DuneLocationCalculationGuiServiceTest.cs	(.../DuneLocationCalculationGuiServiceTest.cs)	(revision a248242529e2d1283b616d751ab5d90b387f70e1)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/GuiServices/DuneLocationCalculationGuiServiceTest.cs	(.../DuneLocationCalculationGuiServiceTest.cs)	(revision 3de205c4bad95d8d024286cff66c99320c2cec82)
@@ -60,7 +60,7 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            var assessmentSection = mockRepository.StrictMock<IAssessmentSection>();
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             mockRepository.ReplayAll();
 
             using (var viewParent = new Form())
@@ -111,8 +111,8 @@
             };
 
             var mockRepository = new MockRepository();
-            var assessmentSection = mockRepository.StrictMock<IAssessmentSection>();
-            assessmentSection.Expect(a => a.HydraulicBoundaryDatabase)
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
+            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase)
                              .Return(hydraulicBoundaryDatabase)
                              .Repeat.Any();
             mockRepository.ReplayAll();
@@ -149,8 +149,8 @@
             };
 
             var mockRepository = new MockRepository();
-            var assessmentSection = mockRepository.StrictMock<IAssessmentSection>();
-            assessmentSection.Expect(a => a.HydraulicBoundaryDatabase)
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
+            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase)
                              .Return(hydraulicBoundaryDatabase)
                              .Repeat.Any();
             mockRepository.ReplayAll();
@@ -182,8 +182,8 @@
             };
 
             var mockRepository = new MockRepository();
-            var assessmentSection = mockRepository.StrictMock<IAssessmentSection>();
-            assessmentSection.Expect(a => a.HydraulicBoundaryDatabase)
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
+            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase)
                              .Return(hydraulicBoundaryDatabase)
                              .Repeat.Any();
             mockRepository.ReplayAll();
@@ -225,8 +225,8 @@
             var calculatorFactory = mockRepository.StrictMock<IHydraRingCalculatorFactory>();
             calculatorFactory.Expect(cf => cf.CreateDunesBoundaryConditionsCalculator(testDataPath, validPreprocessorDirectory))
                              .Return(new TestDunesBoundaryConditionsCalculator());
-            var assessmentSection = mockRepository.StrictMock<IAssessmentSection>();
-            assessmentSection.Expect(a => a.HydraulicBoundaryDatabase)
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
+            assessmentSection.Stub(a => a.HydraulicBoundaryDatabase)
                              .Return(hydraulicBoundaryDatabase)
                              .Repeat.Any();
             mockRepository.ReplayAll();
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneLocationCalculationActivityFactoryTest.cs
===================================================================
diff -u -rfabee9b107b96b8b97f04662b18fc95d061b5e98 -r3de205c4bad95d8d024286cff66c99320c2cec82
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneLocationCalculationActivityFactoryTest.cs	(.../DuneLocationCalculationActivityFactoryTest.cs)	(revision fabee9b107b96b8b97f04662b18fc95d061b5e98)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneLocationCalculationActivityFactoryTest.cs	(.../DuneLocationCalculationActivityFactoryTest.cs)	(revision 3de205c4bad95d8d024286cff66c99320c2cec82)
@@ -52,7 +52,7 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            var assessmentSection = mockRepository.StrictMock<IAssessmentSection>();
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             mockRepository.ReplayAll();
 
             // Call
@@ -119,7 +119,7 @@
         {
             // Setup
             var mockRepository = new MockRepository();
-            var assessmentSection = mockRepository.StrictMock<IAssessmentSection>();
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             mockRepository.ReplayAll();
 
             // Call
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs
===================================================================
diff -u -r33ce6fa967e380d4c68bd5f53acc189ab7f1e726 -r3de205c4bad95d8d024286cff66c99320c2cec82
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision 33ce6fa967e380d4c68bd5f53acc189ab7f1e726)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PropertyClasses/HeightStructuresInputContextPropertiesTest.cs	(.../HeightStructuresInputContextPropertiesTest.cs)	(revision 3de205c4bad95d8d024286cff66c99320c2cec82)
@@ -72,7 +72,7 @@
         public void SetUp()
         {
             mockRepository = new MockRepository();
-            assessmentSection = mockRepository.StrictMock<IAssessmentSection>();
+            assessmentSection = mockRepository.Stub<IAssessmentSection>();
         }
 
         [Test]