diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
index 344ab85cfb..95e16b2286 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
@@ -56,12 +56,6 @@
     <!-- if true umbraco will ensure that no page under the same parent has an identical name -->
     <ensureUniqueNaming>True</ensureUniqueNaming>
 
-    <!-- clean editor content with use of tidy -->
-    <TidyEditorContent>False</TidyEditorContent>
-
-    <!-- the encoding type for tidy. Default is Raw, options are ASCII, Raw, Latin1, UTF8, ISO2022, MacroMan-->
-    <TidyCharEncoding>Raw</TidyCharEncoding>
-
     <!-- Enable / disable xml content cache -->
     <XmlCacheEnabled>True</XmlCacheEnabled>
 
diff --git a/src/Umbraco.Tests/Manifest/ManifestParserTests.cs b/src/Umbraco.Tests/Manifest/ManifestParserTests.cs
index c2c70bf588..d9856fdbb4 100644
--- a/src/Umbraco.Tests/Manifest/ManifestParserTests.cs
+++ b/src/Umbraco.Tests/Manifest/ManifestParserTests.cs
@@ -5,6 +5,7 @@ using Moq;
 using NUnit.Framework;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
 using Umbraco.Core.PropertyEditors;
@@ -21,7 +22,7 @@ namespace Umbraco.Tests.Manifest
         [SetUp]
         public void Setup()
         {
-            _parser = new ManifestParser(Mock.Of<ILogger>(), new DirectoryInfo(TestHelper.MapPathForTest("~/App_Plugins")));
+            _parser = new ManifestParser(Mock.Of<ILogger>(), new DirectoryInfo(IOHelper.MapPath("~/App_Plugins")));
         }
         
         [Test]
diff --git a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
index a6d439b7af..1e12bbe810 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
@@ -14,6 +14,7 @@ using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
 using Umbraco.Core.Models.PublishedContent;
@@ -205,7 +206,7 @@ namespace Umbraco.Tests.TestHelpers
             PropertyEditorResolver.Current = new PropertyEditorResolver(
                  Container, Logger,
                  () => PluginManager.Current.ResolvePropertyEditors(),
-                 new ManifestBuilder(new ManifestParser(Logger, new DirectoryInfo(TestHelper.MapPathForTest("~/App_Plugins")))));
+                 new ManifestBuilder(new ManifestParser(Logger, new DirectoryInfo(IOHelper.MapPath("~/App_Plugins")))));
 
             MappingResolver.Current = new MappingResolver(
                 Container, Logger,
diff --git a/src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs b/src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
index 8ccb1c5af5..22c05c6694 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
@@ -66,7 +66,9 @@ namespace Umbraco.Tests.TestHelpers
             Container.Register<ILogger>(factory => Logger);
             Container.Register<CacheHelper>(factory => CacheHelper);
             Container.Register<ProfilingLogger>(factory => ProfilingLogger);
+            var settings = SettingsForTests.GetDefault();
             Container.Register<IUmbracoSettingsSection>(factory => SettingsForTests.GetDefault(), new PerContainerLifetime());
+            Container.Register<IContentSection>(factory => settings.Content, new PerContainerLifetime());
             Container.Register<IRuntimeCacheProvider>(factory => CacheHelper.RuntimeCache);
             Container.Register<IServiceProvider, ActivatorServiceProvider>();
 
diff --git a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
index 30b1efc71d..f76e5bbea8 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
@@ -2,6 +2,7 @@ using System;
 using System.IO;
 using System.Web.Routing;
 using System.Xml;
+using Moq;
 using NUnit.Framework;
 using SQLCE4Umbraco;
 using Umbraco.Core;
@@ -77,5 +78,14 @@ namespace Umbraco.Tests.TestHelpers
 </root>";
         }
 
+        /// <summary>
+        /// sets up resolvers before resolution is frozen
+        /// </summary>
+        protected override void FreezeResolution()
+        {
+            Container.Register<MediaFileSystem>(factory => new MediaFileSystem(Mock.Of<IFileSystem>()));
+
+            base.FreezeResolution();
+        }
     }
 }