diff --git a/src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs
index 08012a24c4..3bf20c005c 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs
@@ -1,22 +1,10 @@
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Xml.Linq;
 using NUnit.Framework;
-using umbraco;
-using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Rdbms;
-using Umbraco.Core.Persistence;
-
-using Umbraco.Core.Persistence.Mappers;
-using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Tests.TestHelpers;
-using umbraco.editorControls.tinyMCE3;
-using umbraco.interfaces;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 
 namespace Umbraco.Tests.Persistence.Repositories
 {
diff --git a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
index 242ad6c627..faa681435e 100644
--- a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
+++ b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
@@ -36,9 +36,9 @@ namespace Umbraco.Tests.Persistence.Repositories
 
         private MediaRepository CreateRepository(IDatabaseUnitOfWork unitOfWork, out MediaTypeRepository mediaTypeRepository)
         {
-            mediaTypeRepository = new MediaTypeRepository(unitOfWork, CacheHelper, Mock.Of<ILogger>(), SqlSyntaxProvider);
-            var tagRepository = new TagRepository(unitOfWork, CacheHelper, Mock.Of<ILogger>(), SqlSyntaxProvider);
-            var repository = new MediaRepository(unitOfWork, CacheHelper, Mock.Of<ILogger>(), SqlSyntaxProvider, mediaTypeRepository, tagRepository);
+            mediaTypeRepository = new MediaTypeRepository(unitOfWork, CacheHelper, Mock.Of<ILogger>(), SqlSyntax);
+            var tagRepository = new TagRepository(unitOfWork, CacheHelper, Mock.Of<ILogger>(), SqlSyntax);
+            var repository = new MediaRepository(unitOfWork, CacheHelper, Mock.Of<ILogger>(), SqlSyntax, mediaTypeRepository, tagRepository);
             return repository;
         }
 
diff --git a/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlWithDomainsTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlWithDomainsTests.cs
index 3dcc127f86..c527ea0cdd 100644
--- a/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlWithDomainsTests.cs
+++ b/src/Umbraco.Tests/Routing/ContentFinderByNiceUrlWithDomainsTests.cs
@@ -132,7 +132,7 @@ namespace Umbraco.Tests.Routing
 			// must lookup domain else lookup by url fails
 			pcr.Engine.FindDomain();
 
-			var lookup = new ContentFinderByNiceUrl();
+            var lookup = new ContentFinderByNiceUrl(Logger);
 			var result = lookup.TryFindContent(pcr);
 			Assert.IsTrue(result);
 			Assert.AreEqual(expectedId, pcr.PublishedContent.Id);
@@ -171,7 +171,7 @@ namespace Umbraco.Tests.Routing
 			pcr.Engine.FindDomain();
 			Assert.AreEqual(expectedCulture, pcr.Culture.Name);
 
-			var lookup = new ContentFinderByNiceUrl();
+            var lookup = new ContentFinderByNiceUrl(Logger);
 			var result = lookup.TryFindContent(pcr);
 			Assert.IsTrue(result);
 			Assert.AreEqual(expectedId, pcr.PublishedContent.Id);
diff --git a/src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs b/src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs
index 9042bbca53..b86d8f8af1 100644
--- a/src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs
+++ b/src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs
@@ -152,8 +152,8 @@ namespace Umbraco.Tests.Routing
 
             Assert.AreEqual(expectedCulture, pcr.Culture.Name);
 
-            SettingsForTests.HideTopLevelNodeFromPath = false; 
-            var finder = new ContentFinderByNiceUrl();
+            SettingsForTests.HideTopLevelNodeFromPath = false;
+            var finder = new ContentFinderByNiceUrl(Logger);
             var result = finder.TryFindContent(pcr);
 
             Assert.IsTrue(result);
@@ -196,7 +196,7 @@ namespace Umbraco.Tests.Routing
 
             // find document
             SettingsForTests.HideTopLevelNodeFromPath = false;
-            var finder = new ContentFinderByNiceUrl();
+            var finder = new ContentFinderByNiceUrl(Logger);
             var result = finder.TryFindContent(pcr);
 
             // apply wildcard domain
diff --git a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
index 1378cd3547..608b0924f9 100644
--- a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
+++ b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
@@ -55,7 +55,7 @@ namespace Umbraco.Tests.Routing
 			Assert.IsTrue(pcr.HasDomain);
 
 			// check that it's been routed
-			var lookup = new ContentFinderByNiceUrl();
+			var lookup = new ContentFinderByNiceUrl(Logger);
 			var result = lookup.TryFindContent(pcr);
 			Assert.IsTrue(result);
 			Assert.AreEqual(100111, pcr.PublishedContent.Id);