Index: Core/Common/test/Core.Common.Base.Test/Core.Common.Base.Test.csproj
===================================================================
diff -u -r66c1d9f2620a134d459aca4d428b48b62ddbae23 -r6016a9db20f1833086b35bc6aedcb2b0a3efe19d
--- Core/Common/test/Core.Common.Base.Test/Core.Common.Base.Test.csproj	(.../Core.Common.Base.Test.csproj)	(revision 66c1d9f2620a134d459aca4d428b48b62ddbae23)
+++ Core/Common/test/Core.Common.Base.Test/Core.Common.Base.Test.csproj	(.../Core.Common.Base.Test.csproj)	(revision 6016a9db20f1833086b35bc6aedcb2b0a3efe19d)
@@ -125,21 +125,15 @@
     <Compile Include="Controls\Swf\TreeViewControls\TreeViewControllerTest.cs" />
     <Compile Include="Controls\Swf\TreeViewControls\TreeViewTest.cs" />
     <Compile Include="ObservableTest.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Shell\Core\ApplicationPluginTest.cs" />
-    <Compile Include="Shell\Core\DataItemInfoTest.cs" />
-    <Compile Include="Shell\Core\ObservableListTest.cs" />
-    <Compile Include="Shell\Core\WorkFlow\ActivityTest.cs" />
-    <Compile Include="Shell\Core\WorkFlow\FileImportActivityTest.cs" />
+    <Compile Include="Service\ActivityTest.cs" />
+    <Compile Include="Service\FileImportActivityTest.cs" />
+    <Compile Include="Plugin\ApplicationPluginTest.cs" />
+    <Compile Include="Plugin\DataItemInfoTest.cs" />
+    <Compile Include="ObservableListTest.cs" />
     <Compile Include="Shell\Gui\ExpandableArrayConverterTest.cs" />
     <Compile Include="Shell\Gui\MapLayerProviderHelperTest.cs" />
     <Compile Include="Controls\Swf\WindowsFormsHelperTests.cs" />
-    <Compile Include="Shell\Core\ProjectTest.cs" />
-    <Compile Include="Shell\Core\UrlTest.cs" />
+    <Compile Include="Data\ProjectTest.cs" />
     <Compile Include="Controls\Swf\FileSystemTreeViewTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Shell\Gui\Swf\ControlExtensionTest.cs" />
