Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rfae525350cc755ecc783bd4ac3fc13aed2e4ccaa -r92210258706d0f57e05552037b676bd941a6fe19
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision fae525350cc755ecc783bd4ac3fc13aed2e4ccaa)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 92210258706d0f57e05552037b676bd941a6fe19)
@@ -46,6 +46,7 @@
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms;
 using Ringtoets.Common.Forms.Helpers;
+using Ringtoets.Common.Service.TestUtil;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Data.TestUtil;
 using Ringtoets.HeightStructures.Forms.PresentationObjects;
@@ -1007,17 +1008,17 @@
                         // Assert
                         Assert.AreEqual(14, messageList.Count);
                         Assert.AreEqual("Uitvoeren van berekening 'A' is gestart.", messageList[0]);
-                        Assert.AreEqual("Validatie van 'A' is gestart.", messageList[1]);
-                        Assert.AreEqual("Validatie van 'A' is beëindigd.", messageList[2]);
-                        Assert.AreEqual("Berekening van 'A' is gestart.", messageList[3]);
+                        CalculationServiceTestHelper.AssertValidationStartMessage(messageList[1]);
+                        CalculationServiceTestHelper.AssertValidationEndMessage(messageList[2]);
+                        CalculationServiceTestHelper.AssertCalculationStartMessage(messageList[3]);
                         StringAssert.StartsWith("Hoogte kunstwerk berekening is uitgevoerd op de tijdelijke locatie", messageList[4]);
-                        Assert.AreEqual("Berekening van 'A' is beëindigd.", messageList[5]);
+                        CalculationServiceTestHelper.AssertCalculationEndMessage(messageList[5]);
                         Assert.AreEqual("Uitvoeren van berekening 'B' is gestart.", messageList[6]);
-                        Assert.AreEqual("Validatie van 'B' is gestart.", messageList[7]);
-                        Assert.AreEqual("Validatie van 'B' is beëindigd.", messageList[8]);
-                        Assert.AreEqual("Berekening van 'B' is gestart.", messageList[9]);
+                        CalculationServiceTestHelper.AssertValidationStartMessage(messageList[7]);
+                        CalculationServiceTestHelper.AssertValidationEndMessage(messageList[8]);
+                        CalculationServiceTestHelper.AssertCalculationStartMessage(messageList[9]);
                         StringAssert.StartsWith("Hoogte kunstwerk berekening is uitgevoerd op de tijdelijke locatie", messageList[10]);
-                        Assert.AreEqual("Berekening van 'B' is beëindigd.", messageList[11]);
+                        CalculationServiceTestHelper.AssertCalculationEndMessage(messageList[11]);
                         Assert.AreEqual("Uitvoeren van berekening 'A' is gelukt.", messageList[12]);
                         Assert.AreEqual("Uitvoeren van berekening 'B' is gelukt.", messageList[13]);
                     });
@@ -1077,10 +1078,10 @@
 
                         // Assert
                         Assert.AreEqual(4, messageList.Count);
-                        Assert.AreEqual("Validatie van 'A' is gestart.", messageList[0]);
-                        Assert.AreEqual("Validatie van 'A' is beëindigd.", messageList[1]);
-                        Assert.AreEqual("Validatie van 'B' is gestart.", messageList[2]);
-                        Assert.AreEqual("Validatie van 'B' is beëindigd.", messageList[3]);
+                        CalculationServiceTestHelper.AssertValidationStartMessage(messageList[0]);
+                        CalculationServiceTestHelper.AssertValidationEndMessage(messageList[1]);
+                        CalculationServiceTestHelper.AssertValidationStartMessage(messageList[2]);
+                        CalculationServiceTestHelper.AssertValidationEndMessage(messageList[3]);
                     });
                 }
             }