Index: Core/Common/src/Core.Common.Gui/Forms/ProjectExplorer/ProjectExplorer.cs
===================================================================
diff -u -r50437248686b1183bb0f23de244f7a36beef36a6 -r5cc10ef27c807f7e955f582c0c73fe9b75b6841b
--- Core/Common/src/Core.Common.Gui/Forms/ProjectExplorer/ProjectExplorer.cs	(.../ProjectExplorer.cs)	(revision 50437248686b1183bb0f23de244f7a36beef36a6)
+++ Core/Common/src/Core.Common.Gui/Forms/ProjectExplorer/ProjectExplorer.cs	(.../ProjectExplorer.cs)	(revision 5cc10ef27c807f7e955f582c0c73fe9b75b6841b)
@@ -75,10 +75,7 @@
 
         public object Data
         {
-            get
-            {
-                return treeViewControl.Data;
-            }
+            get => treeViewControl.Data;
             set
             {
                 if (!IsDisposed)
@@ -88,13 +85,7 @@
             }
         }
 
-        public object Selection
-        {
-            get
-            {
-                return treeViewControl.SelectedData;
-            }
-        }
+        public object Selection => treeViewControl.SelectedData;
 
         private void BindTreeInteractionEvents()
         {
Index: Core/Common/test/Core.Common.Gui.Test/Forms/ProjectExplorer/ProjectExplorerTest.cs
===================================================================
diff -u -r50437248686b1183bb0f23de244f7a36beef36a6 -r5cc10ef27c807f7e955f582c0c73fe9b75b6841b
--- Core/Common/test/Core.Common.Gui.Test/Forms/ProjectExplorer/ProjectExplorerTest.cs	(.../ProjectExplorerTest.cs)	(revision 50437248686b1183bb0f23de244f7a36beef36a6)
+++ Core/Common/test/Core.Common.Gui.Test/Forms/ProjectExplorer/ProjectExplorerTest.cs	(.../ProjectExplorerTest.cs)	(revision 5cc10ef27c807f7e955f582c0c73fe9b75b6841b)
@@ -40,37 +40,43 @@
     public class ProjectExplorerTest : NUnitFormTest
     {
         [Test]
-        [TestCase(0)]
-        [TestCase(1)]
-        public void Constructor_ArgumentsNull_ThrowsArgumentNullException(int paramNullIndex)
+        public void Constructor_ViewCommandsNull_ThrowsArgumentNullException()
         {
+            // Call
+            void Call() => new Gui.Forms.ProjectExplorer.ProjectExplorer(null, Enumerable.Empty<TreeNodeInfo>());
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("viewCommands", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_TreeNodeInfosNull_ThrowsArgumentNullException()
+        {
             // Setup
             var mocks = new MockRepository();
-            IViewCommands viewCommands = paramNullIndex == 0 ? null : mocks.StrictMock<IViewCommands>();
-            IEnumerable<TreeNodeInfo> treeNodeInfos = paramNullIndex == 1 ? null : Enumerable.Empty<TreeNodeInfo>();
-
+            var viewCommands = mocks.Stub<IViewCommands>();
             mocks.ReplayAll();
 
             // Call
-            TestDelegate test = () => new Common.Gui.Forms.ProjectExplorer.ProjectExplorer(viewCommands, treeNodeInfos);
+            void Call() => new Gui.Forms.ProjectExplorer.ProjectExplorer(viewCommands, null);
 
             // Assert
-            Assert.Throws<ArgumentNullException>(test);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("treeNodeInfos", exception.ParamName);
             mocks.VerifyAll();
         }
 
         [Test]
-        public void Constructor_NoNullArguments_CreatesNewInstance()
+        public void Constructor_ExpectedValues()
         {
             // Setup
             var mocks = new MockRepository();
             var viewCommands = mocks.StrictMock<IViewCommands>();
-            IEnumerable<TreeNodeInfo> treeNodeInfos = Enumerable.Empty<TreeNodeInfo>();
-
             mocks.ReplayAll();
 
             // Call
-            using (var explorer = new Common.Gui.Forms.ProjectExplorer.ProjectExplorer(viewCommands, treeNodeInfos))
+            using (var explorer = new Gui.Forms.ProjectExplorer.ProjectExplorer(viewCommands, Enumerable.Empty<TreeNodeInfo>()))
             {
                 // Assert
                 Assert.IsInstanceOf<IProjectExplorer>(explorer);
@@ -86,9 +92,8 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var viewCommands = mocks.StrictMock<IViewCommands>();
+            var viewCommands = mocks.Stub<IViewCommands>();
             var project = mocks.Stub<IProject>();
-
             mocks.ReplayAll();
 
             IEnumerable<TreeNodeInfo> treeNodeInfos = new[]
@@ -99,7 +104,7 @@
                 }
             };
 
-            using (var explorer = new Common.Gui.Forms.ProjectExplorer.ProjectExplorer(viewCommands, treeNodeInfos))
+            using (var explorer = new Gui.Forms.ProjectExplorer.ProjectExplorer(viewCommands, treeNodeInfos))
             {
                 var treeViewControl = TypeUtils.GetField<TreeViewControl>(explorer, "treeViewControl");
 
@@ -118,11 +123,9 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var viewCommands = mocks.StrictMock<IViewCommands>();
             var project = mocks.Stub<IProject>();
-
+            var viewCommands = mocks.StrictMock<IViewCommands>();
             viewCommands.Expect(vc => vc.RemoveAllViewsForItem(project));
-
             mocks.ReplayAll();
 
             IEnumerable<TreeNodeInfo> treeNodeInfos = new[]
@@ -140,7 +143,7 @@
                 messageBox.ClickOk();
             };
 
-            using (var explorer = new Common.Gui.Forms.ProjectExplorer.ProjectExplorer(viewCommands, treeNodeInfos)
+            using (var explorer = new Gui.Forms.ProjectExplorer.ProjectExplorer(viewCommands, treeNodeInfos)
             {
                 Data = project
             })
@@ -162,12 +165,10 @@
             // Setup
             var mocks = new MockRepository();
             var viewCommands = mocks.StrictMock<IViewCommands>();
-
             var project = mocks.Stub<IProject>();
-            const string stringA = "testA";
-
             mocks.ReplayAll();
 
+            const string stringA = "testA";
             const string stringB = "testB";
 
             IEnumerable<TreeNodeInfo> treeNodeInfos = new[]
@@ -187,7 +188,7 @@
                 }
             };
 
-            using (var explorer = new Common.Gui.Forms.ProjectExplorer.ProjectExplorer(viewCommands, treeNodeInfos)
+            using (var explorer = new Gui.Forms.ProjectExplorer.ProjectExplorer(viewCommands, treeNodeInfos)
             {
                 Data = project
             })
@@ -217,13 +218,11 @@
             // Setup
             const string treeIdentifier = "SomeName";
             const string formIdentifier = "SomeForm";
-            var mocks = new MockRepository();
 
+            var mocks = new MockRepository();
             var viewCommands = mocks.StrictMock<IViewCommands>();
             viewCommands.Expect(a => a.OpenViewForSelection());
-
             var project = mocks.Stub<IProject>();
-
             mocks.ReplayAll();
 
             IEnumerable<TreeNodeInfo> treeNodeInfos = new[]
@@ -234,7 +233,7 @@
                 }
             };
 
-            using (var explorer = new Common.Gui.Forms.ProjectExplorer.ProjectExplorer(viewCommands, treeNodeInfos)
+            using (var explorer = new Gui.Forms.ProjectExplorer.ProjectExplorer(viewCommands, treeNodeInfos)
             {
                 Data = project
             })
@@ -269,9 +268,8 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var viewCommands = mocks.StrictMock<IViewCommands>();
+            var viewCommands = mocks.Stub<IViewCommands>();
             var project = mocks.Stub<IProject>();
-
             mocks.ReplayAll();
 
             const string stringA = "testA";
@@ -294,7 +292,7 @@
                 }
             };
 
-            using (var explorer = new Common.Gui.Forms.ProjectExplorer.ProjectExplorer(viewCommands, treeNodeInfos)
+            using (var explorer = new Gui.Forms.ProjectExplorer.ProjectExplorer(viewCommands, treeNodeInfos)
             {
                 Data = project
             })