Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r6f33b44599df032ecae3342b0aacd606a9e87c1f -r5b20289ad0f8db0519a812c65a7fcf1d3d58465d
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 6f33b44599df032ecae3342b0aacd606a9e87c1f)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 5b20289ad0f8db0519a812c65a7fcf1d3d58465d)
@@ -1064,13 +1064,13 @@
                     hydraulicBoundaryLocation
                 }, true);
 
-                PipingCalculationScenario validCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
-                validCalculation.Name = "A";
-                PipingCalculationScenario invalidCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput();
-                invalidCalculation.Name = "B";
+                PipingCalculationScenario calculationA = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
+                calculationA.Name = "A";
+                PipingCalculationScenario calculationB = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
+                calculationB.Name = "B";
 
                 var childGroup = new CalculationGroup();
-                childGroup.Children.Add(validCalculation);
+                childGroup.Children.Add(calculationA);
 
                 var emptyChildGroup = new CalculationGroup();
 
@@ -1079,7 +1079,7 @@
 
                 group.Children.Add(childGroup);
                 group.Children.Add(emptyChildGroup);
-                group.Children.Add(invalidCalculation);
+                group.Children.Add(calculationB);
 
                 var nodeData = new PipingCalculationGroupContext(group,
                                                                  parentGroup,
@@ -1111,11 +1111,29 @@
                     };
 
                     // Call
-                    contextMenu.Items[contextMenuCalculateAllIndexNestedGroup].PerformClick();
+                    Action call = () => contextMenu.Items[contextMenuCalculateAllIndexNestedGroup].PerformClick();
+
+                    // Assert
+                    TestHelper.AssertLogMessages(call, messages =>
+                    {
+                        string[] msgs = messages.ToArray();
+                        Assert.AreEqual(12, msgs.Length);
+                        Assert.AreEqual("Uitvoeren van berekening 'A' is gestart.", msgs[0]);
+                        CalculationServiceTestHelper.AssertValidationStartMessage(msgs[1]);
+                        CalculationServiceTestHelper.AssertValidationEndMessage(msgs[2]);
+                        CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[3]);
+                        CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[4]);
+                        Assert.AreEqual("Uitvoeren van berekening 'A' is gelukt.", msgs[5]);
+
+                        Assert.AreEqual("Uitvoeren van berekening 'B' is gestart.", msgs[6]);
+                        CalculationServiceTestHelper.AssertValidationStartMessage(msgs[7]);
+                        CalculationServiceTestHelper.AssertValidationEndMessage(msgs[8]);
+                        CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[9]);
+                        CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[10]);
+                        Assert.AreEqual("Uitvoeren van berekening 'B' is gelukt.", msgs[11]);
+                    });
                 }
             }
-
-            // Assert
         }
 
         [Test]
@@ -1310,7 +1328,7 @@
                     new Point3D(5.0, -5.0, 0.0)
                 });
 
-                var surfaceLines = new[]
+                PipingSurfaceLine[] surfaceLines =
                 {
                     surfaceLine1,
                     surfaceLine2
@@ -1424,7 +1442,7 @@
                     new Point3D(5.0, -5.0, 0.0)
                 });
 
-                var surfaceLines = new[]
+                PipingSurfaceLine[] surfaceLines =
                 {
                     surfaceLine1,
                     surfaceLine2