Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r38499aa6936706c30ac12e481233d3f13545dd8b -r9779d1ab6b555c557e8fd18f4430ad207bd003da
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 9779d1ab6b555c557e8fd18f4430ad207bd003da)
@@ -44,6 +44,7 @@
 using Ringtoets.Common.Data.Probability;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.Common.Service.TestUtil;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Data.TestUtil;
 using Ringtoets.HeightStructures.Forms.PresentationObjects;
@@ -1175,11 +1176,11 @@
                     {
                         string[] msgs = messages.ToArray();
                         Assert.AreEqual(6, 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]);
                         StringAssert.StartsWith("Hoogte kunstwerk berekening is uitgevoerd op de tijdelijke locatie", msgs[3]);
-                        Assert.AreEqual($"Berekening van '{calculation.Name}' beëindigd.", msgs[4]);
+                        CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[4]);
                         Assert.AreEqual($"Uitvoeren van berekening '{calculation.Name}' is gelukt.", msgs[5]);
                     });
 
@@ -1239,8 +1240,8 @@
                     {
                         string[] msgs = messages.ToArray();
                         Assert.AreEqual(2, msgs.Length);
-                        Assert.AreEqual($"Validatie van '{calculation.Name}' gestart.", msgs[0]);
-                        Assert.AreEqual($"Validatie van '{calculation.Name}' beëindigd.", msgs[1]);
+                        CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]);
+                        CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[1]);
                     });
                 }
             }