Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/UpliftVan/UpliftVanCalculatorStubTest.cs
===================================================================
diff -u -rb351ccdb9efb3be5a6c899c77598eadd4ff76563 -r4e9c268ef863b68aa2800bee7a7372fd5830cb9f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/UpliftVan/UpliftVanCalculatorStubTest.cs	(.../UpliftVanCalculatorStubTest.cs)	(revision b351ccdb9efb3be5a6c899c77598eadd4ff76563)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/UpliftVan/UpliftVanCalculatorStubTest.cs	(.../UpliftVanCalculatorStubTest.cs)	(revision 4e9c268ef863b68aa2800bee7a7372fd5830cb9f)
@@ -78,19 +78,23 @@
 
             // Assert
             IEnumerable<UpliftVanKernelMessage> messages = calculator.Output.CalculationMessages.ToList();
-            Assert.AreEqual(3, messages.Count());
+            Assert.AreEqual(4, messages.Count());
 
             UpliftVanKernelMessage firstMessage = messages.ElementAt(0);
-            Assert.AreEqual("Calculation Error", firstMessage.Message);
+            Assert.AreEqual("Calculation Error 1", firstMessage.Message);
             Assert.AreEqual(UpliftVanKernelMessageType.Error, firstMessage.ResultType);
 
             UpliftVanKernelMessage secondMessage = messages.ElementAt(1);
             Assert.AreEqual("Calculation Warning 1", secondMessage.Message);
             Assert.AreEqual(UpliftVanKernelMessageType.Warning, secondMessage.ResultType);
 
             UpliftVanKernelMessage thirdMessage = messages.ElementAt(2);
-            Assert.AreEqual("Calculation Warning 2", thirdMessage.Message);
-            Assert.AreEqual(UpliftVanKernelMessageType.Warning, thirdMessage.ResultType);
+            Assert.AreEqual("Calculation Error 2", thirdMessage.Message);
+            Assert.AreEqual(UpliftVanKernelMessageType.Error, thirdMessage.ResultType);
+
+            UpliftVanKernelMessage fourthMessage = messages.ElementAt(3);
+            Assert.AreEqual("Calculation Warning 2", fourthMessage.Message);
+            Assert.AreEqual(UpliftVanKernelMessageType.Warning, fourthMessage.ResultType);
         }
 
         [Test]
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Calculators/UpliftVan/UpliftVanCalculatorStub.cs
===================================================================
diff -u -rb351ccdb9efb3be5a6c899c77598eadd4ff76563 -r4e9c268ef863b68aa2800bee7a7372fd5830cb9f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Calculators/UpliftVan/UpliftVanCalculatorStub.cs	(.../UpliftVanCalculatorStub.cs)	(revision b351ccdb9efb3be5a6c899c77598eadd4ff76563)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Calculators/UpliftVan/UpliftVanCalculatorStub.cs	(.../UpliftVanCalculatorStub.cs)	(revision 4e9c268ef863b68aa2800bee7a7372fd5830cb9f)
@@ -81,13 +81,24 @@
             }
 
             var calculationMessages = new List<UpliftVanKernelMessage>();
+
             if (ReturnCalculationError)
             {
-                calculationMessages.Add(new UpliftVanKernelMessage(UpliftVanKernelMessageType.Error, "Calculation Error"));
+                calculationMessages.Add(new UpliftVanKernelMessage(UpliftVanKernelMessageType.Error, "Calculation Error 1"));
             }
+
             if (ReturnCalculationWarning)
             {
                 calculationMessages.Add(new UpliftVanKernelMessage(UpliftVanKernelMessageType.Warning, "Calculation Warning 1"));
+            }
+
+            if (ReturnCalculationError)
+            {
+                calculationMessages.Add(new UpliftVanKernelMessage(UpliftVanKernelMessageType.Error, "Calculation Error 2"));
+            }
+
+            if (ReturnCalculationWarning)
+            {
                 calculationMessages.Add(new UpliftVanKernelMessage(UpliftVanKernelMessageType.Warning, "Calculation Warning 2"));
             }
 
@@ -105,6 +116,7 @@
             {
                 yield return new UpliftVanKernelMessage(UpliftVanKernelMessageType.Error, "Validation Error");
             }
+
             if (ReturnValidationWarning)
             {
                 yield return new UpliftVanKernelMessage(UpliftVanKernelMessageType.Warning, "Validation Warning");
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs
===================================================================
diff -u -r817ed9bb542c79fdf895dda1bf7d1e312e43e524 -r4e9c268ef863b68aa2800bee7a7372fd5830cb9f
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs	(.../MacroStabilityInwardsCalculationServiceTest.cs)	(revision 817ed9bb542c79fdf895dda1bf7d1e312e43e524)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs	(.../MacroStabilityInwardsCalculationServiceTest.cs)	(revision 4e9c268ef863b68aa2800bee7a7372fd5830cb9f)
@@ -528,7 +528,9 @@
 
                     string expectedErrorMessage = "Er zijn een of meerdere fouten opgetreden. Klik op details voor meer informatie."
                                                   + $"{Environment.NewLine}"
-                                                  + "* Calculation Error";
+                                                  + "* Calculation Error 1"
+                                                  + $"{Environment.NewLine}"
+                                                  + "* Calculation Error 2";
 
                     CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[0]);
                     Assert.AreEqual(expectedErrorMessage, msgs[1]);
@@ -591,10 +593,12 @@
 
                     string expectedErrorMessage = "Er zijn een of meerdere fouten opgetreden. Klik op details voor meer informatie."
                                                   + $"{Environment.NewLine}"
-                                                  + "* Calculation Error"
+                                                  + "* Calculation Error 1"
                                                   + $"{Environment.NewLine}"
                                                   + "* Calculation Warning 1"
                                                   + $"{Environment.NewLine}"
+                                                  + "* Calculation Error 2"
+                                                  + $"{Environment.NewLine}"
                                                   + "* Calculation Warning 2";
 
                     CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[0]);