Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructureFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r1896772f937242f1a530da54095d6e97fde558ad -r2d8a7d9f1185dbfb67f08aadf63f2aadbcfd0c1f
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructureFailureMechanismContextTreeNodeInfoTest.cs	(.../ClosingStructureFailureMechanismContextTreeNodeInfoTest.cs)	(revision 1896772f937242f1a530da54095d6e97fde558ad)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructureFailureMechanismContextTreeNodeInfoTest.cs	(.../ClosingStructureFailureMechanismContextTreeNodeInfoTest.cs)	(revision 2d8a7d9f1185dbfb67f08aadf63f2aadbcfd0c1f)
@@ -40,6 +40,7 @@
 using Ringtoets.ClosingStructures.Plugin;
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.PresentationObjects;
@@ -628,10 +629,12 @@
             var hydraulicBoundaryDatabaseStub = mocksRepository.Stub<HydraulicBoundaryDatabase>();
             hydraulicBoundaryDatabaseStub.FilePath = validFilePath;
 
-            var assessmentSectionMock = mocksRepository.Stub<IAssessmentSection>();
-            assessmentSectionMock.HydraulicBoundaryDatabase = hydraulicBoundaryDatabaseStub;
+            var assessmentSectionStub = mocksRepository.Stub<IAssessmentSection>();
+            assessmentSectionStub.HydraulicBoundaryDatabase = hydraulicBoundaryDatabaseStub;
+            assessmentSectionStub.Stub(a => a.Id).Return(string.Empty);
+            assessmentSectionStub.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 1, 1));
 
-            var failureMechanismContext = new ClosingStructuresFailureMechanismContext(failureMechanism, assessmentSectionMock);
+            var failureMechanismContext = new ClosingStructuresFailureMechanismContext(failureMechanism, assessmentSectionStub);
 
             using (var treeViewControl = new TreeViewControl())
             {
@@ -667,8 +670,8 @@
                         StringAssert.StartsWith("Berekening van 'B' gestart om: ", messageList[7]);
                         StringAssert.StartsWith("Betrouwbaarheid sluiting kunstwerk berekening is uitgevoerd op de tijdelijke locatie:", messageList[8]);
                         StringAssert.StartsWith("Berekening van 'B' beëindigd om: ", messageList[9]);
-                        Assert.AreEqual("Uitvoeren van 'A' is mislukt.", messageList[10]);
-                        Assert.AreEqual("Uitvoeren van 'B' is mislukt.", messageList[11]);
+                        Assert.AreEqual("Uitvoeren van 'A' is gelukt.", messageList[10]);
+                        Assert.AreEqual("Uitvoeren van 'B' is gelukt.", messageList[11]);
                     });
                 }
             }
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rbae9328136bb33f3827192d07115f5512fa7bc32 -r2d8a7d9f1185dbfb67f08aadf63f2aadbcfd0c1f
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision bae9328136bb33f3827192d07115f5512fa7bc32)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 2d8a7d9f1185dbfb67f08aadf63f2aadbcfd0c1f)
@@ -41,6 +41,7 @@
 using Ringtoets.ClosingStructures.Plugin;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms;
@@ -666,6 +667,8 @@
             hydraulicBoundaryDatabaseStub.FilePath = validFilePath;
 
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
+            assessmentSectionStub.Stub(a => a.Id).Return(string.Empty);
+            assessmentSectionStub.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 1, 1));
             var groupContext = new ClosingStructuresCalculationGroupContext(failureMechanism.CalculationsGroup,
                                                                             failureMechanism,
                                                                             assessmentSectionStub);
@@ -707,8 +710,8 @@
                         StringAssert.StartsWith("Berekening van 'B' gestart om: ", messageList[7]);
                         StringAssert.StartsWith("Betrouwbaarheid sluiting kunstwerk berekening is uitgevoerd op de tijdelijke locatie:", messageList[8]);
                         StringAssert.StartsWith("Berekening van 'B' beëindigd om: ", messageList[9]);
