Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r6c049c504e7f599a8cebb26ae37fcd82b03782f2 -r9779d1ab6b555c557e8fd18f4430ad207bd003da
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs)	(revision 6c049c504e7f599a8cebb26ae37fcd82b03782f2)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs)	(revision 9779d1ab6b555c557e8fd18f4430ad207bd003da)
@@ -30,6 +30,7 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Service.TestUtil;
 using Ringtoets.HydraRing.Calculation.Calculator.Factory;
 using Ringtoets.HydraRing.Calculation.Data;
 using Ringtoets.HydraRing.Calculation.Data.Input.WaveConditions;
@@ -93,9 +94,9 @@
                 {
                     string[] msgs = messages.ToArray();
                     Assert.AreEqual(3, msgs.Length);
-                    Assert.AreEqual($"Validatie van '{calculation.Name}' gestart.", msgs[0]);
+                    CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]);
                     Assert.AreEqual($"Validatie mislukt: Fout bij het lezen van bestand '{testFilePath}': het bestand bestaat niet.", msgs[1]);
-                    Assert.AreEqual($"Validatie van '{calculation.Name}' beëindigd.", msgs[2]);
+                    CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[2]);
                 });
                 Assert.AreEqual(ActivityState.Failed, activity.State);
             }
@@ -252,15 +253,15 @@
                     RoundedDouble firstWaterLevel = calculation.InputParameters.WaterLevels.First();
 
                     Assert.AreEqual(9, msgs.Length);
-                    Assert.AreEqual($"Validatie van '{calculation.Name}' gestart.", msgs[0]);
-                    Assert.AreEqual($"Validatie van '{calculation.Name}' beëindigd.", msgs[1]);
-                    Assert.AreEqual($"Berekening van '{calculation.Name}' gestart.", msgs[2]);
+                    CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]);
+                    CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[1]);
+                    CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[2]);
                     Assert.AreEqual($"Berekening '{calculation.Name}' voor blokken gestart.", msgs[3]);
                     Assert.AreEqual($"Berekening '{calculation.Name}' voor waterstand '{firstWaterLevel}' gestart.", msgs[4]);
                     StringAssert.StartsWith("Golfcondities berekening is uitgevoerd op de tijdelijke locatie", msgs[5]);
                     Assert.AreEqual($"Berekening '{calculation.Name}' voor waterstand '{firstWaterLevel}' beëindigd.", msgs[6]);
                     Assert.AreEqual($"Berekening '{calculation.Name}' voor blokken beëindigd.", msgs[7]);
-                    Assert.AreEqual($"Berekening van '{calculation.Name}' beëindigd.", msgs[8]);
+                    CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[8]);
                 });
 
                 Assert.AreEqual(ActivityState.Canceled, activity.State);
@@ -308,9 +309,9 @@
                     RoundedDouble[] waterLevels = calculation.InputParameters.WaterLevels.ToArray();
 
                     Assert.AreEqual(20, msgs.Length);
-                    Assert.AreEqual($"Validatie van '{calculation.Name}' gestart.", msgs[0]);
-                    Assert.AreEqual($"Validatie van '{calculation.Name}' beëindigd.", msgs[1]);
-                    Assert.AreEqual($"Berekening van '{calculation.Name}' gestart.", msgs[2]);
+                    CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]);
+                    CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[1]);
+                    CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[2]);
                     Assert.AreEqual($"Berekening '{calculation.Name}' voor blokken gestart.", msgs[3]);
                     Assert.AreEqual($"Berekening '{calculation.Name}' voor waterstand '{waterLevels[0]}' gestart.", msgs[4]);
                     StringAssert.StartsWith("Golfcondities berekening is uitgevoerd op de tijdelijke locatie", msgs[5]);