Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Kernels/MessageHelperTest.cs
===================================================================
diff -u
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Kernels/MessageHelperTest.cs	(revision 0)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Kernels/MessageHelperTest.cs	(revision ab562bf9022d9a845c57374b6a2453394af6543c)
@@ -0,0 +1,46 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Deltares.MacroStability.CSharpWrapper.Output;
+using NUnit.Framework;
+using Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Kernels;
+
+namespace Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test.Kernels
+{
+    [TestFixture]
+    public class MessageHelperTest
+    {
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Setup
+            const string content = "test";
+            const MessageType messageType = MessageType.Warning;
+            
+            // Call
+            Message message = MessageHelper.CreateMessage(messageType, content);
+
+            // Assert
+            Assert.AreEqual(messageType, message.MessageType);
+            Assert.AreEqual(content, message.Content);
+        }
+    }
+}
\ No newline at end of file
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Kernels/UpliftVan/UpliftVanKernelStubTest.cs
===================================================================
diff -u -r7e3833ba2897467203f0465987dfc3addc081b06 -rab562bf9022d9a845c57374b6a2453394af6543c
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Kernels/UpliftVan/UpliftVanKernelStubTest.cs	(.../UpliftVanKernelStubTest.cs)	(revision 7e3833ba2897467203f0465987dfc3addc081b06)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Kernels/UpliftVan/UpliftVanKernelStubTest.cs	(.../UpliftVanKernelStubTest.cs)	(revision ab562bf9022d9a845c57374b6a2453394af6543c)
@@ -26,6 +26,7 @@
 using Deltares.MacroStability.CSharpWrapper.Output;
 using NUnit.Framework;
 using Riskeer.MacroStabilityInwards.KernelWrapper.Kernels.UpliftVan;
+using Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Kernels;
 using Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Kernels.UpliftVan;
 
 namespace Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test.Kernels.UpliftVan
@@ -132,9 +133,9 @@
             IEnumerable<Message> results = calculator.CalculationMessages.ToList();
             Assert.IsTrue(calculator.Calculated);
             Assert.AreEqual(3, results.Count());
-            AssertMessage(CreateMessage(MessageType.Info, "Calculation Info"), results.ElementAt(0));
-            AssertMessage(CreateMessage(MessageType.Warning, "Calculation Warning"), results.ElementAt(1));
-            AssertMessage(CreateMessage(MessageType.Error, "Calculation Error"), results.ElementAt(2));
+            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));
         }
 
         [Test]
@@ -207,9 +208,9 @@
             // Assert
             Assert.IsTrue(kernel.Validated);
             Assert.AreEqual(3, messages.Length);
-            AssertMessage(CreateMessage(MessageType.Warning, "Validation Warning"), messages[0]);
-            AssertMessage(CreateMessage(MessageType.Error, "Validation Error"), messages[1]);
-            AssertMessage(CreateMessage(MessageType.Info, "Validation Info"), messages[2]);
+            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]);
         }
 
         [Test]
@@ -228,20 +229,5 @@
             Assert.IsTrue(kernel.Validated);
             CollectionAssert.IsEmpty(results);
         }
-
-        private static Message CreateMessage(MessageType messageType, string message)
-        {
-            return new Message
-            {
-                Content = message,
-                MessageType = messageType
-            };
-        }
-
-        private static void AssertMessage(Message expected, Message actual)
-        {
-            Assert.AreEqual(expected.MessageType, actual.MessageType);
-            Assert.AreEqual(expected.Content, actual.Content);
-        }
     }
 }
\ No newline at end of file
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Kernels/Waternet/WaternetKernelStubTest.cs
===================================================================
diff -u -r2ab6b348d80ed474a9bb2b269bc4786d7261c23c -rab562bf9022d9a845c57374b6a2453394af6543c
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Kernels/Waternet/WaternetKernelStubTest.cs	(.../WaternetKernelStubTest.cs)	(revision 2ab6b348d80ed474a9bb2b269bc4786d7261c23c)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Kernels/Waternet/WaternetKernelStubTest.cs	(.../WaternetKernelStubTest.cs)	(revision ab562bf9022d9a845c57374b6a2453394af6543c)
@@ -25,6 +25,7 @@
 using Deltares.MacroStability.CSharpWrapper.Output;
 using NUnit.Framework;
 using Riskeer.MacroStabilityInwards.KernelWrapper.Kernels.Waternet;
+using Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Kernels;
 using Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Kernels.Waternet;
 
 namespace Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Test.Kernels.Waternet
@@ -155,9 +156,9 @@
             // Assert
             Assert.IsTrue(kernel.Validated);
             Assert.AreEqual(3, results.Length);
-            AssertMessage(CreateMessage(MessageType.Warning, "Validation Warning"), results[0]);
-            AssertMessage(CreateMessage(MessageType.Error, "Validation Error"), results[1]);
-            AssertMessage(CreateMessage(MessageType.Info, "Validation Info"), results[2]);
+            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]);
         }
 
         [Test]
@@ -176,20 +177,5 @@
             Assert.IsTrue(kernel.Validated);
             CollectionAssert.IsEmpty(results);
         }