-                        Assert.AreEqual("Uitvoeren van 'A' is mislukt.", messageList[10]);
-                        Assert.AreEqual("Uitvoeren van 'B' is mislukt.", messageList[11]);
+                        Assert.AreEqual("Uitvoeren van 'A' is gelukt.", messageList[10]);
+                        Assert.AreEqual("Uitvoeren van 'B' is gelukt.", messageList[11]);
                     });
                 }
             }
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rbae9328136bb33f3827192d07115f5512fa7bc32 -r2d8a7d9f1185dbfb67f08aadf63f2aadbcfd0c1f
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision bae9328136bb33f3827192d07115f5512fa7bc32)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 2d8a7d9f1185dbfb67f08aadf63f2aadbcfd0c1f)
@@ -37,6 +37,7 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms;
@@ -831,6 +832,9 @@
             hydraulicBoundaryDatabaseStub.FilePath = validFilePath;
 
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
+            assessmentSectionStub.Stub(a => a.Id).Return(string.Empty);
+            assessmentSectionStub.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 1, 1));
+
             var groupContext = new HeightStructuresCalculationGroupContext(failureMechanism.CalculationsGroup,
                                                                            failureMechanism,
                                                                            assessmentSectionStub);
@@ -872,8 +876,8 @@
                         StringAssert.StartsWith("Berekening van 'B' gestart om: ", messageList[7]);
                         StringAssert.StartsWith("Hoogte kunstwerk berekening is uitgevoerd op de tijdelijke locatie:", messageList[8]);
                         StringAssert.StartsWith("Berekening van 'B' beëindigd om: ", messageList[9]);
-                        Assert.AreEqual("Uitvoeren van 'A' is mislukt.", messageList[10]);
-                        Assert.AreEqual("Uitvoeren van 'B' is mislukt.", messageList[11]);
+                        Assert.AreEqual("Uitvoeren van 'A' is gelukt.", messageList[10]);
+                        Assert.AreEqual("Uitvoeren van 'B' is gelukt.", messageList[11]);
                     });
                 }
             }
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r1896772f937242f1a530da54095d6e97fde558ad -r2d8a7d9f1185dbfb67f08aadf63f2aadbcfd0c1f
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 1896772f937242f1a530da54095d6e97fde558ad)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 2d8a7d9f1185dbfb67f08aadf63f2aadbcfd0c1f)
@@ -36,6 +36,7 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.PresentationObjects;
@@ -754,10 +755,12 @@
             var hydraulicBoundaryDatabaseStub = mocksRepository.Stub<HydraulicBoundaryDatabase>();
             hydraulicBoundaryDatabaseStub.FilePath = validFilePath;
 
-            var assessmentSectionMock = mocksRepository.Stub<IAssessmentSection>();
-            assessmentSectionMock.HydraulicBoundaryDatabase = hydraulicBoundaryDatabaseStub;
+            var assessmentSectionStub = mocksRepository.Stub<IAssessmentSection>();
+            assessmentSectionStub.Stub(a => a.Id).Return(string.Empty);
+            assessmentSectionStub.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 1, 1));
+            assessmentSectionStub.HydraulicBoundaryDatabase = hydraulicBoundaryDatabaseStub;
 
-            var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSectionMock);
+            var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSectionStub);
 
             using (var treeViewControl = new TreeViewControl())
             {
@@ -793,8 +796,8 @@
                         StringAssert.StartsWith("Berekening van 'B' gestart om: ", messageList[7]);
                         StringAssert.StartsWith("Hoogte kunstwerk berekening is uitgevoerd op de tijdelijke locatie:", messageList[8]);
                         StringAssert.StartsWith("Berekening van 'B' beëindigd om: ", messageList[9]);
-                        Assert.AreEqual("Uitvoeren van 'A' is mislukt.", messageList[10]);
-                        Assert.AreEqual("Uitvoeren van 'B' is mislukt.", messageList[11]);
+                        Assert.AreEqual("Uitvoeren van 'A' is gelukt.", messageList[10]);
+                        Assert.AreEqual("Uitvoeren van 'B' is gelukt.", messageList[11]);
                     });
                 }
             }
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -rbae9328136bb33f3827192d07115f5512fa7bc32 -r2d8a7d9f1185dbfb67f08aadf63f2aadbcfd0c1f
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision bae9328136bb33f3827192d07115f5512fa7bc32)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs)	(revision 2d8a7d9f1185dbfb67f08aadf63f2aadbcfd0c1f)
@@ -37,6 +37,7 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
 using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms;
