Index: test/DeltaShell/DeltaShell.Tests/TestObjects/TestProjectService.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r5fc71a385897af92ccb092f2f969b5709afab85a
--- test/DeltaShell/DeltaShell.Tests/TestObjects/TestProjectService.cs	(.../TestProjectService.cs)	(revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/DeltaShell/DeltaShell.Tests/TestObjects/TestProjectService.cs	(.../TestProjectService.cs)	(revision 5fc71a385897af92ccb092f2f969b5709afab85a)
@@ -9,32 +9,49 @@
     /// <summary>
     /// 'Hand rolled' ;) mock for projectservice. Replace by mocks if easy.
     /// </summary>
-    class TestProjectService : IProjectService
+    internal class TestProjectService : IProjectService
     {
-        private int closeCallCount;
+        public event EventHandler ProjectSaved;
+
+        public event EventHandler<CancelEventArgs> ProjectOpening;
+
+        public event EventHandler ProjectOpened;
+
+        public int CloseCallCount { get; private set; }
+
         public IProjectRepositoryFactory ProjectRepositoryFactory { get; set; }
 
         public string ProjectDataDirectory
         {
-            get { throw new NotImplementedException(); }
+            get
+            {
+                throw new NotImplementedException();
+            }
         }
 
-        public string CreateAndGetExternalDataDirectory(string basePath)
+        public IProjectRepository ProjectRepository
         {
+            get
+            {
+                throw new NotImplementedException();
+            }
+        }
+
+        public void Export(IProjectItem projectItem, string targetProjectRepositoryPath, bool includeLinkedFiles, bool ClearModelOutputsOnExport = false)
+        {
             throw new NotImplementedException();
         }
 
-        public IProjectRepository ProjectRepository
+        public IProjectService Clone()
         {
-            get { throw new NotImplementedException(); }
+            throw new NotImplementedException();
         }
 
-        public event EventHandler ProjectSaved;
-        public int CloseCallCount
+        public string CreateAndGetExternalDataDirectory(string basePath)
         {
-            get { return closeCallCount; }
+            throw new NotImplementedException();
         }
-        
+
         public void SaveProjectAs(Project project, string path)
         {
             throw new NotImplementedException();
@@ -57,27 +74,18 @@
 
         public void Close(Project project)
         {
-            closeCallCount++;
+            CloseCallCount++;
         }
 
-        public void Export(IProjectItem projectItem, string targetProjectRepositoryPath, bool includeLinkedFiles, bool ClearModelOutputsOnExport = false)
-        {
-            throw new NotImplementedException();
-        }
-
-        public IProjectService Clone()
-        {
-            throw new NotImplementedException();
-        }
-
         public void SaveProjectInTemporaryFolder(Project project)
         {
             throw new NotImplementedException();
         }
 
+        public void Dispose() {}
+
         #region IProjectService Members
 
-
         public event EventHandler<CancelEventArgs> ProjectSaving;
         public event EventHandler ProjectSaveFailed;
 
@@ -87,14 +95,5 @@
         }
 
         #endregion
-
-        public void Dispose()
-        {
-            
-        }
-
-        public event EventHandler<CancelEventArgs> ProjectOpening;
-
-        public event EventHandler ProjectOpened;
     }
 }
\ No newline at end of file