Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r38499aa6936706c30ac12e481233d3f13545dd8b -r9779d1ab6b555c557e8fd18f4430ad207bd003da
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs)	(revision 38499aa6936706c30ac12e481233d3f13545dd8b)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationContextTreeNodeInfoTest.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.HydraRing.Calculation.Calculator.Factory;
 using Ringtoets.HydraRing.Calculation.TestUtil.Calculator;
 using Ringtoets.StabilityPointStructures.Data;
@@ -1010,11 +1011,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("Puntconstructies 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]);
                     });
 
@@ -1077,8 +1078,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]);
                     });
                 }
             }