Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/UpliftVanCalculatorTest.cs
===================================================================
diff -u -r484733cf35851052be7723af816cb8a0bd860828 -r68eb3c2f78606e4ce48b070e472b9672c8bdc2fa
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/UpliftVanCalculatorTest.cs	(.../UpliftVanCalculatorTest.cs)	(revision 484733cf35851052be7723af816cb8a0bd860828)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/UpliftVanCalculatorTest.cs	(.../UpliftVanCalculatorTest.cs)	(revision 68eb3c2f78606e4ce48b070e472b9672c8bdc2fa)
@@ -210,9 +210,9 @@
                 // Assert
                 Assert.AreEqual(3, upliftVanKernel.CalculationMessages.Count());
                 
-                MessageHelper.AssertMessage(MessageHelper.CreateMessage(MessageType.Warning, "Calculation Warning"), upliftVanKernel.CalculationMessages.ElementAt(0));
-                MessageHelper.AssertMessage(MessageHelper.CreateMessage(MessageType.Error, "Calculation Error"), upliftVanKernel.CalculationMessages.ElementAt(1));
-                MessageHelper.AssertMessage(MessageHelper.CreateMessage(MessageType.Info, "Calculation Info"), upliftVanKernel.CalculationMessages.ElementAt(2));
+                MessageHelper.AssertMessage(MessageType.Warning, "Calculation Warning", upliftVanKernel.CalculationMessages.ElementAt(0));
+                MessageHelper.AssertMessage(MessageType.Error, "Calculation Error", upliftVanKernel.CalculationMessages.ElementAt(1));
+                MessageHelper.AssertMessage(MessageType.Info, "Calculation Info", upliftVanKernel.CalculationMessages.ElementAt(2));
             }
         }
 
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Kernels/UpliftVan/UpliftVanKernelStubTest.cs
===================================================================
diff -u -rab562bf9022d9a845c57374b6a2453394af6543c -r68eb3c2f78606e4ce48b070e472b9672c8bdc2fa
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Kernels/UpliftVan/UpliftVanKernelStubTest.cs	(.../UpliftVanKernelStubTest.cs)	(revision ab562bf9022d9a845c57374b6a2453394af6543c)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Kernels/UpliftVan/UpliftVanKernelStubTest.cs	(.../UpliftVanKernelStubTest.cs)	(revision 68eb3c2f78606e4ce48b070e472b9672c8bdc2fa)
@@ -133,9 +133,9 @@
             IEnumerable<Message> results = calculator.CalculationMessages.ToList();
             Assert.IsTrue(calculator.Calculated);
             Assert.AreEqual(3, results.Count());
-            MessageHelper.AssertMessage(MessageHelper.CreateMessage(MessageType.Info, "Calculation Info"), results.ElementAt(0));
-            MessageHelper.AssertMessage(MessageHelper.CreateMessage(MessageType.Warning, "Calculation Warning"), results.ElementAt(1));
-            MessageHelper.AssertMessage(MessageHelper.CreateMessage(MessageType.Error, "Calculation Error"), results.ElementAt(2));
+            MessageHelper.AssertMessage(MessageType.Info, "Calculation Info", results.ElementAt(0));
+            MessageHelper.AssertMessage(MessageType.Warning, "Calculation Warning", results.ElementAt(1));
+            MessageHelper.AssertMessage(MessageType.Error, "Calculation Error", results.ElementAt(2));
         }
 
         [Test]
@@ -208,9 +208,9 @@
             // Assert
             Assert.IsTrue(kernel.Validated);
             Assert.AreEqual(3, messages.Length);
-            MessageHelper.AssertMessage(MessageHelper.CreateMessage(MessageType.Warning, "Validation Warning"), messages[0]);
-            MessageHelper.AssertMessage(MessageHelper.CreateMessage(MessageType.Error, "Validation Error"), messages[1]);
-            MessageHelper.AssertMessage(MessageHelper.CreateMessage(MessageType.Info, "Validation Info"), messages[2]);
+            MessageHelper.AssertMessage(MessageType.Warning, "Validation Warning", messages[0]);
+            MessageHelper.AssertMessage(MessageType.Error, "Validation Error", messages[1]);
+            MessageHelper.AssertMessage(MessageType.Info, "Validation Info", messages[2]);
         }
 
         [Test]
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Kernels/Waternet/WaternetKernelStubTest.cs
===================================================================
diff -u -rab562bf9022d9a845c57374b6a2453394af6543c -r68eb3c2f78606e4ce48b070e472b9672c8bdc2fa
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Kernels/Waternet/WaternetKernelStubTest.cs	(.../WaternetKernelStubTest.cs)	(revision ab562bf9022d9a845c57374b6a2453394af6543c)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Kernels/Waternet/WaternetKernelStubTest.cs	(.../WaternetKernelStubTest.cs)	(revision 68eb3c2f78606e4ce48b070e472b9672c8bdc2fa)
@@ -156,9 +156,9 @@
             // Assert
             Assert.IsTrue(kernel.Validated);
             Assert.AreEqual(3, results.Length);
-            MessageHelper.AssertMessage(MessageHelper.CreateMessage(MessageType.Warning, "Validation Warning"), results[0]);
-            MessageHelper.AssertMessage(MessageHelper.CreateMessage(MessageType.Error, "Validation Error"), results[1]);
-            MessageHelper.AssertMessage(MessageHelper.CreateMessage(MessageType.Info, "Validation Info"), results[2]);
+            MessageHelper.AssertMessage(MessageType.Warning, "Validation Warning", results[0]);
+            MessageHelper.AssertMessage(MessageType.Error, "Validation Error", results[1]);
+            MessageHelper.AssertMessage(MessageType.Info, "Validation Info", results[2]);
         }
 
         [Test]
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/MessageHelper.cs
===================================================================
diff -u -rab562bf9022d9a845c57374b6a2453394af6543c -r68eb3c2f78606e4ce48b070e472b9672c8bdc2fa
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/MessageHelper.cs	(.../MessageHelper.cs)	(revision ab562bf9022d9a845c57374b6a2453394af6543c)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/MessageHelper.cs	(.../MessageHelper.cs)	(revision 68eb3c2f78606e4ce48b070e472b9672c8bdc2fa)
@@ -45,16 +45,18 @@
         }
 
         /// <summary>
-        /// Asserts whether <paramref name="actual"/> is equal to <paramref name="expected"/>.
+        /// Asserts whether <paramref name="actual"/> is equal to <paramref name="expectedMessageType"/>
+        /// and <paramref name="expectedContent"/>.
         /// </summary>
-        /// <param name="expected">The expected <see cref="Message"/>.</param>
+        /// <param name="expectedMessageType">The expected <see cref="MessageType"/>.</param>
+        /// <param name="expectedContent">The expected content.</param>
         /// <param name="actual">The actual <see cref="Message"/>.</param>
         /// <exception cref="AssertionException">Thrown when <paramref name="actual"/>
-        /// is not equal to <paramref name="expected"/>.</exception>
-        public static void AssertMessage(Message expected, Message actual)
+        /// is not equal to <paramref name="expectedMessageType"/> or <paramref name="expectedContent"/>.</exception>
+        public static void AssertMessage(MessageType expectedMessageType, string expectedContent, Message actual)
         {
-            Assert.AreEqual(expected.MessageType, actual.MessageType);
-            Assert.AreEqual(expected.Content, actual.Content);
+            Assert.AreEqual(expectedMessageType, actual.MessageType);
+            Assert.AreEqual(expectedContent, actual.Content);
         }
     }
 }