-
-        private static Message CreateMessage(MessageType messageType, string message)
-        {
-            return new Message
-            {
-                MessageType = messageType,
-                Content = message
-            };
-        }
-
-        private static void AssertMessage(Message expected, Message actual)
-        {
-            Assert.AreEqual(expected.MessageType, actual.MessageType);
-            Assert.AreEqual(expected.Content, actual.Content);
-        }
     }
 }
\ No newline at end of file
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/MessageHelper.cs
===================================================================
diff -u
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/MessageHelper.cs	(revision 0)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/MessageHelper.cs	(revision ab562bf9022d9a845c57374b6a2453394af6543c)
@@ -0,0 +1,60 @@
+// Copyright (C) Stichting Deltares 2019. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Deltares.MacroStability.CSharpWrapper.Output;
+using NUnit.Framework;
+
+namespace Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Kernels
+{
+    /// <summary>
+    /// Helper class for creating and asserting instances of <see cref="Message"/>.
+    /// </summary>
+    public static class MessageHelper
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="Message"/>.
+        /// </summary>
+        /// <param name="messageType">The type of the message.</param>
+        /// <param name="message">The content of the message.</param>
+        /// <returns>The created <see cref="Message"/>.</returns>
+        public static Message CreateMessage(MessageType messageType, string message)
+        {
+            return new Message
+            {
+                MessageType = messageType,
+                Content = message
+            };
+        }
+
+        /// <summary>
+        /// Asserts whether <paramref name="actual"/> is equal to <paramref name="expected"/>.
+        /// </summary>
+        /// <param name="expected">The expected <see cref="Message"/>.</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)
+        {
+            Assert.AreEqual(expected.MessageType, actual.MessageType);
+            Assert.AreEqual(expected.Content, actual.Content);
+        }
+    }
+}
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/UpliftVanKernelStub.cs
===================================================================
diff -u -rfe0f11c19023237d7f3629c2206b4fe5eb5e121f -rab562bf9022d9a845c57374b6a2453394af6543c
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/UpliftVanKernelStub.cs	(.../UpliftVanKernelStub.cs)	(revision fe0f11c19023237d7f3629c2206b4fe5eb5e121f)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/UpliftVanKernelStub.cs	(.../UpliftVanKernelStub.cs)	(revision ab562bf9022d9a845c57374b6a2453394af6543c)
@@ -95,9 +95,9 @@
             {
                 CalculationMessages = new[]
                 {
-                    CreateMessage(MessageType.Warning, "Calculation Warning"),
-                    CreateMessage(MessageType.Error, "Calculation Error"),
-                    CreateMessage(MessageType.Info, "Calculation Info")
+                    MessageHelper.CreateMessage(MessageType.Warning, "Calculation Warning"),
+                    MessageHelper.CreateMessage(MessageType.Error, "Calculation Error"),
+                    MessageHelper.CreateMessage(MessageType.Info, "Calculation Info")
                 };
             }
             else
@@ -122,21 +122,12 @@
 
             if (ReturnValidationResults)
             {
-                yield return CreateMessage(MessageType.Warning, "Validation Warning");
-                yield return CreateMessage(MessageType.Error, "Validation Error");
-                yield return CreateMessage(MessageType.Info, "Validation Info");
+                yield return MessageHelper.CreateMessage(MessageType.Warning, "Validation Warning");
+                yield return MessageHelper.CreateMessage(MessageType.Error, "Validation Error");
+                yield return MessageHelper.CreateMessage(MessageType.Info, "Validation Info");
             }
 
             Validated = true;
         }
-
-        private static Message CreateMessage(MessageType messageType, string message)
-        {
-            return new Message
-            {
-                MessageType = messageType,
-                Content = message
-            };
-        }
     }
 }
\ No newline at end of file
Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/Waternet/WaternetKernelStub.cs
===================================================================
diff -u -rfe0f11c19023237d7f3629c2206b4fe5eb5e121f -rab562bf9022d9a845c57374b6a2453394af6543c
--- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/Waternet/WaternetKernelStub.cs	(.../WaternetKernelStub.cs)	(revision fe0f11c19023237d7f3629c2206b4fe5eb5e121f)
+++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/Waternet/WaternetKernelStub.cs	(.../WaternetKernelStub.cs)	(revision ab562bf9022d9a845c57374b6a2453394af6543c)
@@ -93,21 +93,12 @@
 
             if (ReturnValidationResults)
             {
-                yield return CreateMessage(MessageType.Warning, "Validation Warning");
-                yield return CreateMessage(MessageType.Error, "Validation Error");
-                yield return CreateMessage(MessageType.Info, "Validation Info");
+                yield return MessageHelper.CreateMessage(MessageType.Warning, "Validation Warning");
+                yield return MessageHelper.CreateMessage(MessageType.Error, "Validation Error");
+                yield return MessageHelper.CreateMessage(MessageType.Info, "Validation Info");
             }
 
             Validated = true;
         }
-
-        private static Message CreateMessage(MessageType messageType, string message)
-        {
-            return new Message
-            {
-                MessageType = messageType,
-                Content = message
-            };
-        }
     }
 }
\ No newline at end of file