Index: src/Common/DelftTools.Shell.Core/ApplicationPlugin.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r6b59ea277522a35859f061196c54d808249c4fb0
--- src/Common/DelftTools.Shell.Core/ApplicationPlugin.cs	(.../ApplicationPlugin.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ src/Common/DelftTools.Shell.Core/ApplicationPlugin.cs	(.../ApplicationPlugin.cs)	(revision 6b59ea277522a35859f061196c54d808249c4fb0)
@@ -6,29 +6,29 @@
 namespace DelftTools.Shell.Core
 {
     /// <summary>
-    /// Provides default functionality making it easier to implement IPlugin.
+    /// Provides default functionality making it easier to implement <see cref="IPlugin"/>.
     /// Handles Active status in activate/deactivate.
     /// </summary>
     public abstract class ApplicationPlugin : IPlugin
     {
         /// <summary>
         ///  Gets the name of the plugin.
-        ///  <value>The name.</value></summary>
+        /// </summary>
         public abstract string Name { get; }
 
         /// <summary>
-        ///  Gets the name of the plugin as displayed in the Gui.
-        ///  <value>The name.</value></summary>
+        ///  Gets the name of the plugin as displayed in the user interface.
+        /// </summary>
         public abstract string DisplayName { get; }
 
         /// <summary>
-        ///  Gets the description.
-        ///  <value>The description.</value></summary>
+        ///  Gets the description of the plugin.
+        /// </summary>
         public abstract string Description { get; }
 
         /// <summary>
         ///  Gets the version of the plugin.
-        ///  <value>The version.</value></summary>
+        /// </summary>
         public abstract string Version { get; }
 
         /// <summary>
Index: src/Common/DelftTools.Shell.Core/DelftTools.Shell.Core.csproj
===================================================================
diff -u -r8702d012630646100a38f3e7f3e8ea3dd9749718 -r6b59ea277522a35859f061196c54d808249c4fb0
--- src/Common/DelftTools.Shell.Core/DelftTools.Shell.Core.csproj	(.../DelftTools.Shell.Core.csproj)	(revision 8702d012630646100a38f3e7f3e8ea3dd9749718)
+++ src/Common/DelftTools.Shell.Core/DelftTools.Shell.Core.csproj	(.../DelftTools.Shell.Core.csproj)	(revision 6b59ea277522a35859f061196c54d808249c4fb0)
@@ -146,7 +146,6 @@
     <Compile Include="Dao\IProjectRepositoryListener.cs" />
     <Compile Include="Dao\IProjectTemplateFileBuilder.cs" />
     <Compile Include="Extensions\CompositeActivityExtensions.cs" />
-    <Compile Include="Extensions\FilePathHandler.cs" />
     <Compile Include="IObservable.cs" />
     <Compile Include="IObserver.cs" />
     <Compile Include="IPlugin.cs" />
@@ -163,7 +162,6 @@
     <Compile Include="Workflow\IActivityRunner.cs" />
     <Compile Include="IProjectItemExporter.cs" />
     <Compile Include="IProjectItem.cs" />
-    <Compile Include="Extensions\ProjectItemExtensions.cs" />
     <Compile Include="IProjectImporter.cs" />
     <Compile Include="ApplicationPlugin.cs" />
     <Compile Include="Dao\IDataAccessListener.cs" />
Index: src/Common/DelftTools.Shell.Core/Extensions/CompositeActivityExtensions.cs
===================================================================
diff -u -r8702d012630646100a38f3e7f3e8ea3dd9749718 -r6b59ea277522a35859f061196c54d808249c4fb0
--- src/Common/DelftTools.Shell.Core/Extensions/CompositeActivityExtensions.cs	(.../CompositeActivityExtensions.cs)	(revision 8702d012630646100a38f3e7f3e8ea3dd9749718)
+++ src/Common/DelftTools.Shell.Core/Extensions/CompositeActivityExtensions.cs	(.../CompositeActivityExtensions.cs)	(revision 6b59ea277522a35859f061196c54d808249c4fb0)
@@ -3,16 +3,25 @@
 
 namespace DelftTools.Shell.Core.Extensions
 {
+    /// <summary>
+    /// Extension methods for <see cref="ICompositeActivity"/>.
+    /// </summary>
     public static class CompositeActivityExtensions
     {
-        public static IEnumerable<T> GetAllActivitiesRecursive<T>(this ICompositeActivity compositeModel) where T : IActivity
+        /// <summary>
+        /// Gets all activities recursively matching a given type.
+        /// </summary>
+        /// <typeparam name="T">The type of activity to be matched for.</typeparam>
+        /// <param name="compositeActivity">The composite activity.</param>
+        /// <returns>An iterator over all activities implementing/inheriting <typeparamref name="T"/>.</returns>
+        public static IEnumerable<T> GetAllActivitiesRecursive<T>(this ICompositeActivity compositeActivity) where T : IActivity
         {
-            if (compositeModel is T)
+            if (compositeActivity is T)
             {
-                yield return (T) compositeModel;
+                yield return (T) compositeActivity;
             }
 
-            foreach (var subActivity in compositeModel.Activities)
+            foreach (var subActivity in compositeActivity.Activities)
             {
                 var compActivity = subActivity as ICompositeActivity;
                 if (compActivity != null)
@@ -31,31 +40,5 @@
                 }
             }
         }
-
-        private static ICompositeActivity GetParentActivity(IActivity workflow, IActivity targetActivity)
-        {
-            var compositeWorkflow = workflow as ICompositeActivity;
-            if (compositeWorkflow == null)
-            {
-                return null;
-            }
-
-            foreach (var a in compositeWorkflow.Activities)
-            {
-                if (a == targetActivity)
-                {
-                    return compositeWorkflow;
-                }
-
-                var parent = GetParentActivity(a, targetActivity);
-
-                if (parent != null)
-                {
-                    return parent;
-                }
-            }
-
-            return null;
-        }
     }
 }
\ No newline at end of file
Fisheye: Tag 6b59ea277522a35859f061196c54d808249c4fb0 refers to a dead (removed) revision in file `src/Common/DelftTools.Shell.Core/Extensions/FilePathHandler.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6b59ea277522a35859f061196c54d808249c4fb0 refers to a dead (removed) revision in file `src/Common/DelftTools.Shell.Core/Extensions/ProjectItemExtensions.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: src/Common/DelftTools.Shell.Core/Project.cs
===================================================================
diff -u -r5f9327caaaca2d654839bcdcdcf70529e8263d17 -r6b59ea277522a35859f061196c54d808249c4fb0
--- src/Common/DelftTools.Shell.Core/Project.cs	(.../Project.cs)	(revision 5f9327caaaca2d654839bcdcdcf70529e8263d17)
+++ src/Common/DelftTools.Shell.Core/Project.cs	(.../Project.cs)	(revision 6b59ea277522a35859f061196c54d808249c4fb0)
@@ -10,13 +10,6 @@
     [Entity(FireOnCollectionChange = false)]
     public class Project : IObservable
     {
-        private string name;
-        private string description;
-
-        private bool isChanged;
-        private bool isTemporary;
-        private bool isMigrated;
-
         /// <summary>
         /// Creates instance of the Project.
         /// </summary>
@@ -25,33 +18,25 @@
         }
 
         /// <summary>
-        /// Creates instance of the Project using the supplied <paramref name="name"/>.
+        /// Creates instance of the project using the supplied <paramref name="name"/>.
         /// </summary>
         /// <param name="name">Readable name of the project.</param>
         public Project(string name)
         {
-            this.name = name;
+            Name = name;
 
             Items = new EventedList<object>();
         }
 
         /// <summary>
         /// Gets or sets a readable name of the project.
         /// </summary>
-        public string Name
-        {
-            get { return name; }
-            set { name = value; }
-        }
+        public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets description of the project.
         /// </summary>
-        public string Description
-        {
-            get { return description; }
-            set { description = value; }
-        }
+        public string Description { get; set; }
 
         /// <summary>
         /// The items in the project.
@@ -61,20 +46,12 @@
         /// <summary>
         /// True if project has changes.
         /// </summary>
-        public bool IsChanged
-        {
-            get { return isChanged; }
-            set { isChanged = value; }
-        }
+        public bool IsChanged { get; set; }
 
         /// <summary>
         /// True if project is temporary.
         /// </summary>
-        public bool IsTemporary
-        {
-            get { return isTemporary; }
-            set { isTemporary = value; }
-        }
+        public bool IsTemporary { get; set; }
 
         # region IObservable
 
Index: test/Common/DelftTools.Tests/DelftTools.Tests.csproj
===================================================================
diff -u -rf3b4a403f57012040e904bb19f7d7bde6e35198c -r6b59ea277522a35859f061196c54d808249c4fb0
--- test/Common/DelftTools.Tests/DelftTools.Tests.csproj	(.../DelftTools.Tests.csproj)	(revision f3b4a403f57012040e904bb19f7d7bde6e35198c)
+++ test/Common/DelftTools.Tests/DelftTools.Tests.csproj	(.../DelftTools.Tests.csproj)	(revision 6b59ea277522a35859f061196c54d808249c4fb0)
@@ -179,7 +179,9 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <Compile Include="Shell\Core\ApplicationPluginTest.cs" />
     <Compile Include="Shell\Core\DataItemInfoTest.cs" />
+    <Compile Include="Shell\Core\Extensions\CompositeActivityExtensionsTest.cs" />
     <Compile Include="Shell\Core\WorkFlow\BackgroundWorkerTest.cs" />
     <Compile Include="Shell\Core\WorkFlow\CompositeActivityTest.cs" />
     <Compile Include="Shell\Core\WorkFlow\FileImportActivityTest.cs" />
Index: test/Common/DelftTools.Tests/Shell/Core/ApplicationPluginTest.cs
===================================================================
diff -u
--- test/Common/DelftTools.Tests/Shell/Core/ApplicationPluginTest.cs	(revision 0)
+++ test/Common/DelftTools.Tests/Shell/Core/ApplicationPluginTest.cs	(revision 6b59ea277522a35859f061196c54d808249c4fb0)
@@ -0,0 +1,140 @@
+using System.Linq;
+
+using DelftTools.Shell.Core;
+
+using NUnit.Framework;
+
+namespace DelftTools.Tests.Shell.Core
+{
+    [TestFixture]
+    public class ApplicationPluginTest
+    {
+        [Test]
+        public void DefaultConstructor_ExpectedValues()
+        {
+            // call
+            var applicationPlugin = new SimpleApplicationPlugin();
+
+            // assert
+            Assert.IsFalse(applicationPlugin.IsActive);
+            Assert.IsNull(applicationPlugin.Image);
+            Assert.IsNull(applicationPlugin.Resources);
+            Assert.IsNull(applicationPlugin.Application);
+            CollectionAssert.IsEmpty(applicationPlugin.DependentPluginNames);
+        }
+
+        [Test]
+        public void GetFileImporters_ReturnEmptyEnummerable()
+        {
+            // setup
+            var applicationPlugin = new SimpleApplicationPlugin();
+
+            // call
+            var importers = applicationPlugin.GetFileImporters().ToArray();
+
+            // assert
+            CollectionAssert.IsEmpty(importers);
+        }
+
+        [Test]
+        public void GetFileExporters_ReturnEmptyEnummerable()
+        {
+            // setup
+            var applicationPlugin = new SimpleApplicationPlugin();
+
+            // call
+            var importers = applicationPlugin.GetFileExporters().ToArray();
+
+            // assert
+            CollectionAssert.IsEmpty(importers);
+        }
+
+        [Test]
+        public void GetDataItemInfos_ReturnEmptyEnummerable()
+        {
+            // setup
+            var applicationPlugin = new SimpleApplicationPlugin();
+
+            // call
+            var importers = applicationPlugin.GetDataItemInfos().ToArray();
+
+            // assert
+            CollectionAssert.IsEmpty(importers);
+        }
+
+        [Test]
+        public void GetPersistentAssemblies_ReturnEmptyEnummerable()
+        {
+            // setup
+            var applicationPlugin = new SimpleApplicationPlugin();
+
+            // call
+            var importers = applicationPlugin.GetPersistentAssemblies().ToArray();
+
+            // assert
+            CollectionAssert.IsEmpty(importers);
+        }
+
+        [Test]
+        public void Activate_PluginWasNotActivated_SetIsActiveTrue()
+        {
+            // setup
+            var applicationPlugin = new SimpleApplicationPlugin();
+
+            // call
+            applicationPlugin.Activate();
+
+            // assert
+            Assert.IsTrue(applicationPlugin.IsActive);
+        }
+
+        [Test]
+        public void Deactivate_PluginWasActivated_SetIsActiveFalse()
+        {
+            // setup
+            var applicationPlugin = new SimpleApplicationPlugin();
+            applicationPlugin.Activate();
+
+            // call
+            applicationPlugin.Deactivate();
+
+            // assert
+            Assert.IsFalse(applicationPlugin.IsActive);
+        }
+    }
+
+    class SimpleApplicationPlugin : ApplicationPlugin
+    {
+        public override string Name
+        {
+            get
+            {
+                throw new System.NotImplementedException();
+            }
+        }
+
+        public override string DisplayName
+        {
+            get
+            {
+                throw new System.NotImplementedException();
+            }
+        }
+
+        public override string Description
+        {
+            get
+            {
+                throw new System.NotImplementedException();
+            }
+        }
+
+        public override string Version
+        {
+            get
+            {
+                throw new System.NotImplementedException();
+            }
+        }
+    }
+}
\ No newline at end of file
Index: test/Common/DelftTools.Tests/Shell/Core/Extensions/CompositeActivityExtensionsTest.cs
===================================================================
diff -u
--- test/Common/DelftTools.Tests/Shell/Core/Extensions/CompositeActivityExtensionsTest.cs	(revision 0)
+++ test/Common/DelftTools.Tests/Shell/Core/Extensions/CompositeActivityExtensionsTest.cs	(revision 6b59ea277522a35859f061196c54d808249c4fb0)
@@ -0,0 +1,147 @@
+using System.Linq;
+
+using DelftTools.Shell.Core.Extensions;
+using DelftTools.Shell.Core.Workflow;
+using DelftTools.Utils.Collections.Generic;
+
+using NUnit.Framework;
+
+using Rhino.Mocks;
+
+namespace DelftTools.Tests.Shell.Core.Extensions
+{
+    [TestFixture]
+    public class CompositeActivityExtensionsTest
+    {
+        [Test]
+        public void GetAllActivitiesRecursive_CompositeActivityWithoutChildren_ReturnOnlyCompositeActivity()
+        {
+            // setup
+            var activitiesList = new EventedList<IActivity>();
+
+            var mocks = new MockRepository();
+            var compositeActivityMock = mocks.StrictMock<ICompositeActivity>();
+            compositeActivityMock.Expect(ca => ca.Activities).Return(activitiesList);
+            mocks.ReplayAll();
+
+            // call
+            var allActivities = compositeActivityMock.GetAllActivitiesRecursive<IActivity>().ToArray();
+
+            // assert
+            CollectionAssert.AreEqual(new[] { compositeActivityMock }, allActivities);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void GetAllActivitiesRecursive_CompositeActivityWithoutChildrenNotMatchingRequestedActivityType_ReturnEmptyEnummerable()
+        {
+            // setup
+            var activitiesList = new EventedList<IActivity>();
+
+            var mocks = new MockRepository();
+            var compositeActivityMock = mocks.StrictMock<ICompositeActivity>();
+            compositeActivityMock.Expect(ca => ca.Activities).Return(activitiesList);
+            mocks.ReplayAll();
+
+            // call
+            var allActivities = compositeActivityMock.GetAllActivitiesRecursive<ISomeActivity>().ToArray();
+
+            // assert
+            CollectionAssert.IsEmpty(allActivities);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void GetAllActivitiesRecursive_CompositeActivityWithChildren_ReturnCompositeActivityAndChildren()
+        {
+            // setup
+            var activitiesList = new EventedList<IActivity>();
+
+            var mocks = new MockRepository();
+            var compositeActivityMock = mocks.StrictMock<ICompositeActivity>();
+            compositeActivityMock.Expect(ca => ca.Activities).Return(activitiesList);
+            var childActivity1 = mocks.StrictMock<IActivity>();
+            var childActivity2 = mocks.StrictMock<ISomeActivity>();
+            mocks.ReplayAll();
+
+            activitiesList.AddRange(new[] { childActivity1, childActivity2 });
+
+            // call
+            var allActivities = compositeActivityMock.GetAllActivitiesRecursive<IActivity>().ToArray();
+
+            // assert
+            var expected = new[] { compositeActivityMock, childActivity1, childActivity2 };
+            CollectionAssert.AreEqual(expected, allActivities);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void GetAllActivitiesRecursive_CompositeActivityWithSomeChildrenMatching_ReturnOnlyMatchingChildren()
+        {
+            // setup
+            var activitiesList = new EventedList<IActivity>();
+
+            var mocks = new MockRepository();
+            var compositeActivityMock = mocks.StrictMock<ICompositeActivity>();
+            compositeActivityMock.Expect(ca => ca.Activities).Return(activitiesList);
+            var childActivity1 = mocks.StrictMock<IActivity>();
+            var childActivity2 = mocks.StrictMock<ISomeActivity>();
+            mocks.ReplayAll();
+
+            activitiesList.AddRange(new[] { childActivity1, childActivity2 });
+
+            // call
+            var allActivities = compositeActivityMock.GetAllActivitiesRecursive<ISomeActivity>().ToArray();
+
+            // assert
+            CollectionAssert.AreEqual(new[] { childActivity2 }, allActivities);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void GetAllActivitiesRecursive_NestedCompositeActivities_ReturnAllActivities()
+        {
+            // setup
+            var activitiesList1 = new EventedList<IActivity>();
+            var activitiesList2 = new EventedList<IActivity>();
+            var activitiesList3 = new EventedList<IActivity>();
+
+            var mocks = new MockRepository();
+            var compositeActivityMock1 = mocks.StrictMock<ICompositeActivity>();
+            compositeActivityMock1.Expect(ca => ca.Activities).Return(activitiesList1);
+
+            var childActivity1 = mocks.StrictMock<ICompositeActivity>();
+            childActivity1.Expect(ca => ca.Activities).Return(activitiesList2);
+
+            var childActivity2 = mocks.StrictMock<ICompositeActivity>();
+            childActivity2.Expect(ca => ca.Activities).Return(activitiesList3);
+
+            var sub1ChildActivity1 = mocks.StrictMock<IActivity>();
+            var sub1ChildActivity2 = mocks.StrictMock<IActivity>();
+
+            var sub2ChildActivity1 = mocks.StrictMock<IActivity>();
+            var sub2ChildActivity2 = mocks.StrictMock<IActivity>();
+
+            mocks.ReplayAll();
+
+            activitiesList1.AddRange(new[] { childActivity1, childActivity2 });
+            activitiesList2.AddRange(new[] { sub1ChildActivity1, sub1ChildActivity2 });
+            activitiesList3.AddRange(new[] { sub2ChildActivity1, sub2ChildActivity2 });
+
+            // call
+            var allActivities = compositeActivityMock1.GetAllActivitiesRecursive<IActivity>().ToArray();
+
+            // assert
+            var expected = new[] { compositeActivityMock1, 
+                childActivity1, sub1ChildActivity1, sub1ChildActivity2, 
+                childActivity2, sub2ChildActivity1, sub2ChildActivity2 };
+            CollectionAssert.AreEqual(expected, allActivities);
+            mocks.VerifyAll();
+        }
+
+        public interface ISomeActivity : IActivity
+        {
+             
+        }
+    }
+}
\ No newline at end of file
Index: test/Common/DelftTools.Tests/Shell/Core/ProjectTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r6b59ea277522a35859f061196c54d808249c4fb0
--- test/Common/DelftTools.Tests/Shell/Core/ProjectTest.cs	(.../ProjectTest.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/Common/DelftTools.Tests/Shell/Core/ProjectTest.cs	(.../ProjectTest.cs)	(revision 6b59ea277522a35859f061196c54d808249c4fb0)
@@ -1,23 +1,111 @@
+using System.ComponentModel;
+
 using DelftTools.Shell.Core;
+
 using NUnit.Framework;
 
+using Rhino.Mocks;
+
 namespace DelftTools.Tests.Shell.Core
 {
     [TestFixture]
     public class ProjectTest
     {
         [Test]
-        public void CreateWithDefaultName()
+        public void DefaultConstructor_ExpectedValue()
         {
+            // call
             var project = new Project();
+
+            // assert
+            Assert.IsInstanceOf<INotifyPropertyChanging>(project);
+            Assert.IsInstanceOf<INotifyPropertyChanged>(project);
+            Assert.IsInstanceOf<IObservable>(project);
+
             Assert.AreEqual("Project", project.Name);
+            Assert.IsNull(project.Description);
+            CollectionAssert.IsEmpty(project.Items);
+            Assert.IsFalse(project.IsChanged);
+            Assert.IsFalse(project.IsTemporary);
         }
 
         [Test]
-        public void CreateWithCustomName()
+        public void NameConstructor_SetNameAndInitializeOtherProperties()
         {
-            var project = new Project("Test Project");
-            Assert.AreEqual(project.Name, "Test Project");
+            // setup
+            const string someName = "<Some name>";
+
+            // call
+            var project = new Project(someName);
+
+            // assert
+            Assert.AreEqual(someName, project.Name);
+            Assert.IsNull(project.Description);
+            CollectionAssert.IsEmpty(project.Items);
+            Assert.IsFalse(project.IsChanged);
+            Assert.IsFalse(project.IsTemporary);
         }
+
+        [Test]
+        public void AutomaticProperties_SetAndGettingValue_ShouldReturnSetValue()
+        {
+            // setup & Call
+            const string niceProjectName = "Nice project name";
+            const string nicerDescription = "Nicer description";
+
+            var project = new Project
+            {
+                Name = niceProjectName,
+                Description = nicerDescription,
+                IsChanged = true,
+                IsTemporary = true
+            };
+
+            // assert
+            Assert.AreEqual(niceProjectName, project.Name);
+            Assert.AreEqual(nicerDescription, project.Description);
+            Assert.IsTrue(project.IsChanged);
+            Assert.IsTrue(project.IsTemporary);
+        }
+
+        [Test]
+        public void NotifyObservers_WithObserverAttached_ObserverIsNotified()
+        {
+            // setup
+            var mocks = new MockRepository();
+            var observerMock = mocks.StrictMock<IObserver>();
+            observerMock.Expect(o => o.UpdateObserver());
+            mocks.ReplayAll();
+
+            var project = new Project();
+            project.Attach(observerMock);
+
+            // call
+            project.NotifyObservers();
+
+            // assert
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void NotifyObservers_AttachedObserverHasBeenDetached_ObserverShouldNoLongerBeNotified()
+        {
+            // setup
+            var mocks = new MockRepository();
+            var observerMock = mocks.StrictMock<IObserver>();
+            observerMock.Expect(o => o.UpdateObserver()).Repeat.Once();
+            mocks.ReplayAll();
+
+            var project = new Project();
+            project.Attach(observerMock);
+            project.NotifyObservers();
+
+            // call
+            project.Detach(observerMock);
+            project.NotifyObservers();
+
+            // assert
+            mocks.VerifyAll();
+        }
     }
 }
\ No newline at end of file