diff --git a/src/Tools/NUnit/lib/nunit-console-runner.dll b/src/Tools/NUnit/lib/nunit-console-runner.dll
index c740735980..f3d441576a 100644
Binary files a/src/Tools/NUnit/lib/nunit-console-runner.dll and b/src/Tools/NUnit/lib/nunit-console-runner.dll differ
diff --git a/src/Tools/NUnit/lib/nunit-gui-runner.dll b/src/Tools/NUnit/lib/nunit-gui-runner.dll
index 26f3d93cd4..29cc4fb896 100644
Binary files a/src/Tools/NUnit/lib/nunit-gui-runner.dll and b/src/Tools/NUnit/lib/nunit-gui-runner.dll differ
diff --git a/src/Tools/NUnit/lib/nunit.core.dll b/src/Tools/NUnit/lib/nunit.core.dll
index c51d8ff248..411d7f3092 100644
Binary files a/src/Tools/NUnit/lib/nunit.core.dll and b/src/Tools/NUnit/lib/nunit.core.dll differ
diff --git a/src/Tools/NUnit/lib/nunit.core.interfaces.dll b/src/Tools/NUnit/lib/nunit.core.interfaces.dll
index 607ddeed19..95c8fb72ef 100644
Binary files a/src/Tools/NUnit/lib/nunit.core.interfaces.dll and b/src/Tools/NUnit/lib/nunit.core.interfaces.dll differ
diff --git a/src/Tools/NUnit/lib/nunit.fixtures.dll b/src/Tools/NUnit/lib/nunit.fixtures.dll
index 47c746ef36..854542f726 100644
Binary files a/src/Tools/NUnit/lib/nunit.fixtures.dll and b/src/Tools/NUnit/lib/nunit.fixtures.dll differ
diff --git a/src/Tools/NUnit/lib/nunit.uiexception.dll b/src/Tools/NUnit/lib/nunit.uiexception.dll
index 589cc9e0f7..8a48dea08a 100644
Binary files a/src/Tools/NUnit/lib/nunit.uiexception.dll and b/src/Tools/NUnit/lib/nunit.uiexception.dll differ
diff --git a/src/Tools/NUnit/lib/nunit.uikit.dll b/src/Tools/NUnit/lib/nunit.uikit.dll
index 53c5a1608d..53c85bb8a8 100644
Binary files a/src/Tools/NUnit/lib/nunit.uikit.dll and b/src/Tools/NUnit/lib/nunit.uikit.dll differ
diff --git a/src/Tools/NUnit/lib/nunit.util.dll b/src/Tools/NUnit/lib/nunit.util.dll
index e9c515f050..4a71d82537 100644
Binary files a/src/Tools/NUnit/lib/nunit.util.dll and b/src/Tools/NUnit/lib/nunit.util.dll differ
diff --git a/src/Tools/NUnit/nunit-console-x86.exe b/src/Tools/NUnit/nunit-console-x86.exe
index af68747462..f95903976e 100755
Binary files a/src/Tools/NUnit/nunit-console-x86.exe and b/src/Tools/NUnit/nunit-console-x86.exe differ
diff --git a/src/Tools/NUnit/nunit-console.exe b/src/Tools/NUnit/nunit-console.exe
index c050dc9737..085c93f63e 100755
Binary files a/src/Tools/NUnit/nunit-console.exe and b/src/Tools/NUnit/nunit-console.exe differ
diff --git a/src/Tools/NUnit/nunit-console/AssemblyInfo.cs b/src/Tools/NUnit/nunit-console/AssemblyInfo.cs
index 280a31e080..df49e10a42 100644
--- a/src/Tools/NUnit/nunit-console/AssemblyInfo.cs
+++ b/src/Tools/NUnit/nunit-console/AssemblyInfo.cs
@@ -36,5 +36,5 @@ using System.Reflection;
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.5.5")]
-[assembly: AssemblyInformationalVersion("2.5.5")]
+[assembly: AssemblyVersion("2.5.6")]
+[assembly: AssemblyInformationalVersion("2.5.6")]
diff --git a/src/Tools/NUnit/nunit-console/ExtendedConsoleUi.cs b/src/Tools/NUnit/nunit-console/ExtendedConsoleUi.cs
index 1bb8817dea..ca9fe18bf6 100644
--- a/src/Tools/NUnit/nunit-console/ExtendedConsoleUi.cs
+++ b/src/Tools/NUnit/nunit-console/ExtendedConsoleUi.cs
@@ -76,7 +76,7 @@ namespace NUnit.ConsoleRunner
                     ? package.Settings["RuntimeFramework"]
                     : "Default");
 
-            TestRunner testRunner = new TestRunnerFactory().MakeTestRunner(package);
+            TestRunner testRunner = new DefaultTestRunnerFactory().MakeTestRunner(package);
             testRunner.Load(package);
 
             try
@@ -93,7 +93,7 @@ namespace NUnit.ConsoleRunner
 				TestFilter testFilter = TestFilter.Empty;
 				if ( options.run != null && options.run != string.Empty )
 				{
-					Console.WriteLine( "Selected test: " + options.run );
+					Console.WriteLine( "Selected test(s): " + options.run );
 					testFilter = new SimpleNameFilter( options.run );
 				}
 
@@ -119,6 +119,9 @@ namespace NUnit.ConsoleRunner
 						testFilter = new AndFilter( testFilter, excludeFilter );
 				}
 
+        if (testFilter is NotFilter)
+          ((NotFilter)testFilter).TopLevel = true;
+        
 				TestResult result = null;
 				string savedDirectory = Environment.CurrentDirectory;
 				TextWriter savedOut = Console.Out;
@@ -196,12 +199,13 @@ namespace NUnit.ConsoleRunner
 		}
 
 		#region Helper Methods
-        private static TestPackage MakeTestPackage( ConsoleOptions options )
-        {
+    // TODO: See if this can be unified with the Gui's MakeTestPackage
+    private static TestPackage MakeTestPackage( ConsoleOptions options )
+    {
 			TestPackage package;
 			DomainUsage domainUsage = DomainUsage.Default;
             ProcessModel processModel = ProcessModel.Default;
-            RuntimeFramework framework = RuntimeFramework.CurrentFramework;
+            RuntimeFramework framework = null;
 
 			if (options.IsTestProject)
 			{
diff --git a/src/Tools/NUnit/nunit-console/ExtendedRunner.cs b/src/Tools/NUnit/nunit-console/ExtendedRunner.cs
index b856c1bd8c..f6f4b7b5bf 100644
--- a/src/Tools/NUnit/nunit-console/ExtendedRunner.cs
+++ b/src/Tools/NUnit/nunit-console/ExtendedRunner.cs
@@ -63,10 +63,7 @@ namespace NUnit.ConsoleRunner
 			//ServiceManager.Services.AddService( new TestLoader() );
 			ServiceManager.Services.AddService( new AddinRegistry() );
 			ServiceManager.Services.AddService( new AddinManager() );
-			// Hack: Resolves conflict with gui testagency when running
-			// console tests under the gui.
-            if ( !AppDomain.CurrentDomain.FriendlyName.StartsWith("test-domain-") )
-                ServiceManager.Services.AddService( new TestAgency() );
+      ServiceManager.Services.AddService( new TestAgency() );
 
 			// Initialize Services
 			ServiceManager.Services.InitializeServices();
diff --git a/src/Tools/NUnit/nunit.framework.dll b/src/Tools/NUnit/nunit.framework.dll
index 07e4c6eaee..01dadf86ea 100755
Binary files a/src/Tools/NUnit/nunit.framework.dll and b/src/Tools/NUnit/nunit.framework.dll differ