Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs
===================================================================
diff -u -r436afc32ff70f325001e7f13ad496271ab9b6d89 -r9779d1ab6b555c557e8fd18f4430ad207bd003da
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision 436afc32ff70f325001e7f13ad496271ab9b6d89)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision 9779d1ab6b555c557e8fd18f4430ad207bd003da)
@@ -31,6 +31,7 @@
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Service.MessageProviders;
+using Ringtoets.Common.Service.TestUtil;
 using Ringtoets.HydraRing.Calculation.Calculator.Factory;
 using Ringtoets.HydraRing.Calculation.Data.Input.Hydraulics;
 using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
@@ -136,9 +137,9 @@
             {
                 string[] msgs = messages.ToArray();
                 Assert.AreEqual(3, msgs.Length);
-                Assert.AreEqual($"Validatie van '{calculationName}' gestart.", msgs[0]);
+                CalculationServiceTestHelper.AssertValidationStartMessage(calculationName, msgs[0]);
                 StringAssert.StartsWith("Herstellen van de verbinding met de hydraulische randvoorwaardendatabase is mislukt. Fout bij het lezen van bestand", msgs[1]);
-                Assert.AreEqual($"Validatie van '{calculationName}' beëindigd.", msgs[2]);
+                CalculationServiceTestHelper.AssertValidationEndMessage(calculationName, msgs[2]);
             });
             Assert.AreEqual(ActivityState.Failed, activity.State);
         }
@@ -180,11 +181,11 @@
                 {
                     string[] messages = m.ToArray();
                     Assert.AreEqual(5, messages.Length);
-                    Assert.AreEqual($"Validatie van '{calculationName}' gestart.", messages[0]);
-                    Assert.AreEqual($"Validatie van '{calculationName}' beëindigd.", messages[1]);
-                    Assert.AreEqual($"Berekening van '{calculationName}' gestart.", messages[2]);
+                    CalculationServiceTestHelper.AssertValidationStartMessage(calculationName, messages[0]);
+                    CalculationServiceTestHelper.AssertValidationEndMessage(calculationName, messages[1]);
+                    CalculationServiceTestHelper.AssertCalculationStartMessage(calculationName, messages[2]);
                     StringAssert.StartsWith("Golfhoogte berekening is uitgevoerd op de tijdelijke locatie", messages[3]);
-                    Assert.AreEqual($"Berekening van '{calculationName}' beëindigd.", messages[4]);
+                    CalculationServiceTestHelper.AssertCalculationEndMessage(calculationName, messages[4]);
                 });
                 WaveHeightCalculationInput waveHeightCalculationInput = calculator.ReceivedInputs.First();