diff --git a/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlTests.cs
index 269ae66845..6bb9ef3fdb 100644
--- a/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlTests.cs
@@ -68,6 +68,7 @@ namespace Umbraco.Tests.Routing
 			var url = routingContext.UmbracoContext.CleanedUmbracoUrl;	//very important to use the cleaned up umbraco url		
 			var docreq = new PublishedContentRequest(url, routingContext);			
 			var lookup = new ContentFinderByNiceUrl();
+            ConfigurationManager.AppSettings.Set("umbracoHideTopLevelNodeFromPath", "false");
 
 			var result = lookup.TryFindDocument(docreq);
 
diff --git a/src/Umbraco.Tests/Routing/NiceUrlProviderTests.cs b/src/Umbraco.Tests/Routing/NiceUrlProviderTests.cs
index ef3e76bc51..4bf53f6d49 100644
--- a/src/Umbraco.Tests/Routing/NiceUrlProviderTests.cs
+++ b/src/Umbraco.Tests/Routing/NiceUrlProviderTests.cs
@@ -33,12 +33,12 @@ namespace Umbraco.Tests.Routing
 		/// This checks that when we retreive a NiceUrl for multiple items that there are no issues with cache overlap 
 		/// and that they are all cached correctly.
         /// </summary>
-        [Ignore]
 		[Test]
 		public void Ensure_Cache_Is_Correct()
 		{
 			var routingContext = GetRoutingContext("/test", 1111);
 			ConfigurationManager.AppSettings.Set("umbracoUseDirectoryUrls", "true");
+            Umbraco.Core.Configuration.UmbracoSettings.AddTrailingSlash = false;
 
 			var samples = new Dictionary<int, string> {
 				{ 1046, "/home" },
diff --git a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
index aa6ec83ec6..184dbd6d64 100644
--- a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
+++ b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs
@@ -16,33 +16,6 @@ using umbraco.cms.businesslogic.template;
 
 namespace Umbraco.Tests.Routing
 {
-	[TestFixture, RequiresSTA]
-	public class PublishedContentRequestBuilderTests : BaseRoutingTest
-	{
-
-		//[Test]
-		//public void Alt_Template()
-		//{
-		//	var template = Template.MakeNew("test", new User(0));
-		//	var altTemplate = Template.MakeNew("alt", new User(0));
-		//	var umbracoContext = GetUmbracoContext("/home?altTemplate=" + altTemplate.Alias, template.Id);
-		//	// create the new document request since we're rendering a document on the front-end
-		//	var docreq = PublishedContentRequest.CreateForFrontEndRequest(umbracoContext);
-				
-		//	//create the searcher
-		//	var searcher = new PublishedContentRequestBuilder(docreq);
-		//	//find domain
-		//	searcher.LookupDomain();
-		//	// redirect if it has been flagged
-		//	Assert.IsFalse(docreq.IsRedirect);
-			
-		//	//find the document, found will be true if the doc request has found BOTH a node and a template			
-		//	var found = searcher.LookupDocument();
-			
-		//}
-
-	}
-
 	[TestFixture, RequiresSTA]
 	public class UmbracoModuleTests : BaseRoutingTest
 	{
diff --git a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
index 2bc1d2b3f5..0b6983b3ca 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
@@ -4,6 +4,7 @@ using System.Data.SqlServerCe;
 using System.IO;
 using System.Web.Routing;
 using System.Xml;
+using System.Configuration;
 using NUnit.Framework;
 using SQLCE4Umbraco;
 using Umbraco.Core;