@@ -748,6 +749,8 @@
             hydraulicBoundaryDatabaseStub.FilePath = validFilePath;
 
             var assessmentSectionStub = mocks.Stub<IAssessmentSection>();
+            assessmentSectionStub.Stub(a => a.Id).Return(string.Empty);
+            assessmentSectionStub.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 1, 1));
             var groupContext = new StabilityPointStructuresCalculationGroupContext(failureMechanism.CalculationsGroup,
                                                                                    failureMechanism,
                                                                                    assessmentSectionStub);
@@ -789,8 +792,8 @@
                         StringAssert.StartsWith("Berekening van 'B' gestart om: ", messageList[7]);
                         StringAssert.StartsWith("Puntconstructies berekening is uitgevoerd op de tijdelijke locatie:", messageList[8]);
                         StringAssert.StartsWith("Berekening van 'B' beëindigd om: ", messageList[9]);
-                        Assert.AreEqual("Uitvoeren van 'A' is mislukt.", messageList[10]);
-                        Assert.AreEqual("Uitvoeren van 'B' is mislukt.", messageList[11]);
+                        Assert.AreEqual("Uitvoeren van 'A' is gelukt.", messageList[10]);
+                        Assert.AreEqual("Uitvoeren van 'B' is gelukt.", messageList[11]);
                     });
                 }
             }
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r1896772f937242f1a530da54095d6e97fde558ad -r2d8a7d9f1185dbfb67f08aadf63f2aadbcfd0c1f
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 1896772f937242f1a530da54095d6e97fde558ad)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs	(.../StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs)	(revision 2d8a7d9f1185dbfb67f08aadf63f2aadbcfd0c1f)
@@ -36,6 +36,7 @@
 using Rhino.Mocks;
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Contribution;
 using Ringtoets.Common.Data.FailureMechanism;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Forms.PresentationObjects;
@@ -656,10 +657,12 @@
             var hydraulicBoundaryDatabaseStub = mocksRepository.Stub<HydraulicBoundaryDatabase>();
             hydraulicBoundaryDatabaseStub.FilePath = validFilePath;
 
-            var assessmentSectionMock = mocksRepository.Stub<IAssessmentSection>();
-            assessmentSectionMock.HydraulicBoundaryDatabase = hydraulicBoundaryDatabaseStub;
+            var assessmentSectionStub = mocksRepository.Stub<IAssessmentSection>();
+            assessmentSectionStub.Stub(a => a.Id).Return(string.Empty);
+            assessmentSectionStub.Stub(a => a.FailureMechanismContribution).Return(new FailureMechanismContribution(Enumerable.Empty<IFailureMechanism>(), 1, 1));
+            assessmentSectionStub.HydraulicBoundaryDatabase = hydraulicBoundaryDatabaseStub;
 
-            var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext(failureMechanism, assessmentSectionMock);
+            var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext(failureMechanism, assessmentSectionStub);
 
             using (var plugin = new StabilityPointStructuresPlugin())
             using (var treeViewControl = new TreeViewControl())
@@ -697,8 +700,8 @@
                         StringAssert.StartsWith("Berekening van 'B' gestart om: ", messageList[7]);
                         StringAssert.StartsWith("Puntconstructies berekening is uitgevoerd op de tijdelijke locatie:", messageList[8]);
                         StringAssert.StartsWith("Berekening van 'B' beëindigd om: ", messageList[9]);
-                        Assert.AreEqual("Uitvoeren van 'A' is mislukt.", messageList[10]);
-                        Assert.AreEqual("Uitvoeren van 'B' is mislukt.", messageList[11]);
+                        Assert.AreEqual("Uitvoeren van 'A' is gelukt.", messageList[10]);
+                        Assert.AreEqual("Uitvoeren van 'B' is gelukt.", messageList[11]);
                     });
                 }
             }