Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs
===================================================================
diff -u -rfae525350cc755ecc783bd4ac3fc13aed2e4ccaa -r92210258706d0f57e05552037b676bd941a6fe19
--- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs	(.../PipingCalculationActivityTest.cs)	(revision fae525350cc755ecc783bd4ac3fc13aed2e4ccaa)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs	(.../PipingCalculationActivityTest.cs)	(revision 92210258706d0f57e05552037b676bd941a6fe19)
@@ -99,13 +99,13 @@
                 string[] msgs = messages.ToArray();
                 Assert.AreEqual(8, msgs.Length);
                 Assert.AreEqual($"Uitvoeren van berekening '{invalidPipingCalculation.Name}' is gestart.", msgs[0]);
-                Assert.AreEqual($"Validatie van '{invalidPipingCalculation.Name}' is gestart.", msgs[1]);
+                CalculationServiceTestHelper.AssertValidationStartMessage(msgs[1]);
                 StringAssert.StartsWith("Validatie mislukt: ", msgs[2]);
                 StringAssert.StartsWith("Validatie mislukt: ", msgs[3]);
                 StringAssert.StartsWith("Validatie mislukt: ", msgs[4]);
                 StringAssert.StartsWith("Validatie mislukt: ", msgs[5]);
                 StringAssert.StartsWith("Validatie mislukt: ", msgs[6]);
-                Assert.AreEqual($"Validatie van '{invalidPipingCalculation.Name}' is beëindigd.", msgs[7]);
+                CalculationServiceTestHelper.AssertValidationEndMessage(msgs[7]);
             });
             Assert.AreEqual(ActivityState.Failed, activity.State);
             Assert.AreSame(originalOutput, invalidPipingCalculation.Output);
@@ -133,10 +133,10 @@
                 string[] msgs = messages.ToArray();
                 Assert.AreEqual(5, msgs.Length);
                 Assert.AreEqual($"Uitvoeren van berekening '{validPipingCalculation.Name}' is gestart.", msgs[0]);
-                CalculationServiceTestHelper.AssertValidationStartMessage(validPipingCalculation.Name, msgs[1]);
-                CalculationServiceTestHelper.AssertValidationEndMessage(validPipingCalculation.Name, msgs[2]);
-                CalculationServiceTestHelper.AssertCalculationStartMessage(validPipingCalculation.Name, msgs[3]);
-                CalculationServiceTestHelper.AssertCalculationEndMessage(validPipingCalculation.Name, msgs[4]);
+                CalculationServiceTestHelper.AssertValidationStartMessage(msgs[1]);
+                CalculationServiceTestHelper.AssertValidationEndMessage(msgs[2]);
+                CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[3]);
+                CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[4]);
             });
             Assert.AreEqual(ActivityState.Executed, activity.State);
             Assert.IsNotNull(validPipingCalculation.Output);