Index: Core/Common/test/Core.Common.Gui.Test/Forms/MessageWindow/MessageWindowTest.cs
===================================================================
diff -u -r87dd149e8e84e23ff619cbdf7e5b6e9f710ee0e4 -rf1925f854871661dec925e71bf3f7bb012dfc7ca
--- Core/Common/test/Core.Common.Gui.Test/Forms/MessageWindow/MessageWindowTest.cs	(.../MessageWindowTest.cs)	(revision 87dd149e8e84e23ff619cbdf7e5b6e9f710ee0e4)
+++ Core/Common/test/Core.Common.Gui.Test/Forms/MessageWindow/MessageWindowTest.cs	(.../MessageWindowTest.cs)	(revision f1925f854871661dec925e71bf3f7bb012dfc7ca)
@@ -353,7 +353,7 @@
         }
 
         [Test]
-        public void ButtonShowInfo_Click_FiltersInfoMessages()
+        public void ButtonShowInfo_ButtonUnchecked_FiltersInfoMessages()
         {
             // Setup
             using (var form = new Form())
@@ -372,6 +372,7 @@
                 button.Click();
 
                 // Assert
+                Assert.IsFalse(((ToolStripButton)button.TheObject).Checked);
                 Assert.AreEqual(2, dataGridView.Rows.Count);
                 var filteredLevel = Level.Info.ToString();
                 foreach (DataGridViewRow row in dataGridView.Rows)
@@ -382,7 +383,7 @@
         }
 
         [Test]
-        public void ButtonShowWarn_Click_FiltersWarningMessages()
+        public void ButtonShowWarn_ButtonUnchecked_FiltersWarningMessages()
         {
             // Setup
             using (var form = new Form())
@@ -401,6 +402,7 @@
                 button.Click();
 
                 // Assert
+                Assert.IsFalse(((ToolStripButton)button.TheObject).Checked);
                 Assert.AreEqual(2, dataGridView.Rows.Count);
                 var filteredLevel = Level.Warn.ToString();
                 foreach (DataGridViewRow row in dataGridView.Rows)
@@ -411,7 +413,7 @@
         }
 
         [Test]
-        public void ButtonShowError_Click_FiltersErrorMessages()
+        public void ButtonShowError_ButtonUnchecked_FiltersErrorMessages()
         {
             // Setup
             using (var form = new Form())
@@ -430,6 +432,7 @@
                 button.Click();
 
                 // Assert
+                Assert.IsFalse(((ToolStripButton)button.TheObject).Checked);
                 Assert.AreEqual(2, dataGridView.Rows.Count);
                 var filteredLevel = Level.Error.ToString();
                 foreach (DataGridViewRow row in dataGridView.Rows)