Index: src/Plugins/Wti/Wti.Forms/NodePresenters/WtiProjectNodePresenter.cs
===================================================================
diff -u -r5f7007ed48dccd78b0a07db987bf234a6705ec9b -r493a740c5f9592074c117c718b2f9b0af310c355
--- src/Plugins/Wti/Wti.Forms/NodePresenters/WtiProjectNodePresenter.cs	(.../WtiProjectNodePresenter.cs)	(revision 5f7007ed48dccd78b0a07db987bf234a6705ec9b)
+++ src/Plugins/Wti/Wti.Forms/NodePresenters/WtiProjectNodePresenter.cs	(.../WtiProjectNodePresenter.cs)	(revision 493a740c5f9592074c117c718b2f9b0af310c355)
@@ -11,6 +11,9 @@
 
 namespace Wti.Forms.NodePresenters
 {
+    /// <summary>
+    /// Node presenter for <see cref="WtiProject"/> items in the tree view.
+    /// </summary>
     public class WtiProjectNodePresenter : ITreeNodePresenter
     {
         public ITreeView TreeView { get; set; }
Index: src/Plugins/Wti/Wti.Forms/PropertyClasses/WtiProjectProperties.cs
===================================================================
diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -r493a740c5f9592074c117c718b2f9b0af310c355
--- src/Plugins/Wti/Wti.Forms/PropertyClasses/WtiProjectProperties.cs	(.../WtiProjectProperties.cs)	(revision 5fc71a385897af92ccb092f2f969b5709afab85a)
+++ src/Plugins/Wti/Wti.Forms/PropertyClasses/WtiProjectProperties.cs	(.../WtiProjectProperties.cs)	(revision 493a740c5f9592074c117c718b2f9b0af310c355)
@@ -5,6 +5,9 @@
 
 namespace Wti.Forms.PropertyClasses
 {
+    /// <summary>
+    /// ViewModel of <see cref="WtiProject"/> for properties panel.
+    /// </summary>
     [ResourcesDisplayName(typeof(Resources), "WtiProjectPropertiesDisplayName")]
     public class WtiProjectProperties : ObjectProperties<WtiProject>
     {
Index: test/Plugins/Wti/Wti.Forms.Test/NodePresenters/WtiProjectNodePresenterTest.cs
===================================================================
diff -u -r5f7007ed48dccd78b0a07db987bf234a6705ec9b -r493a740c5f9592074c117c718b2f9b0af310c355
--- test/Plugins/Wti/Wti.Forms.Test/NodePresenters/WtiProjectNodePresenterTest.cs	(.../WtiProjectNodePresenterTest.cs)	(revision 5f7007ed48dccd78b0a07db987bf234a6705ec9b)
+++ test/Plugins/Wti/Wti.Forms.Test/NodePresenters/WtiProjectNodePresenterTest.cs	(.../WtiProjectNodePresenterTest.cs)	(revision 493a740c5f9592074c117c718b2f9b0af310c355)
@@ -374,10 +374,18 @@
         public void RemoveNodeData_ProjectWithWtiProject_ReturnTrueAndRemoveWtiProject()
         {
             // Setup
+            var mocks = new MockRepository();
+
+            var observerMock = mocks.StrictMock<IObserver>();
+            observerMock.Expect(o => o.UpdateObserver());
+
+            mocks.ReplayAll();
+
             var wtiProject = new WtiProject();
 
             var project = new Project();
             project.Items.Add(wtiProject);
+            project.Attach(observerMock);
 
             var nodePresenter = new WtiProjectNodePresenter();
 
@@ -387,6 +395,7 @@
             // Assert
             Assert.IsTrue(removalSuccesful);
             CollectionAssert.DoesNotContain(project.Items, wtiProject);
+            mocks.VerifyAll();
         }
 
         [Test]
Index: test/Plugins/Wti/Wti.Forms.Test/PropertyClasses/WtiProjectPropertiesTest.cs
===================================================================
diff -u -rcbc411cd86a4b826cfb17e0ac45921c0f6433f93 -r493a740c5f9592074c117c718b2f9b0af310c355
--- test/Plugins/Wti/Wti.Forms.Test/PropertyClasses/WtiProjectPropertiesTest.cs	(.../WtiProjectPropertiesTest.cs)	(revision cbc411cd86a4b826cfb17e0ac45921c0f6433f93)
+++ test/Plugins/Wti/Wti.Forms.Test/PropertyClasses/WtiProjectPropertiesTest.cs	(.../WtiProjectPropertiesTest.cs)	(revision 493a740c5f9592074c117c718b2f9b0af310c355)
@@ -56,9 +56,12 @@
                 Data = project
             };
 
-            // Call & Assert
             const string newName = "Test";
+
+            // Call
             properties.Name = newName;
+
+            // Assert
             Assert.AreEqual(newName, project.Name);
             mocks.VerifyAll();
         }
Index: test/Plugins/Wti/Wti.Plugin.Test/Wti.Plugin.Test.csproj
===================================================================
diff -u -rbb61ed227cf79e994b84019096e4297b2fbd4527 -r493a740c5f9592074c117c718b2f9b0af310c355
--- test/Plugins/Wti/Wti.Plugin.Test/Wti.Plugin.Test.csproj	(.../Wti.Plugin.Test.csproj)	(revision bb61ed227cf79e994b84019096e4297b2fbd4527)
+++ test/Plugins/Wti/Wti.Plugin.Test/Wti.Plugin.Test.csproj	(.../Wti.Plugin.Test.csproj)	(revision 493a740c5f9592074c117c718b2f9b0af310c355)
@@ -38,12 +38,16 @@
     <Reference Include="nunit.framework">
       <HintPath>..\..\..\..\lib\nunit.framework.dll</HintPath>
     </Reference>
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
     <Reference Include="Rhino.Mocks">
       <HintPath>..\..\..\..\lib\Rhino.Mocks.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Xaml" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="FileImporter\PipingSurfaceLineCsvImporterTest.cs" />
Index: test/Plugins/Wti/Wti.Plugin.Test/WtiApplicationPluginTest.cs
===================================================================
diff -u -rbb61ed227cf79e994b84019096e4297b2fbd4527 -r493a740c5f9592074c117c718b2f9b0af310c355
--- test/Plugins/Wti/Wti.Plugin.Test/WtiApplicationPluginTest.cs	(.../WtiApplicationPluginTest.cs)	(revision bb61ed227cf79e994b84019096e4297b2fbd4527)
+++ test/Plugins/Wti/Wti.Plugin.Test/WtiApplicationPluginTest.cs	(.../WtiApplicationPluginTest.cs)	(revision 493a740c5f9592074c117c718b2f9b0af310c355)
@@ -9,6 +9,9 @@
 using PluginResources = Wti.Plugin.Properties.Resources;
 using FormsResources = Wti.Forms.Properties.Resources;
 
+using WtiFormsResources = Wti.Forms.Properties.Resources;
+using ApplicationResources = Wti.Plugin.Properties.Resources;
+
 namespace Wti.Plugin.Test
 {
     [TestFixture]
@@ -53,8 +56,8 @@
             Assert.AreEqual(1, dataItemDefinitions.Length);
 
             DataItemInfo projectDataItemDefinition = dataItemDefinitions.Single(did => did.ValueType == typeof(WtiProject));
-            Assert.AreEqual("WTI project", projectDataItemDefinition.Name);
-            Assert.AreEqual("WTI", projectDataItemDefinition.Category);
+            Assert.AreEqual(WtiFormsResources.WtiProjectPropertiesDisplayName, projectDataItemDefinition.Name);
+            Assert.AreEqual(ApplicationResources.WtiApplicationName, projectDataItemDefinition.Category);
             Assert.AreEqual(16, projectDataItemDefinition.Image.Width);
             Assert.AreEqual(16, projectDataItemDefinition.Image.Height);
             Assert.IsNull(projectDataItemDefinition.AdditionalOwnerCheck);
Index: test/Plugins/Wti/Wti.Plugin.Test/WtiGuiPluginTest.cs
===================================================================
diff -u -r478eba1f522cf32a93af43eae48f6a2c167f9ae8 -r493a740c5f9592074c117c718b2f9b0af310c355
--- test/Plugins/Wti/Wti.Plugin.Test/WtiGuiPluginTest.cs	(.../WtiGuiPluginTest.cs)	(revision 478eba1f522cf32a93af43eae48f6a2c167f9ae8)
+++ test/Plugins/Wti/Wti.Plugin.Test/WtiGuiPluginTest.cs	(.../WtiGuiPluginTest.cs)	(revision 493a740c5f9592074c117c718b2f9b0af310c355)
@@ -19,6 +19,7 @@
     public class WtiGuiPluginTest
     {
         [Test]
+        [STAThread] // For creation of XAML UI component
         public void DefaultConstructor_ExpectedValues()
         {
             // call
@@ -30,6 +31,7 @@
                 Assert.AreEqual(GuiPluginResources.wtiGuiPluginDisplayName, wtiGuiPlugin.DisplayName);
                 Assert.AreEqual(GuiPluginResources.wtiGuiPluginDescription, wtiGuiPlugin.Description);
                 Assert.AreEqual("0.5.0.0", wtiGuiPlugin.Version);
+                Assert.IsInstanceOf<WtiRibbon>(wtiGuiPlugin.RibbonCommandHandler);
             }
         }