Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/CalculationsState/PipingFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r5af380e0d37c05f3d31d0707bf2019aff3262e95 -r6c81bfc24736f7b5b5cd7c1869ca45062fc4302a
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/CalculationsState/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision 5af380e0d37c05f3d31d0707bf2019aff3262e95)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/CalculationsState/PipingFailureMechanismContextTreeNodeInfoTest.cs	(.../PipingFailureMechanismContextTreeNodeInfoTest.cs)	(revision 6c81bfc24736f7b5b5cd7c1869ca45062fc4302a)
@@ -640,15 +640,15 @@
                     TestHelper.AssertLogMessages(Call, messages =>
                     {
                         string[] msgs = messages.ToArray();
-                        Assert.AreEqual(18, msgs.Length);
+                        Assert.AreEqual(14, msgs.Length);
                         CalculationServiceTestHelper.AssertValidationStartMessage(msgs[0]);
                         CalculationServiceTestHelper.AssertValidationEndMessage(msgs[1]);
                         CalculationServiceTestHelper.AssertValidationStartMessage(msgs[2]);
-                        CalculationServiceTestHelper.AssertValidationEndMessage(msgs[8]);
-                        CalculationServiceTestHelper.AssertValidationStartMessage(msgs[9]);
-                        CalculationServiceTestHelper.AssertValidationEndMessage(msgs[10]);
-                        CalculationServiceTestHelper.AssertValidationStartMessage(msgs[11]);
-                        CalculationServiceTestHelper.AssertValidationEndMessage(msgs[17]);
+                        CalculationServiceTestHelper.AssertValidationEndMessage(msgs[4]);
+                        CalculationServiceTestHelper.AssertValidationStartMessage(msgs[5]);
+                        CalculationServiceTestHelper.AssertValidationEndMessage(msgs[6]);
+                        CalculationServiceTestHelper.AssertValidationStartMessage(msgs[7]);
+                        CalculationServiceTestHelper.AssertValidationEndMessage(msgs[13]);
                     });
                 }
             }
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r5af380e0d37c05f3d31d0707bf2019aff3262e95 -r6c81bfc24736f7b5b5cd7c1869ca45062fc4302a
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 5af380e0d37c05f3d31d0707bf2019aff3262e95)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs	(.../PipingCalculationGroupContextTreeNodeInfoTest.cs)	(revision 6c81bfc24736f7b5b5cd7c1869ca45062fc4302a)
@@ -1358,15 +1358,15 @@
                     TestHelper.AssertLogMessages(Call, messages =>
                     {
                         string[] msgs = messages.ToArray();
-                        Assert.AreEqual(18, msgs.Length);
+                        Assert.AreEqual(14, msgs.Length);
                         CalculationServiceTestHelper.AssertValidationStartMessage(msgs[0]);
                         CalculationServiceTestHelper.AssertValidationEndMessage(msgs[1]);
                         CalculationServiceTestHelper.AssertValidationStartMessage(msgs[2]);
-                        CalculationServiceTestHelper.AssertValidationEndMessage(msgs[8]);
-                        CalculationServiceTestHelper.AssertValidationStartMessage(msgs[9]);
-                        CalculationServiceTestHelper.AssertValidationEndMessage(msgs[10]);
-                        CalculationServiceTestHelper.AssertValidationStartMessage(msgs[11]);
-                        CalculationServiceTestHelper.AssertValidationEndMessage(msgs[17]);
+                        CalculationServiceTestHelper.AssertValidationEndMessage(msgs[4]);
+                        CalculationServiceTestHelper.AssertValidationStartMessage(msgs[5]);
+                        CalculationServiceTestHelper.AssertValidationEndMessage(msgs[6]);
+                        CalculationServiceTestHelper.AssertValidationStartMessage(msgs[7]);
+                        CalculationServiceTestHelper.AssertValidationEndMessage(msgs[13]);
                     });
                 }
             }