diff --git a/src/Umbraco.Tests/Models/ContentXmlTest.cs b/src/Umbraco.Tests/Models/ContentXmlTest.cs
index 18824949ee..4152681d07 100644
--- a/src/Umbraco.Tests/Models/ContentXmlTest.cs
+++ b/src/Umbraco.Tests/Models/ContentXmlTest.cs
@@ -17,8 +17,6 @@ namespace Umbraco.Tests.Models
         [SetUp]
         public override void Initialize()
         {
-            Resolution.Reset();
-
             //this ensures its reset
             PluginManager.Current = new PluginManager();
 
@@ -29,7 +27,6 @@ namespace Umbraco.Tests.Models
                     typeof(tinyMCE3dataType).Assembly
 				};
 
-            DataTypesResolver.Reset();
             DataTypesResolver.Current = new DataTypesResolver(
                 () => PluginManager.Current.ResolveDataTypes());
 
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
index a94883783d..ccfdb65643 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
@@ -75,8 +75,6 @@ namespace Umbraco.Tests.PublishedContent
 
 			UmbracoContext.Current = umbContext;
 			PublishedMediaStoreResolver.Current = new PublishedMediaStoreResolver(new DefaultPublishedMediaStore());
-
-			UmbracoSettings.ForceSafeAliases = true;
 		}
 
 		public override void TearDown()
diff --git a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
index a7b9b9405f..aeb9e7092d 100644
--- a/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
@@ -32,8 +32,7 @@ namespace Umbraco.Tests.TestHelpers
         public virtual void Initialize()
         {
 			TestHelper.SetupLog4NetForTests();
-            Resolution.Reset();
-            RepositoryResolver.Reset();
+            
 			TestHelper.InitializeContentDirectories();
 
 			string path = TestHelper.CurrentAssemblyDirectory;
@@ -84,11 +83,7 @@ namespace Umbraco.Tests.TestHelpers
             //called so that inheritors can do stuff before freezing.
             OnFreezing();
 
-            Resolution.Freeze();
-
-			//if (RequiresDbSetup)
-			//	TestHelper.InitializeDatabase();
-			
+            Resolution.Freeze();			
         }
 
         protected virtual void OnFreezing()
@@ -111,7 +106,6 @@ namespace Umbraco.Tests.TestHelpers
 				SqlCeContextGuardian.CloseBackgroundConnection();
 	        }
 	        
-
 			ApplicationContext.Current = null;
 			RepositoryResolver.Reset();