Index: Core/Gui/test/Core.Gui.Test/Forms/Chart/ChartLegendViewTest.cs
===================================================================
diff -u -r4f3a17e38e2c97e55bd830d0844a3334c30bd014 -rc84ccc03432a011ae6ab3d2645ad7cdfa6c9f64c
--- Core/Gui/test/Core.Gui.Test/Forms/Chart/ChartLegendViewTest.cs	(.../ChartLegendViewTest.cs)	(revision 4f3a17e38e2c97e55bd830d0844a3334c30bd014)
+++ Core/Gui/test/Core.Gui.Test/Forms/Chart/ChartLegendViewTest.cs	(.../ChartLegendViewTest.cs)	(revision c84ccc03432a011ae6ab3d2645ad7cdfa6c9f64c)
@@ -68,7 +68,6 @@
                 Assert.IsInstanceOf<IView>(view);
                 Assert.IsInstanceOf<ISelectionProvider>(view);
                 Assert.IsNull(view.Data);
-                Assert.AreEqual("Grafiek", view.Text);
             }
 
             mocks.VerifyAll();
Index: Core/Gui/test/Core.Gui.Test/Forms/Log/MessageWindowTest.cs
===================================================================
diff -u -rf2d4c63c85b952a15075468b5f48048ff5122d95 -rc84ccc03432a011ae6ab3d2645ad7cdfa6c9f64c
--- Core/Gui/test/Core.Gui.Test/Forms/Log/MessageWindowTest.cs	(.../MessageWindowTest.cs)	(revision f2d4c63c85b952a15075468b5f48048ff5122d95)
+++ Core/Gui/test/Core.Gui.Test/Forms/Log/MessageWindowTest.cs	(.../MessageWindowTest.cs)	(revision c84ccc03432a011ae6ab3d2645ad7cdfa6c9f64c)
@@ -64,34 +64,16 @@
         }
 
         [Test]
-        public void OnLoad_ExpectedMessageWindowText()
-        {
-            // Setup
-            using (var form = new Form())
-            using (MessageWindow messageWindow = ShowMessageWindow(null))
-            {
-                form.Controls.Add(messageWindow);
-
-                // Call
-                form.Show();
-
-                // Assert
-                Assert.AreEqual("Berichten", messageWindow.Text);
-            }
-        }
-
-        [Test]
         public void AddMessage_LevelIsNull_ThrowsArgumentNullException()
         {
             // Setup
             using (MessageWindow messageWindow = ShowMessageWindow(null))
             {
                 // Call
-                TestDelegate call = () => messageWindow.AddMessage(null, new DateTime(),
-                                                                   "Should throw exception");
+                void Call() => messageWindow.AddMessage(null, new DateTime(), "Should throw exception");
 
                 // Assert
-                string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+                string paramName = Assert.Throws<ArgumentNullException>(Call).ParamName;
                 Assert.AreEqual("level", paramName);
             }
         }
Index: Core/Gui/test/Core.Gui.Test/Forms/Map/MapLegendViewTest.cs
===================================================================
diff -u -raf6538ce2677998cbc514db20c2756c9dd2eac6f -rc84ccc03432a011ae6ab3d2645ad7cdfa6c9f64c
--- Core/Gui/test/Core.Gui.Test/Forms/Map/MapLegendViewTest.cs	(.../MapLegendViewTest.cs)	(revision af6538ce2677998cbc514db20c2756c9dd2eac6f)
+++ Core/Gui/test/Core.Gui.Test/Forms/Map/MapLegendViewTest.cs	(.../MapLegendViewTest.cs)	(revision c84ccc03432a011ae6ab3d2645ad7cdfa6c9f64c)
@@ -70,7 +70,6 @@
                 Assert.IsInstanceOf<IView>(view);
                 Assert.IsInstanceOf<ISelectionProvider>(view);
                 Assert.IsNull(view.Data);
-                Assert.AreEqual("Kaart", view.Text);
                 Assert.IsNotNull(treeViewControl);
                 Assert.IsInstanceOf<TreeViewControl>(treeViewControl);
             }
@@ -80,11 +79,11 @@
         public void Constructor_ContextMenuBuilderProviderNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate test = () => new MapLegendView(null);
+            void Call() => new MapLegendView(null);
 
             // Assert
             const string expectedMessage = "Cannot create a MapLegendView when the context menu builder provider is null.";
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(test, expectedMessage);
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentNullException>(Call, expectedMessage);
         }
 
         [Test]
@@ -127,10 +126,10 @@
             using (var view = new MapLegendView(contextMenuBuilderProvider))
             {
                 // Call
-                TestDelegate test = () => view.Data = new object();
+                void Call() => view.Data = new object();
 
                 // Assert
-                Assert.Throws<InvalidCastException>(test);
+                Assert.Throws<InvalidCastException>(Call);
             }
         }