@@ -222,15 +216,7 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\alarm-clock-blue.png" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Core/Common/test/Core.Common.Base.Test/Data/ProjectTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Base.Test/Data/ProjectTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.Base.Test/Data/ProjectTest.cs	(revision 6016a9db20f1833086b35bc6aedcb2b0a3efe19d)
@@ -0,0 +1,97 @@
+using Core.Common.Base.Data;
+using NUnit.Framework;
+using Rhino.Mocks;
+
+namespace Core.Common.Base.Test.Data
+{
+    [TestFixture]
+    public class ProjectTest
+    {
+        [Test]
+        public void DefaultConstructor_ExpectedValue()
+        {
+            // call
+            var project = new Project();
+
+            // assert
+            Assert.IsInstanceOf<IObservable>(project);
+
+            Assert.AreEqual("Project", project.Name);
+            Assert.IsNull(project.Description);
+            CollectionAssert.IsEmpty(project.Items);
+        }
+
+        [Test]
+        public void NameConstructor_SetNameAndInitializeOtherProperties()
+        {
+            // 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);
+        }
+
+        [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,
+            };
+
+            // assert
+            Assert.AreEqual(niceProjectName, project.Name);
+            Assert.AreEqual(nicerDescription, project.Description);
+        }
+
+        [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
Index: Core/Common/test/Core.Common.Base.Test/ObservableListTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Base.Test/ObservableListTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.Base.Test/ObservableListTest.cs	(revision 6016a9db20f1833086b35bc6aedcb2b0a3efe19d)
@@ -0,0 +1,96 @@
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+using Rhino.Mocks;
+
+namespace Core.Common.Base.Test
+{
+    [TestFixture]
+    public class ObservableListTest
+    {
+        [Test]
+        public void DefaultConstructor_ExpectedValues()
+        {
+            // Call
+            var list = new ObservableList<object>();
+
+            // Assert
+            Assert.IsInstanceOf<List<object>>(list);
+            Assert.IsInstanceOf<IObservable>(list);
+        }
+
+        [Test]
+        public void NotifyObservers_WithObserverAttached_ObserverIsNotified()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var observer = mocks.StrictMock<IObserver>();
+            observer.Expect(o => o.UpdateObserver()); // Expect to be called once
+            mocks.ReplayAll();
+
+            var list = new ObservableList<object>();
+            list.Attach(observer);
+
+            // Call
+            list.NotifyObservers();
+
+            // Assert
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void NotifyObserver_AttachedObserverDetachedAgain_ObserverNoLongerNotified()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var observer = mocks.StrictMock<IObserver>();
+            mocks.ReplayAll();
+
+            var list = new ObservableList<object>();
+            list.Attach(observer);
+            list.Detach(observer);
+
+            // Call
+            list.NotifyObservers();
+
+            // Assert
+            mocks.VerifyAll(); // Expect no calls on 'observer'
+        }
+
+        [Test]
+        public void NotifyObservers_MultipleObserversDetachingOrAttachingOthers_NoUpdatesForAttachedAndDetachedObservers()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var testObservable = new ObservableList<double>();
+
+            var observer1 = mocks.Stub<IObserver>();
+            var observer2 = mocks.Stub<IObserver>();
+            var observer3 = mocks.Stub<IObserver>();
+            var observer4 = mocks.Stub<IObserver>();
+            var observer5 = mocks.Stub<IObserver>();
+            var observer6 = mocks.Stub<IObserver>();
+
+            testObservable.Attach(observer1);
+            testObservable.Attach(observer2);
+            testObservable.Attach(observer3);
+            testObservable.Attach(observer4);
+            testObservable.Attach(observer6);
+
+            observer1.Expect(o => o.UpdateObserver()).Repeat.Once();
+            observer2.Expect(o => o.UpdateObserver()).Do((Action)(() => testObservable.Detach(observer3))).Repeat.Once();
+            observer3.Expect(o => o.UpdateObserver()).Repeat.Never(); // A detached observer should no longer be updated
+            observer4.Expect(o => o.UpdateObserver()).Do((Action)(() => testObservable.Attach(observer5))).Repeat.Once();
+            observer5.Expect(o => o.UpdateObserver()).Repeat.Never(); // An attached observer should not be updated too
+            observer6.Expect(o => o.UpdateObserver()).Repeat.Once();
+
+            mocks.ReplayAll();
+
+            // Call
+            testObservable.NotifyObservers();
+
+            // Assert
+            mocks.VerifyAll();
+        }
+    }
+}
\ No newline at end of file
Index: Core/Common/test/Core.Common.Base.Test/Plugin/ApplicationPluginTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Base.Test/Plugin/ApplicationPluginTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.Base.Test/Plugin/ApplicationPluginTest.cs	(revision 6016a9db20f1833086b35bc6aedcb2b0a3efe19d)
@@ -0,0 +1,53 @@
+using System.Linq;
+using Core.Common.Base.Plugin;
+using NUnit.Framework;
+
+namespace Core.Common.Base.Test.Plugin
+{
+    [TestFixture]
+    public class ApplicationPluginTest
+    {
+        [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);
+        }
+    }
+
+    internal class SimpleApplicationPlugin : ApplicationPlugin
+    {
+    }
+}
\ No newline at end of file
Index: Core/Common/test/Core.Common.Base.Test/Plugin/DataItemInfoTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Base.Test/Plugin/DataItemInfoTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.Base.Test/Plugin/DataItemInfoTest.cs	(revision 6016a9db20f1833086b35bc6aedcb2b0a3efe19d)
@@ -0,0 +1,146 @@
+using System.Drawing;
+using Core.Common.Base.Plugin;
+using NUnit.Framework;
+
+namespace Core.Common.Base.Test.Plugin
+{
+    [TestFixture]
+    public class DataItemInfoTest
+    {
+        [Test]
+        public void DefaultConstructor_NonGeneric_ExpectedValues()
+        {
+            // call
+            var info = new DataItemInfo();
+
+            // assert
+            Assert.IsNull(info.ValueType);
+            Assert.IsNull(info.Name);
+            Assert.IsNull(info.Category);
+            Assert.IsNull(info.Image);
+            Assert.IsNull(info.AdditionalOwnerCheck);
+            Assert.IsNull(info.CreateData);
+            Assert.IsNull(info.AddExampleData);
+        }
+
+        [Test]
+        public void DefaultConstructor_Generic_ExpectedValues()
+        {
+            // call
+            var info = new DataItemInfo<double>();
+
+            // assert
+            Assert.AreEqual(typeof(double), info.ValueType);
+            Assert.IsNull(info.Name);
+            Assert.IsNull(info.Category);
+            Assert.IsNull(info.Image);
+            Assert.IsNull(info.AdditionalOwnerCheck);
+            Assert.IsNull(info.CreateData);
+            Assert.IsNull(info.AddExampleData);
+        }
+
+        [Test]
+        public void GetSetAutomaticProperties_NonGeneric_ExpectedBehavior()
+        {
+            // setup & call
+            bool addExampleDataCalled = false;
+            var info = new DataItemInfo
+            {
+                ValueType = typeof(double),
+                Name = "Some double",
+                Category = "Nice category",
+                Image = new Bitmap(16, 16),
+                AdditionalOwnerCheck = o => true,
+                CreateData = o => 1.2,
+                AddExampleData = delegate { addExampleDataCalled = true; }
+            };
+            info.AddExampleData(null);
+
+            // assert
+            Assert.AreEqual(typeof(double), info.ValueType);
+            Assert.AreEqual("Some double", info.Name);
+            Assert.AreEqual("Nice category", info.Category);
+            Assert.IsNotNull(info.Image);
+            Assert.IsTrue(info.AdditionalOwnerCheck(null));
+            Assert.AreEqual(1.2, info.CreateData(null));
+            Assert.IsTrue(addExampleDataCalled);
+        }
+
+        [Test]
+        public void GetSetAutomaticProperties_Generic_ExpectedBehavior()
+        {
+            // setup & call
+            bool addExampleDataNotCalled = true;
+            var info = new DataItemInfo<int>
+            {
+                Name = "Some integer",
+                Category = "Better category",
+                Image = new Bitmap(16, 16),
+                AdditionalOwnerCheck = o => false,
+                CreateData = o => -1,
+                AddExampleData = delegate { addExampleDataNotCalled = false; }
+            };
+            info.AddExampleData(1);
+
+            // assert
+            Assert.AreEqual(typeof(int), info.ValueType);
+            Assert.AreEqual("Some integer", info.Name);
+            Assert.AreEqual("Better category", info.Category);
+            Assert.IsNotNull(info.Image);
+            Assert.IsFalse(info.AdditionalOwnerCheck(null));
+            Assert.AreEqual(-1, info.CreateData(null));
+            Assert.IsFalse(addExampleDataNotCalled);
+        }
+
+        [Test]
+        public void ImplicitConversion_FromGenericToNonGeneric_ShouldCopyValues()
+        {
+            // setup
+            bool addExampleDataCalled = false;
+            var info = new DataItemInfo<int>
+            {
+                Name = "Some integer",
+                Category = "Better category",
+                Image = new Bitmap(16, 16),
+                AdditionalOwnerCheck = o => false,
+                CreateData = o => -1,
+                AddExampleData = delegate { addExampleDataCalled = true; }
+            };
+
+            // call
+            var nonGenericInfo = (DataItemInfo) info;
+
+            // assert
+            Assert.AreEqual(info.ValueType, nonGenericInfo.ValueType);
+            Assert.AreEqual(info.Name, nonGenericInfo.Name);
+            Assert.AreEqual(info.Category, nonGenericInfo.Category);
+            Assert.AreEqual(info.AdditionalOwnerCheck(1), nonGenericInfo.AdditionalOwnerCheck(1));
+            Assert.AreEqual(info.CreateData(null), nonGenericInfo.CreateData(null));
+            nonGenericInfo.AddExampleData(1);
+            Assert.IsTrue(addExampleDataCalled);
+        }
+
+        [Test]
+        public void ImplicitConversion_FromGenericToNonGenericWithoutMethodsSet_MethodsShouldBeNull()
+        {
+            // setup
+            var info = new DataItemInfo<int>
+            {
+                Name = "Some integer",
+                Category = "Better category",
+                Image = new Bitmap(16, 16)
+            };
+
+            // call
+            var nonGenericInfo = (DataItemInfo) info;
+
+            // assert
+            Assert.AreEqual(info.ValueType, nonGenericInfo.ValueType);
+            Assert.AreEqual(info.Name, nonGenericInfo.Name);
+            Assert.AreEqual(info.Category, nonGenericInfo.Category);
+            Assert.IsNull(nonGenericInfo.AdditionalOwnerCheck);
+            Assert.IsNull(nonGenericInfo.CreateData);
+            Assert.IsNull(nonGenericInfo.AddExampleData);
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 6016a9db20f1833086b35bc6aedcb2b0a3efe19d refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Base.Test/Properties/Resources.Designer.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6016a9db20f1833086b35bc6aedcb2b0a3efe19d refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Base.Test/Properties/Resources.resx'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Base.Test/Resources/alarm-clock-blue.png
===================================================================
diff -u -r6633a5deea8082d57dec6185caf4ff428f034672 -r6016a9db20f1833086b35bc6aedcb2b0a3efe19d
Binary files differ
Index: Core/Common/test/Core.Common.Base.Test/Service/ActivityTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Base.Test/Service/ActivityTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.Base.Test/Service/ActivityTest.cs	(revision 6016a9db20f1833086b35bc6aedcb2b0a3efe19d)
@@ -0,0 +1,55 @@
+using Core.Common.Base.Service;
+using NUnit.Framework;
+
+namespace Core.Common.Base.Test.Service
+{
+    [TestFixture]
+    public class ActivityTest
+    {
+        [Test]
+        public void DefaultConstructor_ExpectedValues()
+        {
+            // call
+            var activity = new SimpleActivity();
+
+            // assert
+            Assert.IsNull(activity.Name);
+            Assert.AreEqual(ActivityStatus.None, activity.Status);
+            Assert.IsNull(activity.ProgressText);
+        }
+
+        [Test]
+        public void Name_SetAndGetValue_ReturnSetValue()
+        {
+            // setup & call
+            const string someName = "Some name";
+
+            var activity = new SimpleActivity
+            {
+                Name = someName
+            };
+
+            // assert
+            Assert.AreEqual(someName, activity.Name);
+        }
+
+        private class SimpleActivity : Activity
+        {
+            protected override void OnInitialize()
+            {
+            }
+
+            protected override void OnExecute()
+            {
+            }
+
+            protected override void OnCancel()
+            {
+            }
+
+            protected override void OnFinish()
+            {
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Core/Common/test/Core.Common.Base.Test/Service/FileImportActivityTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Base.Test/Service/FileImportActivityTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.Base.Test/Service/FileImportActivityTest.cs	(revision 6016a9db20f1833086b35bc6aedcb2b0a3efe19d)
@@ -0,0 +1,40 @@
+using Core.Common.Base.IO;
+using Core.Common.Base.Service;
+using NUnit.Framework;
+using Rhino.Mocks;
+
+namespace Core.Common.Base.Test.Service
+{
+    [TestFixture]
+    public class FileImportActivityTest
+    {
+        [Test]
+        public void ShouldCancelOfImporterIsResetDuringInitialize()
+        {
+            var mockRepository = new MockRepository();
+            var importerStub = mockRepository.Stub<IFileImporter>();
+
+            mockRepository.ReplayAll();
+
+            importerStub.ShouldCancel = true; // Fake the importer being cancelled
+
+            var fileImportActivity = new FileImportTestActivity(importerStub);
+
+            fileImportActivity.PerformInitialize();
+
+            Assert.IsFalse(importerStub.ShouldCancel); // ShouldCancel should be reset
+
+            mockRepository.VerifyAll();
+        }
+
+        private class FileImportTestActivity : FileImportActivity
+        {
+            public FileImportTestActivity(IFileImporter importer, object target = null) : base(importer, target) { }
+
+            public void PerformInitialize()
+            {
+                Initialize();
+            }
+        }
+    }
+}
\ No newline at end of file
Fisheye: Tag 6016a9db20f1833086b35bc6aedcb2b0a3efe19d refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Base.Test/Shell/Core/ApplicationPluginTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6016a9db20f1833086b35bc6aedcb2b0a3efe19d refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Base.Test/Shell/Core/DataItemInfoTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6016a9db20f1833086b35bc6aedcb2b0a3efe19d refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Base.Test/Shell/Core/ObservableListTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6016a9db20f1833086b35bc6aedcb2b0a3efe19d refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Base.Test/Shell/Core/ProjectTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6016a9db20f1833086b35bc6aedcb2b0a3efe19d refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Base.Test/Shell/Core/UrlTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6016a9db20f1833086b35bc6aedcb2b0a3efe19d refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Base.Test/Shell/Core/WorkFlow/ActivityTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 6016a9db20f1833086b35bc6aedcb2b0a3efe19d refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Base.Test/Shell/Core/WorkFlow/FileImportActivityTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Test.csproj
===================================================================
diff -u -r66c1d9f2620a134d459aca4d428b48b62ddbae23 -r6016a9db20f1833086b35bc6aedcb2b0a3efe19d
--- Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Test.csproj	(.../Core.Common.Utils.Test.csproj)	(revision 66c1d9f2620a134d459aca4d428b48b62ddbae23)
+++ Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Test.csproj	(.../Core.Common.Utils.Test.csproj)	(revision 6016a9db20f1833086b35bc6aedcb2b0a3efe19d)
@@ -128,6 +128,7 @@
     <Compile Include="StringExtensionsTests.cs" />
     <Compile Include="TestHelperTests.cs" />
     <Compile Include="TextDocumentTest.cs" />
+    <Compile Include="UrlTest.cs" />
     <Compile Include="Validation\ValidationReportTest.cs" />
   </ItemGroup>
   <ItemGroup>
Index: Core/Common/test/Core.Common.Utils.Test/UrlTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Utils.Test/UrlTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.Utils.Test/UrlTest.cs	(revision 6016a9db20f1833086b35bc6aedcb2b0a3efe19d)
@@ -0,0 +1,17 @@
+using NUnit.Framework;
+
+namespace Core.Common.Utils.Test
+{
+    [TestFixture]
+    public class UrlTest
+    {
+        [Test]
+        public void Initialization()
+        {
+            var url = new Url("Deltares", "http://www.deltares.com");
+
+            Assert.AreEqual("Deltares", url.Name);
+            Assert.AreEqual("http://www.deltares.com", url.Path);
+        }
+    }
+}
\ No newline at end of file