Index: Core/Common/test/Core.Common.Gui.Test/Forms/MainWindow/MainWindowTest.cs
===================================================================
diff -u -r650277f75faab8d29b4a07b738f0fd2a99ac7ed3 -r6ef5ee29d4301da04bc2bd3582ccb48ae4eb7bc9
--- Core/Common/test/Core.Common.Gui.Test/Forms/MainWindow/MainWindowTest.cs	(.../MainWindowTest.cs)	(revision 650277f75faab8d29b4a07b738f0fd2a99ac7ed3)
+++ Core/Common/test/Core.Common.Gui.Test/Forms/MainWindow/MainWindowTest.cs	(.../MainWindowTest.cs)	(revision 6ef5ee29d4301da04bc2bd3582ccb48ae4eb7bc9)
@@ -315,7 +315,7 @@
 
         [Test]
         [STAThread]
-        public void InitPropertiesWindowAndActivate_GuiSetAndCalledTwice_UpdateAlreadyExistingPropertyGridViewInstance()
+        public void InitPropertiesWindowAndActivate_GuiSetAndCalledTwice_PropertyGridViewInstanceNotUpdatedRedundantly()
         {
             // Setup
             var selectedObject = new object();
@@ -326,7 +326,7 @@
             var propertyResolver = mocks.Stub<IPropertyResolver>();
             propertyResolver.Expect(r => r.GetObjectProperties(selectedObject))
                             .Return(selectedObjectProperties)
-                            .Repeat.Twice();
+                            .Repeat.Once();
 
             var gui = mocks.Stub<IGui>();
             gui.Stub(g => g.ViewHost).Return(viewHost);
@@ -348,7 +348,7 @@
                 Assert.IsNull(viewHost.ActiveDocumentView);
                 Assert.AreSame(originalPropertyGrid, mainWindow.PropertyGrid, "PropertyGrid instance should remain the same.");
                 Assert.AreEqual("Eigenschappen", mainWindow.PropertyGrid.Text);
-                Assert.AreEqual(selectedObject, mainWindow.PropertyGrid.Data);
+                Assert.AreSame(selectedObject, mainWindow.PropertyGrid.Data);
             }
 
             mocks.VerifyAll();