diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
index a95ba2eb85..65522c147c 100644
--- a/src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
+++ b/src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
@@ -36,7 +36,7 @@ namespace Umbraco.Core.Models.PublishedContent
             PropertyTypeAlias = propertyTypeAlias;
 
             DataTypeId = dataTypeDefinitionId;
-            PropertyEditorAlias = PropertyEditorAlias;
+            PropertyEditorAlias = propertyEditorAlias;
 
             InitializeConverters();
         }
diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/WebRoutingElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/WebRoutingElementTests.cs
index 39d0b8be7f..fbade43b74 100644
--- a/src/Umbraco.Tests/Configurations/UmbracoSettings/WebRoutingElementTests.cs
+++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/WebRoutingElementTests.cs
@@ -20,7 +20,7 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
         [Test]
         public virtual void UrlProviderMode()
         {
-            Assert.IsTrue(SettingsSection.WebRouting.UrlProviderMode == "Auto");
+            Assert.IsTrue(SettingsSection.WebRouting.UrlProviderMode == "AutoLegacy");
         }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs
index a6a9c63797..24bf6954a6 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs
@@ -41,23 +41,17 @@ namespace Umbraco.Tests.PublishedContent
                         .Union(new[] { typeof (PublishedContentMoreTests).Assembly})
                 };
 
+            InitializeUmbracoContext();
+        }
+
+        protected override void FreezeResolution()
+        {
             PropertyValueConvertersResolver.Current =
                 new PropertyValueConvertersResolver();
-            PublishedContentModelFactoryResolver.Current = 
+            PublishedContentModelFactoryResolver.Current =
                 new PublishedContentModelFactoryResolver(new PublishedContentModelFactoryImpl());
-            Resolution.Freeze();
 
-            //var caches = CreatePublishedContent();
-
-            //var factory = new FakeHttpContextFactory("http://umbraco.local/");
-            //StateHelper.HttpContext = factory.HttpContext;
-            //var context = new UmbracoContext(
-            //    factory.HttpContext,
-            //    ApplicationContext.Current,
-            //    caches);
-            //UmbracoContext.Current = context;
-
-            InitializeUmbracoContext();
+            base.FreezeResolution();
         }
 
         private void InitializeUmbracoContext()
diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
index d83ce1c5dc..3ce4fb85bc 100644
--- a/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
+++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
@@ -39,13 +39,14 @@ namespace Umbraco.Tests.PublishedContent
 
         protected override void FreezeResolution()
         {
-            PropertyValueConvertersResolver.Current = new PropertyValueConvertersResolver(
-                new[]
-                    {
-                        typeof(DatePickerValueConverter),
-                        typeof(TinyMceValueConverter),
-                        typeof(YesNoValueConverter)
-                    });    
+            if (PropertyValueConvertersResolver.HasCurrent == false)
+                PropertyValueConvertersResolver.Current = new PropertyValueConvertersResolver(
+                    new[]
+                        {
+                            typeof(DatePickerValueConverter),
+                            typeof(TinyMceValueConverter),
+                            typeof(YesNoValueConverter)
+                        });    
 
             PublishedCachesResolver.Current = new PublishedCachesResolver(new PublishedCaches(
                 new PublishedContentCache(), new PublishedMediaCache()));