diff --git a/src/Umbraco.Tests.Common/Builders/RequestHandlerSettingsBuilder.cs b/src/Umbraco.Tests.Common/Builders/RequestHandlerSettingsBuilder.cs
index 33f63c9d16..3c6f652014 100644
--- a/src/Umbraco.Tests.Common/Builders/RequestHandlerSettingsBuilder.cs
+++ b/src/Umbraco.Tests.Common/Builders/RequestHandlerSettingsBuilder.cs
@@ -7,7 +7,7 @@ namespace Umbraco.Tests.Common.Builders
     public class RequestHandlerSettingsBuilder : BuilderBase<RequestHandlerSettings>
     {
         private bool? _addTrailingSlash;
-        private bool? _convertUrlsToAscii;
+        private string _convertUrlsToAscii;
         private IEnumerable<IChar> _charCollection;
 
         public RequestHandlerSettingsBuilder WithAddTrailingSlash(bool addTrailingSlash)
@@ -16,7 +16,7 @@ namespace Umbraco.Tests.Common.Builders
             return this;
         }
 
-        public RequestHandlerSettingsBuilder WithConvertUrlsToAscii(bool convertUrlsToAscii)
+        public RequestHandlerSettingsBuilder WithConvertUrlsToAscii(string convertUrlsToAscii)
         {
             _convertUrlsToAscii = convertUrlsToAscii;
             return this;
@@ -26,13 +26,12 @@ namespace Umbraco.Tests.Common.Builders
         {
             _charCollection = charCollection;
             return this;
-        }
-        
+        }        
 
         public override RequestHandlerSettings Build()
         {
             var addTrailingSlash = _addTrailingSlash ?? false;
-            var convertUrlsToAscii = _convertUrlsToAscii ?? false;
+            var convertUrlsToAscii = _convertUrlsToAscii ?? "false";
             var charCollection = _charCollection ?? RequestHandlerSettings.DefaultCharCollection;
 
             return new RequestHandlerSettings
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RequestHandlerSettingsBuilderTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RequestHandlerSettingsBuilderTests.cs
index af6bc0ed6f..8d84a6d4c6 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RequestHandlerSettingsBuilderTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RequestHandlerSettingsBuilderTests.cs
@@ -15,7 +15,7 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Tests.Common.Builders
         {
             // Arrange
             const bool addTrailingSlash = true;
-            const bool convertUrlsToAscii = true;
+            const string convertUrlsToAscii = "try";
             var charCollection = new List<IChar> { new CharItem { Char = "a", Replacement = "b" } };
 
             var builder = new RequestHandlerSettingsBuilder();
diff --git a/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs b/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
index fa6949cd09..cae2919621 100644
--- a/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
+++ b/src/Umbraco.Tests/Configurations/GlobalSettingsTests.cs
@@ -25,7 +25,7 @@ namespace Umbraco.Tests.Configurations
 
             var hostingEnvironment = new AspNetHostingEnvironment(mockHostingSettings.Object);
 
-            var globalSettings = new GlobalSettingsBuilder().WithUmbracoPath(path).Build();
+            var globalSettings = new GlobalSettingsBuilder().WithPath(path).Build();
 
             Assert.AreEqual(outcome, globalSettings.GetUmbracoMvcAreaNoCache(hostingEnvironment));
         }
diff --git a/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs b/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs
index 0def86e8d2..28d7d90f7e 100644
--- a/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs
+++ b/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs
@@ -98,7 +98,7 @@ namespace Umbraco.Tests.Strings
         public void U4_4056()
         {
             var requestHandlerSettings = new RequestHandlerSettingsBuilder()
-                .WithConvertUrlsToAscii(false)
+                .WithConvertUrlsToAscii("false")
                 .WithCharCollection(Enumerable.Empty<IChar>())
                 .Build();
 
@@ -123,7 +123,7 @@ namespace Umbraco.Tests.Strings
         public void U4_4056_TryAscii()
         {
             var requestHandlerSettings = new RequestHandlerSettingsBuilder()
-                .WithConvertUrlsToAscii(false)
+                .WithConvertUrlsToAscii("false")
                 .WithCharCollection(Enumerable.Empty<IChar>())
                 .Build();
 
@@ -411,7 +411,7 @@ namespace Umbraco.Tests.Strings
             var settings = _requestHandlerSettings;
             var contentMock = Mock.Get(settings);
             contentMock.Setup(x => x.CharCollection).Returns(Enumerable.Empty<IChar>());
-            contentMock.Setup(x => x.ConvertUrlsToAscii).Returns(false);
+            contentMock.Setup(x => x.ConvertUrlsToAscii).Returns("false");
 
             var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(settings));
 
diff --git a/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs b/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
index b5583f0b7e..b4911d6b59 100644
--- a/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
@@ -127,11 +127,6 @@ namespace Umbraco.Extensions
             services.Configure<UserPasswordConfigurationSettings>(configuration.GetSection(Constants.Configuration.ConfigSecurityPrefix + "UserPassword"));
             services.Configure<WebRoutingSettings>(configuration.GetSection(Constants.Configuration.ConfigPrefix + "WebRouting"));
 
-            // TODO: remove this
-            var configsFactory = new AspNetCoreConfigsFactory(configuration);
-            var configs = configsFactory.Create();
-            services.AddSingleton(configs);
-
             return services;
         }