Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs
===================================================================
diff -u -rfae525350cc755ecc783bd4ac3fc13aed2e4ccaa -r92210258706d0f57e05552037b676bd941a6fe19
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs	(.../DesignWaterLevelLocationsContextTreeNodeInfoTest.cs)	(revision fae525350cc755ecc783bd4ac3fc13aed2e4ccaa)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs	(.../DesignWaterLevelLocationsContextTreeNodeInfoTest.cs)	(revision 92210258706d0f57e05552037b676bd941a6fe19)
@@ -38,6 +38,7 @@
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Service.TestUtil;
 using Ringtoets.HydraRing.Calculation.Calculator.Factory;
 using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
 using Ringtoets.Integration.Data;
@@ -314,12 +315,12 @@
                             string[] msgs = messages.ToArray();
                             Assert.AreEqual(8, msgs.Length);
                             Assert.AreEqual($"Toetspeil berekenen voor locatie '{location.Name}' is gestart.", msgs[0]);
-                            Assert.AreEqual($"Validatie van 'Toetspeil berekenen voor locatie '{location.Name}'' is gestart.", msgs[1]);
-                            Assert.AreEqual($"Validatie van 'Toetspeil berekenen voor locatie '{location.Name}'' is beëindigd.", msgs[2]);
-                            Assert.AreEqual($"Berekening van 'Toetspeil berekenen voor locatie '{location.Name}'' is gestart.", msgs[3]);
+                            CalculationServiceTestHelper.AssertValidationStartMessage(msgs[1]);
+                            CalculationServiceTestHelper.AssertValidationEndMessage(msgs[2]);
+                            CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[3]);
                             Assert.AreEqual($"Toetspeil berekening voor locatie '{location.Name}' is niet geconvergeerd.", msgs[4]);
                             StringAssert.StartsWith("Toetspeil berekening is uitgevoerd op de tijdelijke locatie", msgs[5]);
-                            Assert.AreEqual($"Berekening van 'Toetspeil berekenen voor locatie '{location.Name}'' is beëindigd.", msgs[6]);
+                            CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[6]);
                             Assert.AreEqual($"Toetspeil berekenen voor locatie '{location.Name}' is gelukt.", msgs[7]);
                         });
                         Assert.AreEqual(0, location.DesignWaterLevel, location.DesignWaterLevel.GetAccuracy());