diff --git a/src/AddIns/Misc/NUnitPad/Project/NUnitPad.csproj b/src/AddIns/Misc/NUnitPad/Project/NUnitPad.csproj
index 62b73c1acd..141add49ca 100644
--- a/src/AddIns/Misc/NUnitPad/Project/NUnitPad.csproj
+++ b/src/AddIns/Misc/NUnitPad/Project/NUnitPad.csproj
@@ -73,6 +73,10 @@
       <Project>{83DD7E12-A705-4DBA-9D71-09C8973D9382}</Project>
       <Name>nunit.framework.dll</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Tools\NUnit\src\ClientUtilities\util\nunit.util.dll.csproj">
+      <Project>{61CE9CE5-943E-44D4-A381-814DC1406767}</Project>
+      <Name>nunit.util.dll</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
 </Project>
\ No newline at end of file
diff --git a/src/AddIns/Misc/NUnitPad/Project/Src/Gui/NUnitPadContent.cs b/src/AddIns/Misc/NUnitPad/Project/Src/Gui/NUnitPadContent.cs
index c456ae9527..2cc8d6ba51 100644
--- a/src/AddIns/Misc/NUnitPad/Project/Src/Gui/NUnitPadContent.cs
+++ b/src/AddIns/Misc/NUnitPad/Project/Src/Gui/NUnitPadContent.cs
@@ -10,6 +10,7 @@ using System.Collections;
 using System.Threading;
 using System.Windows.Forms;
 
+using NUnit.Util;
 using NUnit.Core;
 using NUnit.Framework;
 using NUnit.Extensions;
@@ -189,15 +190,21 @@ namespace ICSharpCode.NUnitPad
 		{
 			UnloadAppDomains();
 			
-			if (ProjectService.OpenSolution == null) return;
+			if (ProjectService.OpenSolution == null) {
+				return;
+			}
 			
 			foreach (IProject project in ProjectService.OpenSolution.Projects) {
 				string outputAssembly = project.OutputAssemblyFullPath;
 				try {
-					TestSuiteBuilder builder = new TestSuiteBuilder();
-					Console.WriteLine("Try : " + outputAssembly);
-					Test testDomain = builder.Build(outputAssembly);
-					testTreeView.PrintTests(outputAssembly, testDomain, project);
+					TestDomain testDomain = new TestDomain();
+					NUnitProject prj = NUnitProject.LoadProject(outputAssembly);
+					Test test = testDomain.Load(prj);
+					
+//					TestSuiteBuilder builder = new TestSuiteBuilder();
+//					Console.WriteLine("Try to load '" + outputAssembly +"'");
+//					Test testDomain = builder.Build(outputAssembly);
+					testTreeView.PrintTests(outputAssembly, test, project);
 				} catch (Exception e) {
 					testTreeView.PrintTestErrors(outputAssembly, e);
 				}
diff --git a/src/AddIns/Misc/NUnitPad/Project/Src/Gui/TestTreeView.cs b/src/AddIns/Misc/NUnitPad/Project/Src/Gui/TestTreeView.cs
index e089cbf47c..f155ceb7dd 100644
--- a/src/AddIns/Misc/NUnitPad/Project/Src/Gui/TestTreeView.cs
+++ b/src/AddIns/Misc/NUnitPad/Project/Src/Gui/TestTreeView.cs
@@ -163,6 +163,7 @@ namespace ICSharpCode.NUnitPad
 		
 		public void PrintTests(string assembly, Test test, IProject project)
 		{
+			Console.WriteLine(assembly);
 			TreeNode assemblyNode = new TreeNode(Path.GetFileName(assembly));
 			assemblyNode.Tag = new TestItemTag(test, project);
 			treeView.Nodes.Add(assemblyNode);
diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/ReferenceNode.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/ReferenceNode.cs
index d1e1883836..2899f0c539 100644
--- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/ReferenceNode.cs
+++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/ReferenceNode.cs
@@ -28,7 +28,11 @@ namespace ICSharpCode.SharpDevelop.Project
 
 			ContextmenuAddinTreePath = "/SharpDevelop/Pads/ProjectBrowser/ContextMenu/ReferenceNode";
 			SetIcon("Icons.16x16.Reference");
-			Text = referenceProjectItem.Include;
+			if (referenceProjectItem.ItemType == ItemType.ProjectReference) {
+				Text = Path.GetFileNameWithoutExtension(referenceProjectItem.Include);
+			} else {
+				Text = referenceProjectItem.Include;
+			}
 		}
 		
 		#region Cut & Paste
diff --git a/src/SharpDevelop.sln b/src/SharpDevelop.sln
index f2eaa684e6..529e887491 100644
--- a/src/SharpDevelop.sln
+++ b/src/SharpDevelop.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# SharpDevelop 2.0.0.9999
+# SharpDevelop 2.0.0.267
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}"
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
@@ -52,7 +52,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{
 	ProjectSection(SolutionItems) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryTests", "Libraries\NRefactory\Test\NRefactoryTests.csproj", "{870115DD-960A-4406-A6B9-600BCDC36A03}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.util.dll", "Tools\NUnit\src\ClientUtilities\util\nunit.util.dll.csproj", "{61CE9CE5-943E-44D4-A381-814DC1406767}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework.dll", "Tools\NUnit\src\NUnitFramework\framework\nunit.framework.dll.csproj", "{83DD7E12-A705-4DBA-9D71-09C8973D9382}"
 EndProject
@@ -185,7 +185,7 @@ Global
 		{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
 		{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
 		{83DD7E12-A705-4DBA-9D71-09C8973D9382} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
-		{870115DD-960A-4406-A6B9-600BCDC36A03} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
+		{61CE9CE5-943E-44D4-A381-814DC1406767} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
 		{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
 		{1152B71B-3C05-4598-B20D-823B5D40559E} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
 		{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}